From eb8303996713ecc753d17ef9da7c2ad8269d8277 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Sun, 21 Apr 2024 17:15:23 -0500
Subject: [PATCH] feat: include lower part of barrel

---
 .../tankopedia/[id]/components/Model/TankSandbox.tsx     | 9 +++++----
 src/components/Armor/components/SpacedArmorScene.tsx     | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx b/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx
index 8b135a6b2..c2aec4105 100644
--- a/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Model/TankSandbox.tsx
@@ -4,8 +4,9 @@ import { PerspectiveCamera } from '@react-three/drei';
 import { Canvas } from '@react-three/fiber';
 import { Suspense, use, useEffect, useRef, useState } from 'react';
 import { isMobile } from 'react-device-detect';
-import { Armor } from '../../../../../../components/Armor';
+import { Scene } from 'three';
 import { ShotDisplay } from '../../../../../../components/Armor/components/ShotDisplay';
+import { SpacedArmorScene } from '../../../../../../components/Armor/components/SpacedArmorScene';
 import { applyPitchYawLimits } from '../../../../../../core/blitz/applyPitchYawLimits';
 import { modelDefinitions } from '../../../../../../core/blitzkrieg/modelDefinitions';
 import { modelTransformEvent } from '../../../../../../core/blitzkrieg/modelTransform';
@@ -28,7 +29,6 @@ import { RotationInputs } from '../QuickInputs';
 import { SceneProps } from '../SceneProps';
 import { ModelLoader } from './components/ModelLoader';
 import { Options } from './components/Options';
-import { TankModel } from './components/TankModel';
 
 export function TankSandbox() {
   const canvas = useRef<HTMLCanvasElement>(null);
@@ -220,8 +220,9 @@ export function TankSandbox() {
 
                   <Suspense fallback={<ModelLoader />}>
                     <Lighting />
-                    <TankModel />
-                    <Armor />
+                    {/* <TankModel /> */}
+                    {/* <Armor /> */}
+                    <SpacedArmorScene scene={new Scene()} />
                     <ShotDisplay />
                   </Suspense>
                 </Canvas>
diff --git a/src/components/Armor/components/SpacedArmorScene.tsx b/src/components/Armor/components/SpacedArmorScene.tsx
index 6fba48d37..2797e8c7e 100644
--- a/src/components/Armor/components/SpacedArmorScene.tsx
+++ b/src/components/Armor/components/SpacedArmorScene.tsx
@@ -259,9 +259,9 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
           </group>
 
           {modelNodes.map((node) => {
-            const isCurrentGun =
-              node.name ===
-              `gun_${gunModelDefinition.model.toString().padStart(2, '0')}`;
+            const isCurrentGun = node.name.startsWith(
+              `gun_${gunModelDefinition.model.toString().padStart(2, '0')}`,
+            );
             const isVisible = isCurrentGun;
 
             if (!isVisible) return null;