From e3f2fd70ad86a10a81eba18f1cea0a76c5f5178e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Mon, 23 Mar 2026 22:36:10 -0500
Subject: [PATCH] fix: use turret mantlet

---
 .../MixerScene/components/Model.tsx           | 53 +++++++++++++++++--
 1 file changed, 48 insertions(+), 5 deletions(-)

diff --git a/packages/website/src/components/MixerScene/components/Model.tsx b/packages/website/src/components/MixerScene/components/Model.tsx
index 25fa9c211..4f5e583d5 100644
--- a/packages/website/src/components/MixerScene/components/Model.tsx
+++ b/packages/website/src/components/MixerScene/components/Model.tsx
@@ -84,7 +84,7 @@ export function Model() {
 
   useEffect(() => {
     function handleModelTransform(
-      event: QuicklimeEvent<ModelTransformEventData>
+      event: QuicklimeEvent<ModelTransformEventData>,
     ) {
       turretGroup.current.rotation.z = event.data.yaw;
       gunGroup.current.rotation.x = event.data.pitch;
@@ -171,6 +171,49 @@ export function Model() {
                 turretModel.gun_origin.y,
             ]}
           >
+            <group
+              position={[
+                -turretTankModel.turret_origin.x -
+                  turretTrackModel.origin.x -
+                  turretModel.gun_origin.x,
+                -turretTankModel.turret_origin.z -
+                  turretTrackModel.origin.z -
+                  turretModel.gun_origin.z,
+                -turretTankModel.turret_origin.y -
+                  turretTrackModel.origin.y -
+                  turretModel.gun_origin.y,
+              ]}
+            >
+              {turretNodes.map((node) => {
+                const isCurrentMantlet =
+                  node.name ===
+                  `gun_${turretModel.guns[turret.turret.guns.at(-1)!.id].model_id.toString().padStart(2, "0")}_mask`;
+                // const isCurrentGun =
+                //   node.name ===
+                //   `gun_${gunModel.model_id.toString().padStart(2, "0")}`;
+                const isVisible = isCurrentMantlet;
+
+                if (!isVisible) return null;
+
+                return jsxTree(node, {
+                  mesh(_, props, key) {
+                    return (
+                      <mesh
+                        {...props}
+                        key={key}
+                        castShadow
+                        receiveShadow
+                        onPointerDown={(event) => {
+                          enablePitchRotation.current = true;
+                          handlePointerDown(event);
+                        }}
+                      />
+                    );
+                  },
+                });
+              })}
+            </group>
+
             <group
               position={[
                 -gunTankModel.turret_origin.x -
@@ -185,13 +228,13 @@ export function Model() {
               ]}
             >
               {gunNodes.map((node) => {
-                const isCurrentMantlet =
-                  node.name ===
-                  `gun_${gunModel.model_id.toString().padStart(2, "0")}_mask`;
+                // 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;
+                const isVisible = isCurrentGun;
 
                 if (!isVisible) return null;