rename

packages/website/src/components/StaticArmorSceneComponent.tsx

@@ -33,7 +33,7 @@ import type {
   ArmorUserData,
   ExternalModuleVariant,
 } from "./SpacedArmorSceneComponent";
-import type { ThicknessRange } from "./StaticArmor";
+import type { ThicknessRange } from "./TankStaticArmor";
 
 type StaticArmorSceneComponentProps = {
   name: string;

packages/website/src/components/TankModel.tsx

@@ -33,18 +33,6 @@ export function TankModel() {
 
   return (
     <>
-      {/* <mesh
-        scale={0.1}
-        position={[
-          trackModelDefinition.origin!.x + tankModelDefinition.turret_origin!.x,
-          trackModelDefinition.origin!.y + tankModelDefinition.turret_origin!.y,
-          trackModelDefinition.origin!.z + tankModelDefinition.turret_origin!.z,
-        ]}
-      >
-        <sphereGeometry />
-        <meshBasicMaterial color="red" depthTest={false} />
-      </mesh> */}
-
       {nodes.map((node) => {
         const isHull = node.name === "hull";
         const isWheel = node.name.startsWith("chassis_wheel_");

packages/website/src/components/TankStaticArmor.tsx

@@ -27,7 +27,7 @@ export interface ThicknessRange {
   value: number;
 }
 
-export const StaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
+export const TankStaticArmor = memo<ArmorSceneProps>(({ thicknessRange }) => {
   const turretContainer = useRef<Group>(null!);
   const gunContainer = useRef<Group>(null!);
 

packages/website/src/components/Tankopedia/HeroSection/index.tsx

@@ -7,7 +7,7 @@ import { useFullScreen } from "../../../hooks/useFullScreen";
 import { Duel } from "../../../stores/duel";
 import { Tankopedia } from "../../../stores/tankopedia";
 import type { MaybeSkeletonComponentProps } from "../../../types/maybeSkeletonComponentProps";
-import type { ThicknessRange } from "../../StaticArmor";
+import type { ThicknessRange } from "../../TankStaticArmor";
 import { TankopediaOptions } from "../../TankopediaOptions";
 import { TankSandbox } from "./components/TankSandbox";
 import { Title } from "./components/TankSandbox/Title";

packages/website/src/components/TankopediaOptions/components/Thicknesses.tsx

@@ -7,7 +7,7 @@ import { Tankopedia } from "../../../stores/tankopedia";
 import { TankopediaPersistent } from "../../../stores/tankopediaPersistent";
 import { TankopediaDisplay } from "../../../stores/tankopediaPersistent/constants";
 import type { MaybeSkeletonComponentProps } from "../../../types/maybeSkeletonComponentProps";
-import type { ThicknessRange } from "../../StaticArmor";
+import type { ThicknessRange } from "../../TankStaticArmor";
 import { DynamicArmorSwitcher } from "./DynamicArmorSwitcher";
 
 type ThicknessesProps = MaybeSkeletonComponentProps & {

packages/website/src/components/TankopediaSandbox/index.tsx

@@ -1,6 +1,5 @@
 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";
@@ -20,12 +19,13 @@ 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 { TankDynamicArmor } from "../TankDynamicArmor";
+import { TankModel } from "../TankModel";
 import { TankopediaAntagonistControl } from "../TankopediaAntagonistControl";
 import { TankopediaOptions } from "../TankopediaOptions";
 import { TankopediaSkinSwitcher } from "../TankopediaSkinSwitcher";
 import { TankSandboxLoader } from "../TankSandboxLoader";
+import { TankStaticArmor, type ThicknessRange } from "../TankStaticArmor";
 import styles from "./index.module.css";
 
 type TankSandboxProps = MaybeSkeletonComponentProps & {
@@ -200,13 +200,13 @@ function Content({ thicknessRange }: { thicknessRange: ThicknessRange }) {
 
       <SceneProps />
 
-      {/* {(display === TankopediaDisplay.Model ||
+      {(display === TankopediaDisplay.Model ||
         (display === TankopediaDisplay.DynamicArmor &&
-          !hideTankModelUnderArmor)) && <TankModel />} */}
-
-      {/* {display === TankopediaDisplay.DynamicArmor && <TankDynamicArmor />} */}
-
-      <SpacedArmorScene scene={new Scene()} />
+          !hideTankModelUnderArmor)) && <TankModel />}
+      {display === TankopediaDisplay.DynamicArmor && <TankDynamicArmor />}
+      {display === TankopediaDisplay.StaticArmor && (
+        <TankStaticArmor thicknessRange={thicknessRange} />
+      )}
 
       <ShotDisplay />
       <ArmorPlateDisplay />
@@ -215,10 +215,6 @@ function Content({ thicknessRange }: { thicknessRange: ThicknessRange }) {
       <Suspense>
         {/* Controls within Suspense to allow for frame-perfect start of camera auto-rotate */}
         <CanvasControl />
-
-        {display === TankopediaDisplay.StaticArmor && (
-          <StaticArmor thicknessRange={thicknessRange} />
-        )}
       </Suspense>
 
       <InitialCameraAligner />

packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx

@@ -1,7 +1,7 @@
 import { useMemo } from "react";
 import { api } from "../../../../../api/dynamic";
 import { Scroller } from "../../../../../components/Scroller";
-import type { ThicknessRange } from "../../../../../components/StaticArmor";
+import type { ThicknessRange } from "../../../../../components/TankStaticArmor";
 import { TankopediaCharacteristics } from "../../../../../components/TankopediaCharacteristics";
 import { TankopediaGameModeAbilities } from "../../../../../components/TankopediaGameModeAbilities";
 import { TankopediaLoadout } from "../../../../../components/TankopediaLoadout";