From 8a0656cfcde4e64017e8328da70b19625d3805ae Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Sun, 12 May 2024 17:54:13 +0200
Subject: [PATCH] SkinRenderer - Fix Default arm rotation and pivot points

---
 PCK-Studio/Internal/ModelPartSpecifics.cs | 8 ++++----
 PCK-Studio/Rendering/SkinRenderer.cs      | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/PCK-Studio/Internal/ModelPartSpecifics.cs b/PCK-Studio/Internal/ModelPartSpecifics.cs
index f974b521..9aeb57d1 100644
--- a/PCK-Studio/Internal/ModelPartSpecifics.cs
+++ b/PCK-Studio/Internal/ModelPartSpecifics.cs
@@ -14,10 +14,10 @@ namespace PckStudio.Internal
         {
             ["HEAD"] = new PositioningInfo(),
             ["BODY"] = new PositioningInfo(),
-            ["ARM0"] = new PositioningInfo(new(-5f,  -2f, 0f), new( 4f,  2f, 0f)),
-            ["ARM1"] = new PositioningInfo(new( 5f,  -2f, 0f), new(-4f,  2f, 0f)),
-            ["LEG0"] = new PositioningInfo(new(-2f, -12f, 0f), new(-2f, 12f, 0f)),
-            ["LEG1"] = new PositioningInfo(new( 2f, -12f, 0f), new( 2f, 12f, 0f)),
+            ["ARM0"] = new PositioningInfo(new(-5f,  -2f, 0f), new( 6f,  2f, 0f)),
+            ["ARM1"] = new PositioningInfo(new( 5f,  -2f, 0f), new(-6f,  2f, 0f)),
+            ["LEG0"] = new PositioningInfo(new(-2f, -12f, 0f), new( 2f, 12f, 0f)),
+            ["LEG1"] = new PositioningInfo(new( 2f, -12f, 0f), new(-2f, 12f, 0f)),
         };
 
         internal record struct PositioningInfo(Vector3 Translation, Vector3 Pivot);
diff --git a/PCK-Studio/Rendering/SkinRenderer.cs b/PCK-Studio/Rendering/SkinRenderer.cs
index 0d06d361..93a92b3d 100644
--- a/PCK-Studio/Rendering/SkinRenderer.cs
+++ b/PCK-Studio/Rendering/SkinRenderer.cs
@@ -228,8 +228,10 @@ namespace PckStudio.Rendering
         private bool showWireFrame = false;
         private bool autoInflateOverlayParts;
 
-        private Matrix4 RightArmMatrix { get; set; } = Matrix4.CreateFromAxisAngle(Vector3.UnitZ,  25f);
-        private Matrix4 LeftArmMatrix  { get; set; } = Matrix4.CreateFromAxisAngle(Vector3.UnitZ, -25f);
+        private float defaultArmRotation => 5f;
+
+        private Matrix4 RightArmMatrix => Matrix4.CreateFromAxisAngle(Vector3.UnitZ, MathHelper.DegreesToRadians(-defaultArmRotation));
+        private Matrix4 LeftArmMatrix => Matrix4.CreateFromAxisAngle(Vector3.UnitZ, MathHelper.DegreesToRadians(defaultArmRotation));
 
         private static Vector3[] cubeVertices = new Vector3[]
         {