From d2cf8d7100e82b39ace83cb07ab19319ab5aa0a3 Mon Sep 17 00:00:00 2001 From: luisc Date: Mon, 17 Mar 2025 17:18:35 -0500 Subject: [PATCH] Fixed full model offsets for animations --- src/main/java/noppes/npcs/AnimationMixinFunctions.java | 2 +- src/main/java/noppes/npcs/client/model/ModelMPM.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/noppes/npcs/AnimationMixinFunctions.java b/src/main/java/noppes/npcs/AnimationMixinFunctions.java index ce4f3babe..b65e28a01 100644 --- a/src/main/java/noppes/npcs/AnimationMixinFunctions.java +++ b/src/main/java/noppes/npcs/AnimationMixinFunctions.java @@ -214,7 +214,7 @@ public class AnimationMixinFunctions { part.interpolateOffset(); part.interpolateAngles(); float pi = 180 / (float) Math.PI; - GL11.glTranslatef(part.prevPivots[0], part.prevPivots[1], part.prevPivots[2]); + GL11.glTranslatef(part.prevPivots[0], -part.prevPivots[1], part.prevPivots[2]); GL11.glRotatef(part.prevRotations[0] * pi, 1, 0, 0); GL11.glRotatef(part.prevRotations[1] * pi, 0, 1, 0); GL11.glRotatef(part.prevRotations[2] * pi, 0, 0, 1); diff --git a/src/main/java/noppes/npcs/client/model/ModelMPM.java b/src/main/java/noppes/npcs/client/model/ModelMPM.java index 2b29220e6..f27c7693c 100644 --- a/src/main/java/noppes/npcs/client/model/ModelMPM.java +++ b/src/main/java/noppes/npcs/client/model/ModelMPM.java @@ -355,7 +355,7 @@ public class ModelMPM extends ModelNPCMale { part.interpolateAngles(); } float pi = 180 / (float) Math.PI; - GL11.glTranslatef(part.prevPivots[0], part.prevPivots[1], part.prevPivots[2]); + GL11.glTranslatef(part.prevPivots[0], -part.prevPivots[1], part.prevPivots[2]); GL11.glRotatef(part.prevRotations[0] * pi, 1, 0, 0); GL11.glRotatef(part.prevRotations[1] * pi, 0, 1, 0); GL11.glRotatef(part.prevRotations[2] * pi, 0, 0, 1); @@ -685,7 +685,7 @@ public class ModelMPM extends ModelNPCMale { part.interpolateAngles(); } float pi = 180 / (float) Math.PI; - GL11.glTranslatef(part.prevPivots[0], part.prevPivots[1], part.prevPivots[2]); + GL11.glTranslatef(part.prevPivots[0], -part.prevPivots[1], part.prevPivots[2]); GL11.glRotatef(part.prevRotations[0] * pi, 1, 0, 0); GL11.glRotatef(part.prevRotations[1] * pi, 0, 1, 0); GL11.glRotatef(part.prevRotations[2] * pi, 0, 0, 1);