From 0a92dc0d2dcd1686ef11ea26b1227032a2fc7e1f 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 12:06:39 -0600
Subject: [PATCH] fix: bleeding spaced armor

---
 .../[id]/components/Model/TankDisplay.tsx     |  1 -
 .../components/SpacedArmorDepth/index.tsx     | 36 +++++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx b/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx
index af76ffd0c..86972f3de 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/TankDisplay.tsx
@@ -132,7 +132,6 @@ export function TankDisplay({ duel }: TankDisplayProps) {
                 >
                   <TankModel duel={duel} />
                   <TankArmor duel={duel} />
-                  {/* <SpacedArmorDepth duel={duel} /> */}
                 </Suspense>
               </Canvas>
             </div>
diff --git a/src/components/ArmorMesh/components/SpacedArmorDepth/index.tsx b/src/components/ArmorMesh/components/SpacedArmorDepth/index.tsx
index e0fcda234..b0c18820e 100644
--- a/src/components/ArmorMesh/components/SpacedArmorDepth/index.tsx
+++ b/src/components/ArmorMesh/components/SpacedArmorDepth/index.tsx
@@ -22,20 +22,28 @@ export function ArmorMeshSpacedArmorDepth(
   props: ArmorMeshSpacedArmorDepthProps,
 ) {
   return (
-    <mesh {...props}>
-      {!props.include && <meshBasicMaterial colorWrite={false} />}
-      {props.include && (
-        <ThreeCustomShaderMaterial
-          silent
-          baseMaterial={MeshStandardMaterial}
-          fragmentShader={fragmentShader}
-          vertexShader={vertexShader}
-          uniforms={{
-            thickness: { value: props.thickness },
-            maxThickness: { value: props.maxThickness },
-          }}
-        />
+    <>
+      {!props.include && (
+        <mesh {...props} renderOrder={0}>
+          <meshBasicMaterial colorWrite={false} />
+        </mesh>
       )}
-    </mesh>
+
+      {props.include && (
+        <mesh {...props} renderOrder={1}>
+          <ThreeCustomShaderMaterial
+            silent
+            depthWrite={false}
+            baseMaterial={MeshStandardMaterial}
+            fragmentShader={fragmentShader}
+            vertexShader={vertexShader}
+            uniforms={{
+              thickness: { value: props.thickness },
+              maxThickness: { value: props.maxThickness },
+            }}
+          />
+        </mesh>
+      )}
+    </>
   );
 }