SkinRenderer - Rename parameter names

PhoenixARC · Jan 31, 2024 · f9c14ae · f9c14ae
1 parent a242c7f
commit f9c14ae
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/PCK-Studio/Rendering/SkinRenderer.cs b/PCK-Studio/Rendering/SkinRenderer.cs
@@ -396,15 +396,15 @@ protected override void OnLoad(EventArgs e)
 
             // Initialize skin shader
             {
-            _skinShader = Shader.Create(Resources.skinVertexShader, Resources.skinFragmentShader);
+                _skinShader = Shader.Create(Resources.skinVertexShader, Resources.skinFragmentShader);
                 _skinShader.Validate();
-            _skinShader.Bind();
-
-            Texture ??= Resources.classic_template;
-            RenderTexture = Texture;
+                _skinShader.Bind();
+            
+                Texture ??= Resources.classic_template;
+                RenderTexture = Texture;
 
-            GLErrorCheck();
-        }
+                GLErrorCheck();
+            }
         }
 
         public void UpdateModelData()
@@ -624,31 +624,37 @@ protected override void OnPaint(PaintEventArgs e)
             SwapBuffers();
         }
 
-        private void RenderBodyPart(Vector3 pivot, Vector3 translation, Matrix4 rotation, Matrix4 globalMatrix, params string[] additionalData)
+        private void RenderBodyPart(Vector3 pivot, Vector3 translation, Matrix4 partMatrix, Matrix4 globalMatrix, params string[] additionalData)
         {
             foreach (var data in additionalData)
             {
-                RenderPart(data, pivot, translation, rotation, globalMatrix);
+                RenderPart(data, pivot, translation, partMatrix, globalMatrix);
             }
         }
 
-        private void RenderPart(string name, Vector3 pivot, Vector3 translation, Matrix4 rotation, Matrix4 globalMatrix)
+        private void RenderPart(string name, Vector3 pivot, Vector3 translation, Matrix4 partMatrix, Matrix4 globalMatrix)
         {
             CubeRenderGroup renderGroup = additionalModelRenderGroups[name];
             float yOffset = GetOffset(name);
             translation.Y -= yOffset;
             pivot.Y += yOffset;
             renderGroup.Submit();
             RenderBuffer buffer = renderGroup.GetRenderBuffer();
-            var model = Matrix4.CreateTranslation(translation);
-            model *= Matrix4.CreateTranslation(pivot);
-            model *= rotation;
-            model *= Matrix4.CreateTranslation(pivot).Inverted();
+            Matrix4 model = Pivot(translation, pivot, partMatrix);
             model *= globalMatrix;
             _skinShader.SetUniformMat4("u_Model", ref model);
             Renderer.Draw(_skinShader, buffer);
         }
 
+        private static Matrix4 Pivot(Vector3 translation, Vector3 pivot, Matrix4 target)
+        {
+            var model = Matrix4.CreateTranslation(translation);
+            model *= Matrix4.CreateTranslation(pivot);
+            model *= target;
+            model *= Matrix4.CreateTranslation(pivot).Inverted();
+            return model;
+        }
+
         protected override void OnMouseWheel(MouseEventArgs e)
         {
             camera.Distance -= e.Delta / System.Windows.Input.Mouse.MouseWheelDeltaForOneLine;