a9be52c41a
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
112 lines
3.1 KiB
C++
112 lines
3.1 KiB
C++
#include "stdafx.h"
|
|
#include "ZombieModel.h"
|
|
#include "VillagerZombieModel.h"
|
|
#include "..\Minecraft.World\net.minecraft.world.entity.monster.h"
|
|
#include "ZombieRenderer.h"
|
|
|
|
ResourceLocation ZombieRenderer::ZOMBIE_PIGMAN_LOCATION(TN_MOB_PIGZOMBIE);
|
|
ResourceLocation ZombieRenderer::ZOMBIE_LOCATION(TN_MOB_ZOMBIE);
|
|
ResourceLocation ZombieRenderer::ZOMBIE_VILLAGER_LOCATION(TN_MOB_ZOMBIE_VILLAGER);
|
|
|
|
ZombieRenderer::ZombieRenderer() : HumanoidMobRenderer(new ZombieModel(), .5f, 1.0f)
|
|
{
|
|
modelVersion = 1;
|
|
defaultModel = humanoidModel;
|
|
villagerModel = new VillagerZombieModel();
|
|
|
|
defaultArmorParts1 = nullptr;
|
|
defaultArmorParts2 = nullptr;
|
|
|
|
villagerArmorParts1 = nullptr;
|
|
villagerArmorParts2 = nullptr;
|
|
|
|
createArmorParts();
|
|
}
|
|
|
|
void ZombieRenderer::createArmorParts()
|
|
{
|
|
delete armorParts1;
|
|
delete armorParts2;
|
|
|
|
armorParts1 = new ZombieModel(1.0f, true);
|
|
armorParts2 = new ZombieModel(0.5f, true);
|
|
|
|
defaultArmorParts1 = armorParts1;
|
|
defaultArmorParts2 = armorParts2;
|
|
|
|
villagerArmorParts1 = new VillagerZombieModel(1.0f, 0, true);
|
|
villagerArmorParts2 = new VillagerZombieModel(0.5f, 0, true);
|
|
}
|
|
|
|
int ZombieRenderer::prepareArmor(shared_ptr<LivingEntity> _mob, int layer, float a)
|
|
{
|
|
shared_ptr<Zombie> mob = dynamic_pointer_cast<Zombie>(_mob);
|
|
swapArmor(mob);
|
|
return HumanoidMobRenderer::prepareArmor(_mob, layer, a);
|
|
}
|
|
|
|
void ZombieRenderer::render(shared_ptr<Entity> _mob, double x, double y, double z, float rot, float a)
|
|
{
|
|
shared_ptr<Zombie> mob = dynamic_pointer_cast<Zombie>(_mob);
|
|
swapArmor(mob);
|
|
HumanoidMobRenderer::render(_mob, x, y, z, rot, a);
|
|
}
|
|
|
|
ResourceLocation *ZombieRenderer::getTextureLocation(shared_ptr<Entity> entity)
|
|
{
|
|
shared_ptr<Zombie> mob = dynamic_pointer_cast<Zombie>(entity);
|
|
|
|
// TODO Extract this clusterfck into 3 renderers
|
|
if ( entity->instanceof(eTYPE_PIGZOMBIE) )
|
|
{
|
|
return &ZOMBIE_PIGMAN_LOCATION;
|
|
}
|
|
|
|
if (mob->isVillager())
|
|
{
|
|
return &ZOMBIE_VILLAGER_LOCATION;
|
|
}
|
|
return &ZOMBIE_LOCATION;
|
|
}
|
|
|
|
void ZombieRenderer::additionalRendering(shared_ptr<LivingEntity> _mob, float a)
|
|
{
|
|
shared_ptr<Zombie> mob = dynamic_pointer_cast<Zombie>(_mob);
|
|
swapArmor(mob);
|
|
HumanoidMobRenderer::additionalRendering(_mob, a);
|
|
}
|
|
|
|
void ZombieRenderer::swapArmor(shared_ptr<Zombie> mob)
|
|
{
|
|
if (mob->isVillager())
|
|
{
|
|
//if (modelVersion != villagerModel->version())
|
|
//{
|
|
// villagerModel = new VillagerZombieModel();
|
|
// modelVersion = villagerModel->version();
|
|
// villagerArmorParts1 = new VillagerZombieModel(1.0f, 0, true);
|
|
// villagerArmorParts2 = new VillagerZombieModel(0.5f, 0, true);
|
|
//}
|
|
model = villagerModel;
|
|
armorParts1 = villagerArmorParts1;
|
|
armorParts2 = villagerArmorParts2;
|
|
}
|
|
else
|
|
{
|
|
model = defaultModel;
|
|
armorParts1 = defaultArmorParts1;
|
|
armorParts2 = defaultArmorParts2;
|
|
}
|
|
|
|
humanoidModel = static_cast<HumanoidModel *>(model);
|
|
}
|
|
|
|
void ZombieRenderer::setupRotations(shared_ptr<LivingEntity> _mob, float bob, float bodyRot, float a)
|
|
{
|
|
shared_ptr<Zombie> mob = dynamic_pointer_cast<Zombie>(_mob);
|
|
if (mob->isConverting())
|
|
{
|
|
bodyRot += static_cast<float>(cos(mob->tickCount * 3.25) * PI * .25f);
|
|
}
|
|
HumanoidMobRenderer::setupRotations(mob, bob, bodyRot, a);
|
|
} |