From 1effa243fd7fb3a98bf846a69506a2781d5713b4 Mon Sep 17 00:00:00 2001
From: miku-666 <74728189+NessieHax@users.noreply.github.com>
Date: Wed, 23 Oct 2024 10:26:32 +0200
Subject: [PATCH] BoundingBox - Move 'Abs' function into extension class

---
 PCK-Studio/Extensions/OpenTKExtensions.cs     | 25 +++++++++++++++++++
 .../Extensions/OpenTkMatrixExtensions.cs      | 21 ----------------
 PCK-Studio/PckStudio.csproj                   |  2 +-
 PCK-Studio/Rendering/BoundingBox.cs           |  6 +----
 4 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 PCK-Studio/Extensions/OpenTKExtensions.cs
 delete mode 100644 PCK-Studio/Extensions/OpenTkMatrixExtensions.cs

diff --git a/PCK-Studio/Extensions/OpenTKExtensions.cs b/PCK-Studio/Extensions/OpenTKExtensions.cs
new file mode 100644
index 00000000..0f5083d6
--- /dev/null
+++ b/PCK-Studio/Extensions/OpenTKExtensions.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using OpenTK;
+
+namespace PckStudio.Extensions
+{
+    internal static class OpenTKExtensions
+    {
+        internal static Matrix4 Pivoted(this Matrix4 rotation, Vector3 pivot)
+        {
+            var model = Matrix4.CreateTranslation(pivot);
+            model *= rotation;
+            model *= Matrix4.CreateTranslation(pivot).Inverted();
+            return model;
+        }
+
+        public static Vector3 Abs(Vector3 value)
+        {
+            return new Vector3(Math.Abs(value.X), Math.Abs(value.Y), Math.Abs(value.Z));
+        }
+    }
+}
diff --git a/PCK-Studio/Extensions/OpenTkMatrixExtensions.cs b/PCK-Studio/Extensions/OpenTkMatrixExtensions.cs
deleted file mode 100644
index 312cce34..00000000
--- a/PCK-Studio/Extensions/OpenTkMatrixExtensions.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OpenTK;
-
-namespace PckStudio.Extensions
-{
-    internal static class OpenTkMatrixExtensions
-    {
-        internal static Matrix4 Pivoted(this Matrix4 target, Vector3 translation, Vector3 pivot)
-        {
-            var model = Matrix4.CreateTranslation(translation);
-            model *= Matrix4.CreateTranslation(pivot);
-            model *= target;
-            model *= Matrix4.CreateTranslation(pivot).Inverted();
-            return model;
-        }
-    }
-}
diff --git a/PCK-Studio/PckStudio.csproj b/PCK-Studio/PckStudio.csproj
index 9ef35daa..0afcf9e1 100644
--- a/PCK-Studio/PckStudio.csproj
+++ b/PCK-Studio/PckStudio.csproj
@@ -151,7 +151,7 @@
     <Compile Include="Forms\ContributorsForm.Designer.cs">
       <DependentUpon>ContributorsForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="Extensions\OpenTkMatrixExtensions.cs" />
+    <Compile Include="Extensions\OpenTKExtensions.cs" />
     <Compile Include="Forms\Editor\ModelEditor.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/PCK-Studio/Rendering/BoundingBox.cs b/PCK-Studio/Rendering/BoundingBox.cs
index 4a2957ba..bd7006b8 100644
--- a/PCK-Studio/Rendering/BoundingBox.cs
+++ b/PCK-Studio/Rendering/BoundingBox.cs
@@ -20,7 +20,7 @@ namespace PckStudio.Rendering
             Start = start;
             End = end;
             OpenTK.Vector3 size = End - Start;
-            Volume = Abs(size);
+            Volume = OpenTKExtensions.Abs(size);
             Center = start + Volume / 2;
         }
 
@@ -29,10 +29,6 @@ namespace PckStudio.Rendering
         {
         }
 
-        private static OpenTK.Vector3 Abs(OpenTK.Vector3 value)
-        {
-            return new OpenTK.Vector3(Math.Abs(value.X), Math.Abs(value.Y), Math.Abs(value.Z));
-        }
 
         public ColorVertex[] GetVertices()
         {