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:
@@ -4,12 +4,15 @@
|
||||
#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
|
||||
#include "..\Minecraft.World\Mth.h"
|
||||
|
||||
CreeperRenderer::CreeperRenderer() : MobRenderer( new CreeperModel(), 0.5f )
|
||||
ResourceLocation CreeperRenderer::POWER_LOCATION = ResourceLocation(TN_POWERED_CREEPER);
|
||||
ResourceLocation CreeperRenderer::CREEPER_LOCATION = ResourceLocation(TN_MOB_CREEPER);
|
||||
|
||||
CreeperRenderer::CreeperRenderer() : MobRenderer(new CreeperModel(), 0.5f)
|
||||
{
|
||||
armorModel = new CreeperModel(2);
|
||||
}
|
||||
|
||||
void CreeperRenderer::scale(shared_ptr<Mob> mob, float a)
|
||||
void CreeperRenderer::scale(shared_ptr<LivingEntity> mob, float a)
|
||||
{
|
||||
shared_ptr<Creeper> creeper = dynamic_pointer_cast<Creeper>(mob);
|
||||
|
||||
@@ -25,7 +28,7 @@ void CreeperRenderer::scale(shared_ptr<Mob> mob, float a)
|
||||
glScalef(s, hs, s);
|
||||
}
|
||||
|
||||
int CreeperRenderer::getOverlayColor(shared_ptr<Mob> mob, float br, float a)
|
||||
int CreeperRenderer::getOverlayColor(shared_ptr<LivingEntity> mob, float br, float a)
|
||||
{
|
||||
shared_ptr<Creeper> creeper = dynamic_pointer_cast<Creeper>(mob);
|
||||
|
||||
@@ -44,7 +47,7 @@ int CreeperRenderer::getOverlayColor(shared_ptr<Mob> mob, float br, float a)
|
||||
return (_a << 24) | (r << 16) | (g << 8) | b;
|
||||
}
|
||||
|
||||
int CreeperRenderer::prepareArmor(shared_ptr<Mob> _mob, int layer, float a)
|
||||
int CreeperRenderer::prepareArmor(shared_ptr<LivingEntity> _mob, int layer, float a)
|
||||
{
|
||||
// 4J - dynamic cast required because we aren't using templates/generics in our version
|
||||
shared_ptr<Creeper> mob = dynamic_pointer_cast<Creeper>(_mob);
|
||||
@@ -56,7 +59,7 @@ int CreeperRenderer::prepareArmor(shared_ptr<Mob> _mob, int layer, float a)
|
||||
if (layer == 1)
|
||||
{
|
||||
float time = mob->tickCount + a;
|
||||
bindTexture(TN_POWERED_CREEPER);// was L"/armor/power.png");
|
||||
bindTexture(&POWER_LOCATION);
|
||||
glMatrixMode(GL_TEXTURE);
|
||||
glLoadIdentity();
|
||||
float uo = time * 0.01f;
|
||||
@@ -84,7 +87,12 @@ int CreeperRenderer::prepareArmor(shared_ptr<Mob> _mob, int layer, float a)
|
||||
|
||||
}
|
||||
|
||||
int CreeperRenderer::prepareArmorOverlay(shared_ptr<Mob> mob, int layer, float a)
|
||||
int CreeperRenderer::prepareArmorOverlay(shared_ptr<LivingEntity> mob, int layer, float a)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
ResourceLocation *CreeperRenderer::getTextureLocation(shared_ptr<Entity> mob)
|
||||
{
|
||||
return &CREEPER_LOCATION;
|
||||
}
|
||||
Reference in New Issue
Block a user