From a0612b2beb55c7a83f22b42b674bca18def0a9fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Sat, 27 Jul 2024 13:46:36 -0500
Subject: [PATCH] fix: hull origin

---
 .../Armor/components/CoreArmorScene.tsx       | 26 +++++-----
 .../Armor/components/SpacedArmorScene.tsx     | 40 +++++++++-------
 .../components/StaticArmorScene.tsx           | 48 ++++++++++---------
 3 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/src/components/Armor/components/CoreArmorScene.tsx b/src/components/Armor/components/CoreArmorScene.tsx
index 5c1f626d4..06e9b7cae 100644
--- a/src/components/Armor/components/CoreArmorScene.tsx
+++ b/src/components/Armor/components/CoreArmorScene.tsx
@@ -88,12 +88,14 @@ export const CoreArmorScene = memo(() => {
           if (!isVisible || spaced || thickness === undefined) return null;
 
           return (
-            <group key={node.uuid} position={turretOrigin}>
-              <CoreArmorSceneComponent
-                key={node.uuid}
-                thickness={thickness}
-                node={node}
-              />
+            <group position={hullOrigin}>
+              <group key={node.uuid} position={turretOrigin}>
+                <CoreArmorSceneComponent
+                  key={node.uuid}
+                  thickness={thickness}
+                  node={node}
+                />
+              </group>
             </group>
           );
         })}
@@ -113,11 +115,13 @@ export const CoreArmorScene = memo(() => {
             if (!isVisible || spaced || thickness === undefined) return null;
 
             return (
-              <group
-                key={node.uuid}
-                position={turretOrigin.clone().add(gunOrigin)}
-              >
-                <CoreArmorSceneComponent thickness={thickness} node={node} />
+              <group position={hullOrigin}>
+                <group
+                  key={node.uuid}
+                  position={turretOrigin.clone().add(gunOrigin)}
+                >
+                  <CoreArmorSceneComponent thickness={thickness} node={node} />
+                </group>
               </group>
             );
           })}
diff --git a/src/components/Armor/components/SpacedArmorScene.tsx b/src/components/Armor/components/SpacedArmorScene.tsx
index 5f786534d..7a6c99e9c 100644
--- a/src/components/Armor/components/SpacedArmorScene.tsx
+++ b/src/components/Armor/components/SpacedArmorScene.tsx
@@ -109,14 +109,16 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
           if (!isVisible || thickness === undefined) return null;
 
           return (
-            <group key={node.uuid} position={turretOrigin}>
-              <SpacedArmorSceneComponent
-                scene={scene}
-                key={node.uuid}
-                type={spaced ? ArmorType.Spaced : ArmorType.Core}
-                thickness={thickness}
-                node={node}
-              />
+            <group position={hullOrigin}>
+              <group key={node.uuid} position={turretOrigin}>
+                <SpacedArmorSceneComponent
+                  scene={scene}
+                  key={node.uuid}
+                  type={spaced ? ArmorType.Spaced : ArmorType.Core}
+                  thickness={thickness}
+                  node={node}
+                />
+              </group>
             </group>
           );
         })}
@@ -136,16 +138,18 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
             if (!isVisible || thickness === undefined) return null;
 
             return (
-              <group
-                key={node.uuid}
-                position={turretOrigin.clone().add(gunOrigin)}
-              >
-                <SpacedArmorSceneComponent
-                  scene={scene}
-                  type={spaced ? ArmorType.Spaced : ArmorType.Core}
-                  thickness={thickness}
-                  node={node}
-                />
+              <group position={hullOrigin}>
+                <group
+                  key={node.uuid}
+                  position={turretOrigin.clone().add(gunOrigin)}
+                >
+                  <SpacedArmorSceneComponent
+                    scene={scene}
+                    type={spaced ? ArmorType.Spaced : ArmorType.Core}
+                    thickness={thickness}
+                    node={node}
+                  />
+                </group>
               </group>
             );
           })}
diff --git a/src/components/StaticArmor/components/StaticArmorScene.tsx b/src/components/StaticArmor/components/StaticArmorScene.tsx
index c98f50fc0..5d4ad57fe 100644
--- a/src/components/StaticArmor/components/StaticArmorScene.tsx
+++ b/src/components/StaticArmor/components/StaticArmorScene.tsx
@@ -178,16 +178,18 @@ export const StaticArmorScene = memo<StaticArmorSceneProps>(
             if (!isVisible || thickness === undefined) return null;
 
             return (
-              <group key={node.uuid} position={turretOrigin}>
-                <SpacedArmorSceneComponent
-                  thicknessRange={thicknessRange}
-                  static
-                  scene={scene}
-                  key={node.uuid}
-                  type={spaced ? ArmorType.Spaced : ArmorType.Core}
-                  thickness={thickness}
-                  node={node}
-                />
+              <group position={hullOrigin}>
+                <group key={node.uuid} position={turretOrigin}>
+                  <SpacedArmorSceneComponent
+                    thicknessRange={thicknessRange}
+                    static
+                    scene={scene}
+                    key={node.uuid}
+                    type={spaced ? ArmorType.Spaced : ArmorType.Core}
+                    thickness={thickness}
+                    node={node}
+                  />
+                </group>
               </group>
             );
           })}
@@ -207,18 +209,20 @@ export const StaticArmorScene = memo<StaticArmorSceneProps>(
               if (!isVisible || thickness === undefined) return null;
 
               return (
-                <group
-                  key={node.uuid}
-                  position={turretOrigin.clone().add(gunOrigin)}
-                >
-                  <SpacedArmorSceneComponent
-                    thicknessRange={thicknessRange}
-                    static
-                    scene={scene}
-                    type={spaced ? ArmorType.Spaced : ArmorType.Core}
-                    thickness={thickness}
-                    node={node}
-                  />
+                <group position={hullOrigin}>
+                  <group
+                    key={node.uuid}
+                    position={turretOrigin.clone().add(gunOrigin)}
+                  >
+                    <SpacedArmorSceneComponent
+                      thicknessRange={thicknessRange}
+                      static
+                      scene={scene}
+                      type={spaced ? ArmorType.Spaced : ArmorType.Core}
+                      thickness={thickness}
+                      node={node}
+                    />
+                  </group>
                 </group>
               );
             })}