* 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>
107 lines
2.8 KiB
C++
107 lines
2.8 KiB
C++
#include "stdafx.h"
|
|
#include "..\Minecraft.World\net.minecraft.world.entity.ambient.h"
|
|
#include "BatModel.h"
|
|
#include "ModelPart.h"
|
|
|
|
BatModel::BatModel() : Model()
|
|
{
|
|
texWidth = 64;
|
|
texHeight = 64;
|
|
|
|
head = new ModelPart(this, 0, 0);
|
|
head->addBox(-3, -3, -3, 6, 6, 6);
|
|
|
|
ModelPart *rightEar = new ModelPart(this, 24, 0);
|
|
rightEar->addBox(-4, -6, -2, 3, 4, 1);
|
|
head->addChild(rightEar);
|
|
ModelPart *leftEar = new ModelPart(this, 24, 0);
|
|
leftEar->bMirror = true;
|
|
leftEar->addBox(1, -6, -2, 3, 4, 1);
|
|
head->addChild(leftEar);
|
|
|
|
body = new ModelPart(this, 0, 16);
|
|
body->addBox(-3, 4, -3, 6, 12, 6);
|
|
body->texOffs(0, 34)->addBox(-5, 16, 0, 10, 6, 1);
|
|
|
|
rightWing = new ModelPart(this, 42, 0);
|
|
rightWing->addBox(-12, 1, 1.5f, 10, 16, 1);
|
|
rightWingTip = new ModelPart(this, 24, 16);
|
|
rightWingTip->setPos(-12, 1, 1.5f);
|
|
rightWingTip->addBox(-8, 1, 0, 8, 12, 1);
|
|
|
|
leftWing = new ModelPart(this, 42, 0);
|
|
leftWing->bMirror = true;
|
|
leftWing->addBox(2, 1, 1.5f, 10, 16, 1);
|
|
leftWingTip = new ModelPart(this, 24, 16);
|
|
leftWingTip->bMirror = true;
|
|
leftWingTip->setPos(12, 1, 1.5f);
|
|
leftWingTip->addBox(0, 1, 0, 8, 12, 1);
|
|
|
|
body->addChild(rightWing);
|
|
body->addChild(leftWing);
|
|
rightWing->addChild(rightWingTip);
|
|
leftWing->addChild(leftWingTip);
|
|
|
|
// 4J added - compile now to avoid random performance hit first time cubes are rendered
|
|
// 4J Stu - Not just performance, but alpha+depth tests don't work right unless we compile here
|
|
head->compile(1.0f/16.0f);
|
|
body->compile(1.0f/16.0f);
|
|
rightWing->compile(1.0f/16.0f);
|
|
leftWing->compile(1.0f/16.0f);
|
|
rightWingTip->compile(1.0f/16.0f);
|
|
leftWingTip->compile(1.0f/16.0f);
|
|
rightEar->compile(1.0f/16.0f);
|
|
leftEar->compile(1.0f/16.0f);
|
|
}
|
|
|
|
int BatModel::modelVersion()
|
|
{
|
|
return 36;
|
|
}
|
|
|
|
void BatModel::render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled)
|
|
{
|
|
shared_ptr<Bat> bat = dynamic_pointer_cast<Bat>(entity);
|
|
if (bat->isResting())
|
|
{
|
|
float rad = 180 / PI;
|
|
head->xRot = xRot / rad;
|
|
head->yRot = PI - yRot / rad;
|
|
head->zRot = PI;
|
|
|
|
head->setPos(0, -2, 0);
|
|
rightWing->setPos(-3, 0, 3);
|
|
leftWing->setPos(3, 0, 3);
|
|
|
|
body->xRot = PI;
|
|
|
|
rightWing->xRot = -PI * .05f;
|
|
rightWing->yRot = -PI * .40f;
|
|
rightWingTip->yRot = -PI * .55f;
|
|
leftWing->xRot = rightWing->xRot;
|
|
leftWing->yRot = -rightWing->yRot;
|
|
leftWingTip->yRot = -rightWingTip->yRot;
|
|
}
|
|
else
|
|
{
|
|
float rad = 180 / PI;
|
|
head->xRot = xRot / rad;
|
|
head->yRot = yRot / rad;
|
|
head->zRot = 0;
|
|
|
|
head->setPos(0, 0, 0);
|
|
rightWing->setPos(0, 0, 0);
|
|
leftWing->setPos(0, 0, 0);
|
|
|
|
body->xRot = PI * .25f + cos(bob * .1f) * .15f;
|
|
body->yRot = 0;
|
|
|
|
rightWing->yRot = cos(bob * 1.3f) * PI * .25f;
|
|
leftWing->yRot = -rightWing->yRot;
|
|
rightWingTip->yRot = rightWing->yRot * .5f;
|
|
leftWingTip->yRot = -rightWing->yRot * .5f;
|
|
}
|
|
|
|
head->render(scale, usecompiled);
|
|
body->render(scale, usecompiled);
|
|
} |