From 14126d05a14bb2627f98ba01043f9e2fb78a60bc Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Thu, 29 Oct 2026 14:58:40 -0500 Subject: [PATCH] rename --- .../components/StaticArmorSceneComponent.tsx | 2 +- packages/website/src/components/TankModel.tsx | 12 ---------- .../{StaticArmor.tsx => TankStaticArmor.tsx} | 2 +- .../Tankopedia/HeroSection/index.tsx | 2 +- .../components/Thicknesses.tsx | 2 +- .../components/TankopediaSandbox/index.tsx | 22 ++++++++----------- .../[...locale]/tanks/[slug]/_index.tsx | 2 +- 7 files changed, 14 insertions(+), 30 deletions(-) rename packages/website/src/components/{StaticArmor.tsx => TankStaticArmor.tsx} (99%) diff --git a/packages/website/src/components/StaticArmorSceneComponent.tsx b/packages/website/src/components/StaticArmorSceneComponent.tsx index 7b5f21a89..9b7b5122c 100644 --- a/packages/website/src/components/StaticArmorSceneComponent.tsx +++ b/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; diff --git a/packages/website/src/components/TankModel.tsx b/packages/website/src/components/TankModel.tsx index b67dd00d2..5e4664d8e 100644 --- a/packages/website/src/components/TankModel.tsx +++ b/packages/website/src/components/TankModel.tsx @@ -33,18 +33,6 @@ export function TankModel() { return ( <> - {/* - - - */} - {nodes.map((node) => { const isHull = node.name === "hull"; const isWheel = node.name.startsWith("chassis_wheel_"); diff --git a/packages/website/src/components/StaticArmor.tsx b/packages/website/src/components/TankStaticArmor.tsx similarity index 99% rename from packages/website/src/components/StaticArmor.tsx rename to packages/website/src/components/TankStaticArmor.tsx index 15573dabf..650b54be7 100644 --- a/packages/website/src/components/StaticArmor.tsx +++ b/packages/website/src/components/TankStaticArmor.tsx @@ -27,7 +27,7 @@ export interface ThicknessRange { value: number; } -export const StaticArmor = memo(({ thicknessRange }) => { +export const TankStaticArmor = memo(({ thicknessRange }) => { const turretContainer = useRef(null!); const gunContainer = useRef(null!); diff --git a/packages/website/src/components/Tankopedia/HeroSection/index.tsx b/packages/website/src/components/Tankopedia/HeroSection/index.tsx index 222de9d11..d36964def 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/index.tsx +++ b/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"; diff --git a/packages/website/src/components/TankopediaOptions/components/Thicknesses.tsx b/packages/website/src/components/TankopediaOptions/components/Thicknesses.tsx index 894570e59..8e908a031 100644 --- a/packages/website/src/components/TankopediaOptions/components/Thicknesses.tsx +++ b/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 & { diff --git a/packages/website/src/components/TankopediaSandbox/index.tsx b/packages/website/src/components/TankopediaSandbox/index.tsx index 54337d1f4..737b18787 100644 --- a/packages/website/src/components/TankopediaSandbox/index.tsx +++ b/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 }) { - {/* {(display === TankopediaDisplay.Model || + {(display === TankopediaDisplay.Model || (display === TankopediaDisplay.DynamicArmor && - !hideTankModelUnderArmor)) && } */} - - {/* {display === TankopediaDisplay.DynamicArmor && } */} - - + !hideTankModelUnderArmor)) && } + {display === TankopediaDisplay.DynamicArmor && } + {display === TankopediaDisplay.StaticArmor && ( + + )} @@ -215,10 +215,6 @@ function Content({ thicknessRange }: { thicknessRange: ThicknessRange }) { {/* Controls within Suspense to allow for frame-perfect start of camera auto-rotate */} - - {display === TankopediaDisplay.StaticArmor && ( - - )} diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx index 9400a1c44..2c002add0 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx +++ b/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";