aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/SkeletonHeadModel.cpp
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/SkeletonHeadModel.cpp
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/SkeletonHeadModel.cpp')
-rw-r--r--Minecraft.Client/SkeletonHeadModel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Minecraft.Client/SkeletonHeadModel.cpp b/Minecraft.Client/SkeletonHeadModel.cpp
index 340047fe..8e126d66 100644
--- a/Minecraft.Client/SkeletonHeadModel.cpp
+++ b/Minecraft.Client/SkeletonHeadModel.cpp
@@ -29,14 +29,14 @@ SkeletonHeadModel::SkeletonHeadModel(int u, int v, int tw, int th)
void SkeletonHeadModel::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);
+ setupAnim(time, r, bob, yRot, xRot, scale, entity);
head->render(scale,usecompiled);
}
-void SkeletonHeadModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, unsigned int uiBitmaskOverrideAnim)
+void SkeletonHeadModel::setupAnim(float time, float r, float bob, float yRot, float xRot, float scale, shared_ptr<Entity> entity, unsigned int uiBitmaskOverrideAnim)
{
- Model::setupAnim(time, r, bob, yRot, xRot, scale, uiBitmaskOverrideAnim);
+ Model::setupAnim(time, r, bob, yRot, xRot, scale, entity, uiBitmaskOverrideAnim);
head->yRot = yRot / (180 / PI);
head->xRot = xRot / (180 / PI);