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:
@@ -2,6 +2,8 @@
|
||||
#include "SquidRenderer.h"
|
||||
#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
|
||||
|
||||
ResourceLocation SquidRenderer::SQUID_LOCATION = ResourceLocation(TN_MOB_SQUID);
|
||||
|
||||
SquidRenderer::SquidRenderer(Model *model, float shadow) : MobRenderer(model, shadow)
|
||||
{
|
||||
}
|
||||
@@ -11,7 +13,7 @@ void SquidRenderer::render(shared_ptr<Entity> mob, double x, double y, double z,
|
||||
MobRenderer::render(mob, x, y, z, rot, a);
|
||||
}
|
||||
|
||||
void SquidRenderer::setupRotations(shared_ptr<Mob> _mob, float bob, float bodyRot, float a)
|
||||
void SquidRenderer::setupRotations(shared_ptr<LivingEntity> _mob, float bob, float bodyRot, float a)
|
||||
{
|
||||
// 4J - dynamic cast required because we aren't using templates/generics in our version
|
||||
shared_ptr<Squid> mob = dynamic_pointer_cast<Squid>(_mob);
|
||||
@@ -26,10 +28,15 @@ void SquidRenderer::setupRotations(shared_ptr<Mob> _mob, float bob, float bodyRo
|
||||
glTranslatef(0, -1.2f, 0);
|
||||
}
|
||||
|
||||
float SquidRenderer::getBob(shared_ptr<Mob> _mob, float a)
|
||||
float SquidRenderer::getBob(shared_ptr<LivingEntity> _mob, float a)
|
||||
{
|
||||
// 4J - dynamic cast required because we aren't using templates/generics in our version
|
||||
shared_ptr<Squid> mob = dynamic_pointer_cast<Squid>(_mob);
|
||||
|
||||
return mob->oldTentacleAngle + (mob->tentacleAngle - mob->oldTentacleAngle) * a;
|
||||
}
|
||||
|
||||
ResourceLocation *SquidRenderer::getTextureLocation(shared_ptr<Entity> mob)
|
||||
{
|
||||
return &SQUID_LOCATION;
|
||||
}
|
||||
Reference in New Issue
Block a user