aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Model.h
diff options
context:
space:
mode:
authordaoge <3523206925@qq.com>2026-03-03 03:04:10 +0800
committerGitHub <noreply@github.com>2026-03-03 03:04:10 +0800
commitb3feddfef372618c8a9d7a0abcaf18cfad866c18 (patch)
tree267761c3bb39241ba5c347bfbe2254d06686e287 /Minecraft.Client/Model.h
parent84c31a2331f7a0ec85b9d438992e244f60e5020f (diff)
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>
Diffstat (limited to 'Minecraft.Client/Model.h')
-rw-r--r--Minecraft.Client/Model.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/Minecraft.Client/Model.h b/Minecraft.Client/Model.h
index e4161d0c..5a4b6f2e 100644
--- a/Minecraft.Client/Model.h
+++ b/Minecraft.Client/Model.h
@@ -5,6 +5,7 @@ using namespace std;
class Mob;
class ModelPart;
class TexOffs;
+class LivingEntity;
class Model
@@ -20,9 +21,9 @@ public:
Model(); // 4J added
virtual void render(shared_ptr<Entity> entity, float time, float r, float bob, float yRot, float xRot, float scale, bool usecompiled) {}
- virtual void setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, unsigned int uiBitmaskOverrideAnim=0) {}
- virtual void prepareMobModel(shared_ptr<Mob> mob, float time, float r, float a) {}
- virtual ModelPart *getRandomCube(Random random) {return cubes.at(random.nextInt((int)cubes.size()));}
+ virtual void setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim=0) {}
+ virtual void prepareMobModel(shared_ptr<LivingEntity> mob, float time, float r, float a) {}
+ virtual ModelPart *getRandomModelPart(Random random) {return cubes.at(random.nextInt((int)cubes.size()));}
virtual ModelPart * AddOrRetrievePart(SKIN_BOX *pBox) { return NULL;}
void setMapTex(wstring id, int x, int y);