From 86fd714923c98b9be1fca76f2410b7f5cd8d6dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Sat, 20 Jan 2024 12:08:30 -0600
Subject: [PATCH] fix: spaced armor bleeding

---
 .../TankArmor/components/SpacedArmorDepth.tsx     |  5 +++++
 .../components/SpacedArmorDepth/index.tsx         | 15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/SpacedArmorDepth.tsx b/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/SpacedArmorDepth.tsx
index e192d2c43..28210cdc6 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/SpacedArmorDepth.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/components/TankArmor/components/SpacedArmorDepth.tsx
@@ -170,6 +170,7 @@ export const SpacedArmorDepth = memo<SpacedArmorDepthProps>(({ duel }) => {
         return (
           <ArmorMeshSpacedArmorDepth
             include={spaced}
+            isExternalModule={false}
             thickness={thickness}
             maxThickness={maxThickness}
             key={node.uuid}
@@ -186,6 +187,7 @@ export const SpacedArmorDepth = memo<SpacedArmorDepthProps>(({ duel }) => {
 
         return (
           <ArmorMeshSpacedArmorDepth
+            isExternalModule
             key={node.uuid}
             geometry={(node as Mesh).geometry}
           />
@@ -209,6 +211,7 @@ export const SpacedArmorDepth = memo<SpacedArmorDepthProps>(({ duel }) => {
           return (
             <ArmorMeshSpacedArmorDepth
               include={spaced}
+              isExternalModule={false}
               thickness={thickness}
               maxThickness={maxThickness}
               key={node.uuid}
@@ -234,6 +237,7 @@ export const SpacedArmorDepth = memo<SpacedArmorDepthProps>(({ duel }) => {
             return (
               <ArmorMeshSpacedArmorDepth
                 include={spaced}
+                isExternalModule={false}
                 thickness={thickness}
                 maxThickness={maxThickness}
                 key={node.uuid}
@@ -252,6 +256,7 @@ export const SpacedArmorDepth = memo<SpacedArmorDepthProps>(({ duel }) => {
 
             return (
               <ArmorMeshSpacedArmorDepth
+                isExternalModule
                 key={node.uuid}
                 geometry={(node as Mesh).geometry}
               />
diff --git a/src/components/ArmorMesh/components/SpacedArmorDepth/index.tsx b/src/components/ArmorMesh/components/SpacedArmorDepth/index.tsx
index 03512144d..fd07ae89f 100644
--- a/src/components/ArmorMesh/components/SpacedArmorDepth/index.tsx
+++ b/src/components/ArmorMesh/components/SpacedArmorDepth/index.tsx
@@ -10,6 +10,7 @@ type ArmorMeshSpacedArmorDepthProps = MeshProps &
   (
     | {
         include?: false;
+        isExternalModule: boolean;
       }
     | {
         include: true;
@@ -23,8 +24,14 @@ export function ArmorMeshSpacedArmorDepth(
 ) {
   return (
     <>
+      {!props.include && (
+        <mesh {...props} renderOrder={props.isExternalModule ? 2 : 0}>
+          <meshBasicMaterial colorWrite={false} />
+        </mesh>
+      )}
+
       {props.include && (
-        <mesh {...props} renderOrder={0}>
+        <mesh {...props} renderOrder={1}>
           <ThreeCustomShaderMaterial
             silent
             depthWrite={false}
@@ -38,12 +45,6 @@ export function ArmorMeshSpacedArmorDepth(
           />
         </mesh>
       )}
-
-      {!props.include && (
-        <mesh {...props} renderOrder={1}>
-          <meshBasicMaterial colorWrite={false} />
-        </mesh>
-      )}
     </>
   );
 }