feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -1,12 +1,15 @@
|
||||
#include "stdafx.h"
|
||||
#include "PistonPieceRenderer.h"
|
||||
#include "Tesselator.h"
|
||||
#include "Lighting.h"
|
||||
#include "Tesselator.h"
|
||||
#include "TextureAtlas.h"
|
||||
#include "TileRenderer.h"
|
||||
#include "..\Minecraft.World\net.minecraft.world.level.h"
|
||||
#include "..\Minecraft.World\PistonPieceEntity.h"
|
||||
#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
|
||||
ResourceLocation PistonPieceRenderer::SIGN_LOCATION = ResourceLocation(TN_ITEM_SIGN);
|
||||
|
||||
PistonPieceRenderer::PistonPieceRenderer()
|
||||
{
|
||||
tileRenderer = NULL;
|
||||
@@ -21,7 +24,7 @@ void PistonPieceRenderer::render(shared_ptr<TileEntity> _entity, double x, doubl
|
||||
if (tile != NULL && entity->getProgress(a) <= 1) // 4J - changed condition from < to <= as our chunk update is async to main thread and so we can have to render these with progress of 1
|
||||
{
|
||||
Tesselator *t = Tesselator::getInstance();
|
||||
bindTexture(TN_TERRAIN);
|
||||
bindTexture(&TextureAtlas::LOCATION_BLOCKS);
|
||||
|
||||
Lighting::turnOff();
|
||||
glColor4f(1, 1, 1, 1); // 4J added - this wouldn't be needed in real opengl as the block render has vertex colours and so this isn't use, but our pretend gl always modulates with this
|
||||
|
||||
Reference in New Issue
Block a user