diff --git a/packages/website/src/components/DynamicArmor.tsx b/packages/website/src/components/TankDynamicArmor.tsx similarity index 97% rename from packages/website/src/components/DynamicArmor.tsx rename to packages/website/src/components/TankDynamicArmor.tsx index 432cb2a51..9da8c0f8e 100644 --- a/packages/website/src/components/DynamicArmor.tsx +++ b/packages/website/src/components/TankDynamicArmor.tsx @@ -5,7 +5,7 @@ import { spacedArmorRenderTarget } from "./PrimaryArmorRenderTarget"; import { PrimaryArmorScene } from "./PrimaryArmorScene"; import { SpacedArmorScene } from "./SpacedArmorScene"; -export const DynamicArmor = memo(() => { +export const TankDynamicArmor = memo(() => { const rootScene = useThree((state) => state.scene); const [spacedArmorScene] = useState(() => new Scene()); const [primaryArmorScene] = useState(() => { diff --git a/packages/website/src/components/TankopediaSandbox/index.tsx b/packages/website/src/components/TankopediaSandbox/index.tsx index 3b4487b82..54337d1f4 100644 --- a/packages/website/src/components/TankopediaSandbox/index.tsx +++ b/packages/website/src/components/TankopediaSandbox/index.tsx @@ -1,5 +1,6 @@ import type { QuicklimeEvent } from "quicklime"; import { Suspense, useEffect, useRef } from "react"; +import { Scene } from "three"; import { applyPitchYawLimits } from "../../core/blitz/applyPitchYawLimits"; import { modelTransformEvent } from "../../core/blitzkit/modelTransform"; import { Pose, poseEvent } from "../../core/blitzkit/pose"; @@ -14,14 +15,13 @@ import type { MaybeSkeletonComponentProps } from "../../types/maybeSkeletonCompo import { ArmorPlateDisplay } from "../ArmorPlateDisplay"; import { CanvasAutoClear } from "../CanvasAutoClear"; import { CanvasControl } from "../CanvasControl"; -import { DynamicArmor } from "../DynamicArmor"; import { InitialCameraAligner } from "../InitialCameraAligner"; import { Lighting, transitionEvent } from "../Lighting"; import { SceneProps } from "../SceneProps"; import { ShotDisplay } from "../ShotDisplay"; import { SmartCanvas } from "../SmartCanvas"; +import { SpacedArmorScene } from "../SpacedArmorScene"; import { StaticArmor, type ThicknessRange } from "../StaticArmor"; -import { TankModel } from "../TankModel"; import { TankopediaAntagonistControl } from "../TankopediaAntagonistControl"; import { TankopediaOptions } from "../TankopediaOptions"; import { TankopediaSkinSwitcher } from "../TankopediaSkinSwitcher"; @@ -200,9 +200,13 @@ function Content({ thicknessRange }: { thicknessRange: ThicknessRange }) { - {(display === TankopediaDisplay.Model || + {/* {(display === TankopediaDisplay.Model || (display === TankopediaDisplay.DynamicArmor && - !hideTankModelUnderArmor)) && } + !hideTankModelUnderArmor)) && } */} + + {/* {display === TankopediaDisplay.DynamicArmor && } */} + + @@ -212,7 +216,6 @@ function Content({ thicknessRange }: { thicknessRange: ThicknessRange }) { {/* Controls within Suspense to allow for frame-perfect start of camera auto-rotate */} - {display === TankopediaDisplay.DynamicArmor && } {display === TankopediaDisplay.StaticArmor && ( )}