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
105 lines
3.2 KiB
C++
105 lines
3.2 KiB
C++
#include "stdafx.h"
|
|
#include "..\Minecraft.World\Mth.h"
|
|
#include "ChickenModel.h"
|
|
#include "ModelPart.h"
|
|
|
|
ChickenModel::ChickenModel() : Model()
|
|
{
|
|
int yo = 16;
|
|
head = new ModelPart(this, 0, 0);
|
|
head->addBox(-2.0f, -6.0f, -2.0f, 4, 6, 3, 0.0f); // Head
|
|
head->setPos(0, static_cast<float>(-1 + yo), -4);
|
|
|
|
beak = new ModelPart(this, 14, 0);
|
|
beak->addBox(-2.0f, -4.0f, -4.0f, 4, 2, 2, 0.0f); // Beak
|
|
beak->setPos(0, static_cast<float>(-1 + yo), -4);
|
|
|
|
redThing = new ModelPart(this, 14, 4);
|
|
redThing->addBox(-1.0f, -2.0f, -3.0f, 2, 2, 2, 0.0f); // Beak
|
|
redThing->setPos(0, static_cast<float>(-1 + yo), -4);
|
|
|
|
body = new ModelPart(this, 0, 9);
|
|
body->addBox(-3.0f, -4.0f, -3.0f, 6, 8, 6, 0.0f); // Body
|
|
body->setPos(0, static_cast<float>(0 + yo), 0);
|
|
|
|
leg0 = new ModelPart(this, 26, 0);
|
|
leg0->addBox(-1.0f, 0.0f, -3.0f, 3, 5, 3); // Leg0
|
|
leg0->setPos(-2, static_cast<float>(3 + yo), 1);
|
|
|
|
leg1 = new ModelPart(this, 26, 0);
|
|
leg1->addBox(-1.0f, 0.0f, -3.0f, 3, 5, 3); // Leg1
|
|
leg1->setPos(1, static_cast<float>(3 + yo), 1);
|
|
|
|
wing0 = new ModelPart(this, 24, 13);
|
|
wing0->addBox(0.0f, 0.0f, -3.0f, 1, 4, 6); // Wing0
|
|
wing0->setPos(-4, static_cast<float>(-3 + yo), 0);
|
|
|
|
wing1 = new ModelPart(this, 24, 13);
|
|
wing1->addBox(-1.0f, 0.0f, -3.0f, 1, 4, 6); // Wing1
|
|
wing1->setPos(4, static_cast<float>(-3 + yo), 0);
|
|
|
|
// 4J added - compile now to avoid random performance hit first time cubes are rendered
|
|
head->compile(1.0f/16.0f);
|
|
beak->compile(1.0f/16.0f);
|
|
redThing->compile(1.0f/16.0f);
|
|
body->compile(1.0f/16.0f);
|
|
leg0->compile(1.0f/16.0f);
|
|
leg1->compile(1.0f/16.0f);
|
|
wing0->compile(1.0f/16.0f);
|
|
wing1->compile(1.0f/16.0f);
|
|
}
|
|
|
|
void ChickenModel::render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled)
|
|
{
|
|
setupAnim(time, r, bob, yRot, xRot, scale, entity);
|
|
if (young)
|
|
{
|
|
float ss = 2;
|
|
glPushMatrix();
|
|
glTranslatef(0, 5 * scale, 2 * scale);
|
|
head->render(scale,usecompiled);
|
|
beak->render(scale,usecompiled);
|
|
redThing->render(scale,usecompiled);
|
|
glPopMatrix();
|
|
glPushMatrix();
|
|
glScalef(1 / ss, 1 / ss, 1 / ss);
|
|
glTranslatef(0, 24 * scale, 0);
|
|
body->render(scale,usecompiled);
|
|
leg0->render(scale,usecompiled);
|
|
leg1->render(scale,usecompiled);
|
|
wing0->render(scale,usecompiled);
|
|
wing1->render(scale,usecompiled);
|
|
glPopMatrix();
|
|
}
|
|
else
|
|
{
|
|
head->render(scale,usecompiled);
|
|
beak->render(scale,usecompiled);
|
|
redThing->render(scale,usecompiled);
|
|
body->render(scale,usecompiled);
|
|
leg0->render(scale,usecompiled);
|
|
leg1->render(scale,usecompiled);
|
|
wing0->render(scale,usecompiled);
|
|
wing1->render(scale,usecompiled);
|
|
}
|
|
}
|
|
|
|
void ChickenModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim)
|
|
{
|
|
head->xRot = xRot / (float) (180 / PI);
|
|
head->yRot = yRot / (float) (180 / PI);
|
|
|
|
beak->xRot = head->xRot;
|
|
beak->yRot = head->yRot;
|
|
|
|
redThing->xRot = head->xRot;
|
|
redThing->yRot = head->yRot;
|
|
|
|
body->xRot = 90 / (float) (180 / PI);
|
|
|
|
leg0->xRot = (Mth::cos(time * 0.6662f) * 1.4f) * r;
|
|
leg1->xRot = ( Mth::cos(time * 0.6662f + PI) * 1.4f) * r;
|
|
wing0->zRot = bob;
|
|
wing1->zRot = -bob;
|
|
}
|