From 2f6b186ea85dab92f9a8bdb2182d296ac2aa2971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:39:18 -0600
Subject: [PATCH] feat: hide armor when rotating

---
 .../[id]/components/Model/TankDisplay.tsx     |  3 ++-
 .../components/Model/components/TankArmor.tsx |  6 ++---
 .../components/Model/components/TankModel.tsx | 27 -------------------
 3 files changed, 5 insertions(+), 31 deletions(-)

diff --git a/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx b/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx
index d88ab8f0e..b3fdfe27e 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx
@@ -33,6 +33,7 @@ export function TankDisplay() {
     if (!state.areTanksAssigned) return;
     return state.protagonist;
   });
+  const controlsEnabled = useTankopedia((state) => state.model.controlsEnabled);
 
   if (!protagonist) return null;
 
@@ -133,7 +134,7 @@ export function TankDisplay() {
                   }
                 >
                   <TankModel />
-                  {mode === 'armor' && <TankArmor />}
+                  {mode === 'armor' && controlsEnabled && <TankArmor />}
                 </Suspense>
               </Canvas>
             </div>
diff --git a/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor.tsx b/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor.tsx
index ca6cb6a4f..69bac4422 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor.tsx
@@ -94,7 +94,7 @@ export function TankArmor() {
               key={node.uuid}
               geometry={(node as Mesh).geometry}
               thickness={thickness}
-              penetration={225}
+              penetration={252}
               ricochet={antagonist.shell.ricochet}
               caliber={antagonist.shell.caliber}
               normalization={antagonist.shell.normalization}
@@ -121,7 +121,7 @@ export function TankArmor() {
                 position={turretOrigin}
                 geometry={(node as Mesh).geometry}
                 thickness={thickness}
-                penetration={225}
+                penetration={252}
                 ricochet={antagonist.shell.ricochet}
                 caliber={antagonist.shell.caliber}
                 normalization={antagonist.shell.normalization}
@@ -155,7 +155,7 @@ export function TankArmor() {
                   position={turretOrigin.clone().add(gunOrigin)}
                   geometry={(node as Mesh).geometry}
                   thickness={thickness}
-                  penetration={225}
+                  penetration={252}
                   ricochet={antagonist.shell.ricochet}
                   caliber={antagonist.shell.caliber}
                   normalization={antagonist.shell.normalization}
diff --git a/src/app/tools/tankopedia/[id]/components/Model/components/TankModel.tsx b/src/app/tools/tankopedia/[id]/components/Model/components/TankModel.tsx
index 50ee792cd..07cf50461 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/components/TankModel.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/components/TankModel.tsx
@@ -370,33 +370,6 @@ export function TankModel() {
             );
           })}
         </group>
-
-        {/* <GunContainer
-          ref={gunContainer}
-          armorObjects={Object.values(armorGltf.nodes)}
-          initialTurretRotation={tankModelDefinition.turretRotation}
-          onPitchStart={() => {
-            mutateTankopedia((state) => {
-              state.model.controlsEnabled = false;
-            });
-          }}
-          pitchLimits={gunModelDefinition.pitch}
-          turretContainer={turretContainer}
-          yaw={model.turretYaw}
-          onPitchEnd={(pitch, yaw) => {
-            mutateTankopedia((state) => {
-              state.model.controlsEnabled = true;
-              state.model.gunPitch = pitch;
-              state.model.turretYaw = yaw;
-            });
-          }}
-          yawLimits={turretModelDefinition.yaw}
-          gunOrigin={gunOrigin}
-          pitch={model.gunPitch}
-          model={gunModelDefinition.model}
-          modelObjects={Object.values(modelGltf.nodes)}
-          turretOrigin={turretOrigin}
-        /> */}
       </group>
     </group>
   );