From 907e71ce0389265bdbb8a18a2d2ebece24c531e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Tue, 30 Sep 2025 16:48:37 -0500
Subject: [PATCH] feat: turret rotation

---
 .../MixerScene/components/Model.tsx           | 130 +++++++++---------
 1 file changed, 67 insertions(+), 63 deletions(-)

diff --git a/packages/website/src/components/MixerScene/components/Model.tsx b/packages/website/src/components/MixerScene/components/Model.tsx
index 7ac4694e1..6ba450857 100644
--- a/packages/website/src/components/MixerScene/components/Model.tsx
+++ b/packages/website/src/components/MixerScene/components/Model.tsx
@@ -110,86 +110,90 @@ export function Model() {
         });
       })}
 
+      <mesh>
+        <icosahedronGeometry args={[0.1]} />
+        <meshNormalMaterial depthTest={false} depthWrite={false} />
+      </mesh>
+
       <group
+        position={[
+          tankModel.turret_origin.x + trackModel.origin.x,
+          tankModel.turret_origin.z + trackModel.origin.z,
+          tankModel.turret_origin.y + trackModel.origin.y,
+        ]}
         ref={turretGroup}
         rotation={[0, 0, modelTransformEvent.last!.yaw]}
-        position={[
-          tankModel.turret_origin.x +
-            trackModel.origin.x -
-            turretTankModel.turret_origin.x -
-            turretTrackModel.origin.x,
-          tankModel.turret_origin.z +
-            trackModel.origin.z -
-            turretTankModel.turret_origin.z -
-            turretTrackModel.origin.z,
-          tankModel.turret_origin.y +
-            trackModel.origin.y -
-            turretTankModel.turret_origin.y -
-            turretTrackModel.origin.y,
-        ]}
       >
-        {turretNodes.map((node) => {
-          const isCurrentTurret =
-            node.name ===
-            `turret_${turretModel.model_id.toString().padStart(2, "0")}`;
-          const isVisible = isCurrentTurret;
-
-          if (!isVisible) return null;
-
-          return jsxTree(node, {
-            mesh(_, props, key) {
-              return (
-                <mesh
-                  {...props}
-                  key={key}
-                  castShadow
-                  receiveShadow
-                  onPointerDown={handlePointerDown}
-                />
-              );
-            },
-          });
-        })}
-
         <group
           position={[
-            turretTankModel.turret_origin.x +
-              turretTrackModel.origin.x +
-              turretModel.gun_origin.x -
-              gunTankModel.turret_origin.x -
-              gunTrackModel.origin.x -
-              gunTurretModel.gun_origin.x,
-            turretTankModel.turret_origin.z +
-              turretTrackModel.origin.z +
-              turretModel.gun_origin.z -
-              gunTankModel.turret_origin.z -
-              gunTrackModel.origin.z -
-              gunTurretModel.gun_origin.z,
-            turretTankModel.turret_origin.y +
-              turretTrackModel.origin.y +
-              turretModel.gun_origin.y -
-              gunTankModel.turret_origin.y -
-              gunTrackModel.origin.y -
-              gunTurretModel.gun_origin.y,
+            -turretTankModel.turret_origin.x - turretTrackModel.origin.x,
+            -turretTankModel.turret_origin.z - turretTrackModel.origin.z,
+            -turretTankModel.turret_origin.y - turretTrackModel.origin.y,
           ]}
         >
-          {gunNodes.map((node) => {
-            const isCurrentMantlet =
+          {turretNodes.map((node) => {
+            const isCurrentTurret =
               node.name ===
-              `gun_${gunModel.model_id.toString().padStart(2, "0")}_mask`;
-            const isCurrentGun =
-              node.name ===
-              `gun_${gunModel.model_id.toString().padStart(2, "0")}`;
-            const isVisible = isCurrentGun || isCurrentMantlet;
+              `turret_${turretModel.model_id.toString().padStart(2, "0")}`;
+            const isVisible = isCurrentTurret;
 
             if (!isVisible) return null;
 
             return jsxTree(node, {
               mesh(_, props, key) {
-                return <mesh {...props} key={key} castShadow receiveShadow />;
+                return (
+                  <mesh
+                    {...props}
+                    key={key}
+                    castShadow
+                    receiveShadow
+                    onPointerDown={handlePointerDown}
+                  />
+                );
               },
             });
           })}
+
+          <group
+            position={[
+              turretTankModel.turret_origin.x +
+                turretTrackModel.origin.x +
+                turretModel.gun_origin.x -
+                gunTankModel.turret_origin.x -
+                gunTrackModel.origin.x -
+                gunTurretModel.gun_origin.x,
+              turretTankModel.turret_origin.z +
+                turretTrackModel.origin.z +
+                turretModel.gun_origin.z -
+                gunTankModel.turret_origin.z -
+                gunTrackModel.origin.z -
+                gunTurretModel.gun_origin.z,
+              turretTankModel.turret_origin.y +
+                turretTrackModel.origin.y +
+                turretModel.gun_origin.y -
+                gunTankModel.turret_origin.y -
+                gunTrackModel.origin.y -
+                gunTurretModel.gun_origin.y,
+            ]}
+          >
+            {gunNodes.map((node) => {
+              const isCurrentMantlet =
+                node.name ===
+                `gun_${gunModel.model_id.toString().padStart(2, "0")}_mask`;
+              const isCurrentGun =
+                node.name ===
+                `gun_${gunModel.model_id.toString().padStart(2, "0")}`;
+              const isVisible = isCurrentGun || isCurrentMantlet;
+
+              if (!isVisible) return null;
+
+              return jsxTree(node, {
+                mesh(_, props, key) {
+                  return <mesh {...props} key={key} castShadow receiveShadow />;
+                },
+              });
+            })}
+          </group>
         </group>
       </group>
     </group>