From 386a97c409082f5be1cc4a8128c2f479a896c501 Mon Sep 17 00:00:00 2001 From: miku-666 <74728189+NessieHax@users.noreply.github.com> Date: Fri, 16 Aug 2024 21:33:42 +0200 Subject: [PATCH] SkinRenderer - Fix order of applying anim animations to match the game --- PCK-Studio/Rendering/SkinRenderer.cs | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/PCK-Studio/Rendering/SkinRenderer.cs b/PCK-Studio/Rendering/SkinRenderer.cs index 19d9bf36..65b46fbe 100644 --- a/PCK-Studio/Rendering/SkinRenderer.cs +++ b/PCK-Studio/Rendering/SkinRenderer.cs @@ -947,19 +947,17 @@ namespace PckStudio.Rendering { armRightMatrix = Matrix4.CreateRotationX(MathHelper.DegreesToRadians(animationCurrentRotationAngle)); armLeftMatrix = Matrix4.CreateRotationX(MathHelper.DegreesToRadians((ANIM.GetFlag(SkinAnimFlag.SYNCED_ARMS) ? 1f : -1f) * animationCurrentRotationAngle)); - } - - if (ANIM.GetFlag(SkinAnimFlag.ZOMBIE_ARMS)) - { - var rotation = Matrix4.CreateRotationX(MathHelper.DegreesToRadians(-90f)); - armRightMatrix = rotation; - armLeftMatrix = rotation; - } - - if (ANIM.GetFlag(SkinAnimFlag.STATUE_OF_LIBERTY)) - { - armRightMatrix = Matrix4.CreateRotationX(MathHelper.DegreesToRadians(-180f)); - armLeftMatrix = Matrix4.CreateRotationX(0f); + if (ANIM.GetFlag(SkinAnimFlag.STATUE_OF_LIBERTY)) + { + armRightMatrix = Matrix4.CreateRotationX(MathHelper.DegreesToRadians(-180f)); + armLeftMatrix = Matrix4.CreateRotationX(0f); + } + if (ANIM.GetFlag(SkinAnimFlag.ZOMBIE_ARMS)) + { + var rotation = Matrix4.CreateRotationX(MathHelper.DegreesToRadians(-90f)); + armRightMatrix = rotation; + armLeftMatrix = rotation; + } } if (!ANIM.GetFlag(SkinAnimFlag.STATIC_LEGS))