* 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>
43 lines
1.5 KiB
C++
43 lines
1.5 KiB
C++
#include "stdafx.h"
|
|
#include "OcelotRenderer.h"
|
|
#include "..\Minecraft.World\net.minecraft.world.entity.animal.h"
|
|
|
|
ResourceLocation OcelotRenderer::CAT_BLACK_LOCATION = ResourceLocation(TN_MOB_CAT_BLACK);
|
|
ResourceLocation OcelotRenderer::CAT_OCELOT_LOCATION = ResourceLocation(TN_MOB_OCELOT);
|
|
ResourceLocation OcelotRenderer::CAT_RED_LOCATION = ResourceLocation(TN_MOB_CAT_RED);
|
|
ResourceLocation OcelotRenderer::CAT_SIAMESE_LOCATION = ResourceLocation(TN_MOB_CAT_SIAMESE);
|
|
|
|
OcelotRenderer::OcelotRenderer(Model *model, float shadow) : MobRenderer(model, shadow)
|
|
{
|
|
}
|
|
|
|
void OcelotRenderer::render(shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a)
|
|
{
|
|
MobRenderer::render(_mob, x, y, z, rot, a);
|
|
}
|
|
|
|
ResourceLocation *OcelotRenderer::getTextureLocation(shared_ptr<Entity> entity)
|
|
{
|
|
shared_ptr<Ocelot> cat = dynamic_pointer_cast<Ocelot>(entity);
|
|
|
|
switch (cat->getCatType())
|
|
{
|
|
default:
|
|
case Ocelot::TYPE_OCELOT: return &CAT_OCELOT_LOCATION;
|
|
case Ocelot::TYPE_BLACK: return &CAT_BLACK_LOCATION;
|
|
case Ocelot::TYPE_RED: return &CAT_RED_LOCATION;
|
|
case Ocelot::TYPE_SIAMESE: return &CAT_SIAMESE_LOCATION;
|
|
}
|
|
}
|
|
|
|
void OcelotRenderer::scale(shared_ptr<LivingEntity> _mob, float a)
|
|
{
|
|
// 4J - original version used generics and thus had an input parameter of type Blaze rather than shared_ptr<Entity> we have here -
|
|
// do some casting around instead
|
|
shared_ptr<Ocelot> mob = dynamic_pointer_cast<Ocelot>(_mob);
|
|
MobRenderer::scale(mob, a);
|
|
if (mob->isTame())
|
|
{
|
|
glScalef(.8f, .8f, .8f);
|
|
}
|
|
} |