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 97a43994725008e35fceb984d5549df9c8cea470. * 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,18 @@
|
||||
#include "stdafx.h"
|
||||
#include "..\Minecraft.World\SkullTileEntity.h"
|
||||
#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
#include "..\Minecraft.World\net.minecraft.h"
|
||||
#include "SkeletonHeadModel.h"
|
||||
#include "SkullTileRenderer.h"
|
||||
#include "SkeletonHeadModel.h"
|
||||
#include "PlayerRenderer.h"
|
||||
#include "..\Minecraft.World\SkullTileEntity.h"
|
||||
#include "..\Minecraft.World\net.minecraft.h"
|
||||
#include "..\Minecraft.World\net.minecraft.world.level.tile.h"
|
||||
|
||||
SkullTileRenderer *SkullTileRenderer::instance = NULL;
|
||||
|
||||
ResourceLocation SkullTileRenderer::SKELETON_LOCATION = ResourceLocation(TN_MOB_SKELETON);
|
||||
ResourceLocation SkullTileRenderer::WITHER_SKELETON_LOCATION = ResourceLocation(TN_MOB_WITHER_SKELETON);
|
||||
ResourceLocation SkullTileRenderer::ZOMBIE_LOCATION = ResourceLocation(TN_MOB_ZOMBIE);
|
||||
ResourceLocation SkullTileRenderer::CREEPER_LOCATION = ResourceLocation(TN_MOB_CREEPER);
|
||||
|
||||
SkullTileRenderer::SkullTileRenderer()
|
||||
{
|
||||
skeletonModel = new SkeletonHeadModel(0, 0, 64, 32);
|
||||
@@ -38,10 +44,10 @@ void SkullTileRenderer::renderSkull(float x, float y, float z, int face, float r
|
||||
switch (type)
|
||||
{
|
||||
case SkullTileEntity::TYPE_WITHER:
|
||||
bindTexture(TN_MOB_WITHER_SKELETON);
|
||||
bindTexture(&WITHER_SKELETON_LOCATION);
|
||||
break;
|
||||
case SkullTileEntity::TYPE_ZOMBIE:
|
||||
bindTexture(TN_MOB_ZOMBIE);
|
||||
bindTexture(&ZOMBIE_LOCATION);
|
||||
//model = zombieModel;
|
||||
break;
|
||||
case SkullTileEntity::TYPE_CHAR:
|
||||
@@ -58,15 +64,15 @@ void SkullTileRenderer::renderSkull(float x, float y, float z, int face, float r
|
||||
//}
|
||||
//else
|
||||
{
|
||||
bindTexture(TN_MOB_CHAR);
|
||||
bindTexture(&PlayerRenderer::DEFAULT_LOCATION);
|
||||
}
|
||||
break;
|
||||
case SkullTileEntity::TYPE_CREEPER:
|
||||
bindTexture(TN_MOB_CREEPER);
|
||||
bindTexture(&CREEPER_LOCATION);
|
||||
break;
|
||||
case SkullTileEntity::TYPE_SKELETON:
|
||||
default:
|
||||
bindTexture(TN_MOB_SKELETON);
|
||||
bindTexture(&SKELETON_LOCATION);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user