From 06c878dd2c3065009931356385cf4cf7b290c47d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Tue, 27 Feb 2024 15:34:12 -0600
Subject: [PATCH] feat: some cleaning up

---
 .../[id]/components/Model/TankSandbox.tsx     |  4 +---
 .../Armor/components/CoreArmorScene.tsx       |  2 --
 .../SpacedArmorSubExternal/index.tsx          | 21 +++++++++----------
 .../components/SpacedArmorSubSpaced/index.ts  |  2 +-
 .../Armor/components/SpacedArmor/index.tsx    |  7 -------
 5 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx b/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx
index 563d57d4c..5f24b01eb 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx
@@ -195,9 +195,7 @@ export function TankSandbox() {
                     <SceneProps />
 
                     <Suspense fallback={<ModelLoader />}>
-                      {/* <ShotDisplay />
-                      
-                      */}
+                      {/* <ShotDisplay /> */}
                       {/* <SpacedArmorScene /> */}
                       <Lighting />
                       <TankModel />
diff --git a/src/components/Armor/components/CoreArmorScene.tsx b/src/components/Armor/components/CoreArmorScene.tsx
index dfe78232b..99778c6f9 100644
--- a/src/components/Armor/components/CoreArmorScene.tsx
+++ b/src/components/Armor/components/CoreArmorScene.tsx
@@ -9,7 +9,6 @@ import {
 import { nameToArmorId } from '../../../core/blitzkrieg/nameToArmorId';
 import { resolveArmor } from '../../../core/blitzkrieg/resolveThickness';
 import { useArmor } from '../../../hooks/useArmor';
-import { useModel } from '../../../hooks/useModel';
 import { useModelDefinitions } from '../../../hooks/useModelDefinitions';
 import { useDuel } from '../../../stores/duel';
 import { useTankopediaPersistent } from '../../../stores/tankopedia';
@@ -117,7 +116,6 @@ export const CoreArmorScene = memo<CoreArmorSceneProps>(
     });
 
     const armorGltf = useArmor(protagonist.tank.id);
-    const { gltf: modelGltf } = useModel(protagonist.tank.id);
 
     const armorNodes = Object.values(armorGltf.nodes);
     const tankModelDefinition = modelDefinitions[protagonist.tank.id];
diff --git a/src/components/Armor/components/SpacedArmor/components/SpacedArmorSubExternal/index.tsx b/src/components/Armor/components/SpacedArmor/components/SpacedArmorSubExternal/index.tsx
index 5c0a7c80b..0f6ca3e72 100644
--- a/src/components/Armor/components/SpacedArmor/components/SpacedArmorSubExternal/index.tsx
+++ b/src/components/Armor/components/SpacedArmor/components/SpacedArmorSubExternal/index.tsx
@@ -19,12 +19,19 @@ export function SpacedArmorSubExternal({
   node,
   thickness,
 }: SpacedArmorSubExternalProps) {
-  const penetration = resolveNearPenetration(
-    useDuel.getState().antagonist!.shell.penetration,
-  );
+  const shell = useDuel((state) => state.antagonist!.shell);
+  const penetration = resolveNearPenetration(shell.penetration);
 
   return (
     <>
+      {jsxTree(node, {
+        renderOrder: 3,
+        material: new MeshBasicMaterial({
+          colorWrite: false,
+          depthTest: true,
+          depthWrite: true,
+        }),
+      })}
       {jsxTree(node, {
         renderOrder: 4,
         material: new ShaderMaterial({
@@ -41,14 +48,6 @@ export function SpacedArmorSubExternal({
           },
         }),
       })}
-      {jsxTree(node, {
-        renderOrder: 3,
-        material: new MeshBasicMaterial({
-          colorWrite: false,
-          depthTest: true,
-          depthWrite: true,
-        }),
-      })}
     </>
   );
 }
diff --git a/src/components/Armor/components/SpacedArmor/components/SpacedArmorSubSpaced/index.ts b/src/components/Armor/components/SpacedArmor/components/SpacedArmorSubSpaced/index.ts
index a086aaaff..e3b941c26 100644
--- a/src/components/Armor/components/SpacedArmor/components/SpacedArmorSubSpaced/index.ts
+++ b/src/components/Armor/components/SpacedArmor/components/SpacedArmorSubSpaced/index.ts
@@ -15,7 +15,7 @@ export function SpacedArmorSubSpaced({
   node,
   thickness,
 }: SpacedArmorSubSpacedProps) {
-  const { shell } = useDuel.getState().antagonist!;
+  const shell = useDuel((state) => state.antagonist!.shell);
   const penetration = resolveNearPenetration(shell.penetration);
 
   return jsxTree(node, {
diff --git a/src/components/Armor/components/SpacedArmor/index.tsx b/src/components/Armor/components/SpacedArmor/index.tsx
index 365478cec..219b69655 100644
--- a/src/components/Armor/components/SpacedArmor/index.tsx
+++ b/src/components/Armor/components/SpacedArmor/index.tsx
@@ -1,7 +1,5 @@
 import { MeshBasicMaterial, Object3D } from 'three';
-import { resolveNearPenetration } from '../../../../core/blitz/resolveNearPenetration';
 import { jsxTree } from '../../../../core/blitzkrieg/jsxTree';
-import { useDuel } from '../../../../stores/duel';
 import { ArmorType } from '../SpacedArmorScene';
 import { SpacedArmorSubExternal } from './components/SpacedArmorSubExternal';
 import { SpacedArmorSubSpaced } from './components/SpacedArmorSubSpaced';
@@ -18,11 +16,6 @@ const omitMaterial = new MeshBasicMaterial({
 });
 
 export function SpacedArmor({ node, type, thickness }: SpacedArmorProps) {
-  const penetrationRaw = useDuel(
-    (state) => state.antagonist!.shell.penetration,
-  );
-  const penetration = resolveNearPenetration(penetrationRaw);
-
   /**
    * Render orders allocations:
    * - 0  : core omission