From a11975adec5a0f58cbcf7ca465beac1b498d35c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Tue, 16 Jan 2024 09:24:12 -0600
Subject: [PATCH] fix: spaced armor layering

---
 scripts/buildAssets/tankArmors.ts                         | 4 ++--
 scripts/buildAssets/tankModels.ts                         | 4 ++--
 .../tankopedia/[id]/components/Model/TankDisplay.tsx      | 1 +
 src/components/ArmorMesh/components/Armor/index.tsx       | 8 +++++---
 src/components/ArmorMesh/components/SpacedArmorDepth.tsx  | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/buildAssets/tankArmors.ts b/scripts/buildAssets/tankArmors.ts
index 220e62a4a..1453bcfe6 100644
--- a/scripts/buildAssets/tankArmors.ts
+++ b/scripts/buildAssets/tankArmors.ts
@@ -20,8 +20,6 @@ export async function buildTankArmors() {
 
   await Promise.all(
     nations.map(async (nation) => {
-      if (nation !== 'european') return;
-
       const tanks = await readXMLDVPL<{ root: VehicleDefinitionList }>(
         `${DATA}/${DOI.vehicleDefinitions}/${nation}/list.xml.dvpl`,
       );
@@ -30,6 +28,8 @@ export async function buildTankArmors() {
         Object.entries(tanks.root).map(async ([tankKey, tank]) => {
           const id = toUniqueId(nation, tank.id);
 
+          if (id !== 9489) return;
+
           console.log(`Building armor ${id} @ ${nation}/${tankKey}`);
 
           const model = await extractArmor(DATA, `${nation}-${tankKey}`);
diff --git a/scripts/buildAssets/tankModels.ts b/scripts/buildAssets/tankModels.ts
index 21a91d310..6227b3dd9 100644
--- a/scripts/buildAssets/tankModels.ts
+++ b/scripts/buildAssets/tankModels.ts
@@ -27,8 +27,6 @@ export async function buildTankModels() {
 
   await Promise.all(
     nations.map(async (nation) => {
-      if (nation !== 'european') return;
-
       const tanks = await readXMLDVPL<{ root: VehicleDefinitionList }>(
         `${DATA}/${DOI.vehicleDefinitions}/${nation}/list.xml.dvpl`,
       );
@@ -45,6 +43,8 @@ export async function buildTankModels() {
         Object.entries(tanks.root).map(async ([tankKey, tank]) => {
           const id = toUniqueId(nation, tank.id);
 
+          if (id !== 9489) return;
+
           console.log(`Building model ${id} @ ${nation}/${tankKey}`);
 
           const parameters = await readYAMLDVPL<TankParameters>(
diff --git a/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx b/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx
index 86972f3de..af76ffd0c 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx
@@ -132,6 +132,7 @@ export function TankDisplay({ duel }: TankDisplayProps) {
                 >
                   <TankModel duel={duel} />
                   <TankArmor duel={duel} />
+                  {/* <SpacedArmorDepth duel={duel} /> */}
                 </Suspense>
               </Canvas>
             </div>
diff --git a/src/components/ArmorMesh/components/Armor/index.tsx b/src/components/ArmorMesh/components/Armor/index.tsx
index 8e93bec83..206a1a77d 100644
--- a/src/components/ArmorMesh/components/Armor/index.tsx
+++ b/src/components/ArmorMesh/components/Armor/index.tsx
@@ -50,9 +50,11 @@ export function ArmorMesh({
 
   return (
     <>
-      <mesh {...props} renderOrder={0}>
-        <meshBasicMaterial colorWrite={false} />
-      </mesh>
+      {!isSpaced && (
+        <mesh {...props} renderOrder={0}>
+          <meshBasicMaterial colorWrite={false} />
+        </mesh>
+      )}
 
       <mesh {...props} renderOrder={1}>
         <ThreeCustomShaderMaterial
diff --git a/src/components/ArmorMesh/components/SpacedArmorDepth.tsx b/src/components/ArmorMesh/components/SpacedArmorDepth.tsx
index 5b70c6561..ec5895b04 100644
--- a/src/components/ArmorMesh/components/SpacedArmorDepth.tsx
+++ b/src/components/ArmorMesh/components/SpacedArmorDepth.tsx
@@ -13,7 +13,7 @@ export function ArmorMeshSpacedArmorDepth({
 }: ArmorMeshSpacedArmorDepthProps) {
   return (
     <mesh {...props}>
-      <meshBasicMaterial />
+      <meshBasicMaterial colorWrite={false} />
     </mesh>
   );
 }