flatten armor dir

packages/website/src/components/Armor/components/ModelTankWrapper.tsx

@@ -1,8 +0,0 @@
-import { forwardRef, type ComponentProps } from "react";
-import { Group } from "three";
-
-export const ModelTankWrapper = forwardRef<Group, ComponentProps<"group">>(
-  (props, ref) => {
-    return <group rotation={[-Math.PI / 2, 0, 0]} ref={ref} {...props} />;
-  }
-);

packages/website/src/components/ArmorPlateDisplay.tsx

@@ -10,11 +10,11 @@ import {
 import { Html } from "@react-three/drei";
 import { useRef } from "react";
 import { radToDeg } from "three/src/math/MathUtils.js";
-import { resolveArmorIndex } from "../../../core/blitzkit/resolveArmorIndex";
-import { LocaleProvider, useLocale } from "../../../hooks/useLocale";
-import { App } from "../../../stores/app";
-import { Duel } from "../../../stores/duel";
-import { Tankopedia } from "../../../stores/tankopedia";
+import { resolveArmorIndex } from "../core/blitzkit/resolveArmorIndex";
+import { LocaleProvider, useLocale } from "../hooks/useLocale";
+import { App } from "../stores/app";
+import { Duel } from "../stores/duel";
+import { Tankopedia } from "../stores/tankopedia";
 import { layerTypeNames } from "./ShotDisplayCard";
 import { ArmorType } from "./SpacedArmorScene";
 

packages/website/src/components/DynamicArmor.tsx

@@ -1,11 +1,11 @@
 import { createPortal, useFrame, useThree } from "@react-three/fiber";
 import { memo, useState } from "react";
 import { DepthTexture, Scene, Vector2 } from "three";
-import { PrimaryArmorScene } from "./components/PrimaryArmorScene";
-import { spacedArmorRenderTarget } from "./components/PrimaryArmorSceneComponent/target";
-import { SpacedArmorScene } from "./components/SpacedArmorScene";
+import { spacedArmorRenderTarget } from "./PrimaryArmorRenderTarget";
+import { PrimaryArmorScene } from "./PrimaryArmorScene";
+import { SpacedArmorScene } from "./SpacedArmorScene";
 
-export const Armor = memo(() => {
+export const DynamicArmor = memo(() => {
   const rootScene = useThree((state) => state.scene);
   const [spacedArmorScene] = useState(() => new Scene());
   const [primaryArmorScene] = useState(() => {

packages/website/src/components/PrimaryArmorScene.tsx

@@ -1,10 +1,10 @@
 import { memo, useRef } from "react";
 import { Group } from "three";
-import { correctZYTuple } from "../../../core/blitz/correctZYTuple";
-import { nameToArmorId } from "../../../core/blitzkit/nameToArmorId";
-import { resolveArmor } from "../../../core/blitzkit/resolveThickness";
-import { useArmor } from "../../../hooks/useArmor";
-import { DuelModule, useDuel } from "../../../hooks/useDuel";
+import { correctZYTuple } from "../core/blitz/correctZYTuple";
+import { nameToArmorId } from "../core/blitzkit/nameToArmorId";
+import { resolveArmor } from "../core/blitzkit/resolveThickness";
+import { useArmor } from "../hooks/useArmor";
+import { DuelModule, useDuel } from "../hooks/useDuel";
 import { ModelTankWrapper } from "./ModelTankWrapper";
 import { PrimaryArmorSceneComponent } from "./PrimaryArmorSceneComponent";
 

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

@@ -17,15 +17,15 @@ import {
   Vector2,
 } from "three";
 import { degToRad } from "three/src/math/MathUtils.js";
-import { jsxTree } from "../../../../core/blitzkit/jsxTree";
-import { DuelModule, getDuel } from "../../../../hooks/useDuel";
-import { hasEquipment } from "../../../../hooks/useEquipment";
-import { Tankopedia } from "../../../../stores/tankopedia";
-import { TankopediaPersistent } from "../../../../stores/tankopediaPersistent";
-import { transitionEvent } from "../../../Lighting";
+import { jsxTree } from "../../core/blitzkit/jsxTree";
+import { DuelModule, getDuel } from "../../hooks/useDuel";
+import { hasEquipment } from "../../hooks/useEquipment";
+import { Tankopedia } from "../../stores/tankopedia";
+import { TankopediaPersistent } from "../../stores/tankopediaPersistent";
+import { transitionEvent } from "../Lighting";
 import fragmentShader from "./shaders/fragment.glsl?raw";
 import vertexShader from "./shaders/vertex.glsl?raw";
-import { spacedArmorRenderTarget } from "./target";
+import { spacedArmorRenderTarget } from "./PrimaryArmorRenderTarget";
 
 interface PrimaryArmorSceneComponentProps {
   thickness: number;

packages/website/src/components/ShotDisplay.tsx

@@ -16,13 +16,13 @@ import {
   Path,
   Quaternion,
 } from "three";
-import { isHalloween } from "../../../core/blitzkit/isHalloween";
-import { LocaleProvider, useLocale } from "../../../hooks/useLocale";
+import { isHalloween } from "../core/blitzkit/isHalloween";
+import { LocaleProvider, useLocale } from "../hooks/useLocale";
 import {
   Tankopedia,
   type ShotLayerNonExternal,
   type ShotStatus,
-} from "../../../stores/tankopedia";
+} from "../stores/tankopedia";
 import { ShotDisplayCard } from "./ShotDisplayCard";
 
 export const shotStatusColors: Record<

packages/website/src/components/ShotDisplayCard.tsx

@@ -9,8 +9,8 @@ import {
 } from "@radix-ui/themes";
 import type { ComponentProps } from "react";
 import { radToDeg } from "three/src/math/MathUtils.js";
-import { useLocale } from "../../../hooks/useLocale";
-import type { Shot, ShotLayer } from "../../../stores/tankopedia";
+import { useLocale } from "../hooks/useLocale";
+import type { Shot, ShotLayer } from "../stores/tankopedia";
 import { shotStatusColors } from "./ShotDisplay";
 import { ArmorType } from "./SpacedArmorScene";
 

packages/website/src/components/SpacedArmorScene.tsx

@@ -1,13 +1,13 @@
 import { memo, useRef } from "react";
 import { Group, Plane, Scene, Vector3 } from "three";
-import { correctZYTuple } from "../../../core/blitz/correctZYTuple";
-import { nameToArmorId } from "../../../core/blitzkit/nameToArmorId";
-import { resolveArmor } from "../../../core/blitzkit/resolveThickness";
-import { useArmor } from "../../../hooks/useArmor";
-import { useModel } from "../../../hooks/useModel";
-import { useTankModelDefinition } from "../../../hooks/useTankModelDefinition";
-import { useTankTransform } from "../../../hooks/useTankTransform";
-import { Duel } from "../../../stores/duel";
+import { correctZYTuple } from "../core/blitz/correctZYTuple";
+import { nameToArmorId } from "../core/blitzkit/nameToArmorId";
+import { resolveArmor } from "../core/blitzkit/resolveThickness";
+import { useArmor } from "../hooks/useArmor";
+import { useModel } from "../hooks/useModel";
+import { useTankModelDefinition } from "../hooks/useTankModelDefinition";
+import { useTankTransform } from "../hooks/useTankTransform";
+import { Duel } from "../stores/duel";
 import { ModelTankWrapper } from "./ModelTankWrapper";
 import { SpacedArmorSceneComponent } from "./SpacedArmorSceneComponent";
 

packages/website/src/components/SpacedArmorSceneComponent.tsx

@@ -16,20 +16,20 @@ import {
   Vector3,
 } from "three";
 import { degToRad } from "three/src/math/MathUtils.js";
-import { hasEquipment } from "../../../../core/blitzkit/hasEquipment";
-import { jsxTree } from "../../../../core/blitzkit/jsxTree";
-import { defaultEqualizer } from "../../../../core/blitzkit/tankToDuelMember";
-import { discardClippingPlane } from "../../../../core/three/discardClippingPlane";
-import { Duel } from "../../../../stores/duel";
+import { hasEquipment } from "../core/blitzkit/hasEquipment";
+import { jsxTree } from "../core/blitzkit/jsxTree";
+import { defaultEqualizer } from "../core/blitzkit/tankToDuelMember";
+import { discardClippingPlane } from "../core/three/discardClippingPlane";
+import { Duel } from "../stores/duel";
 import {
   type Shot,
   type ShotLayerBase,
   type ShotLayerNonExternal,
   Tankopedia,
-} from "../../../../stores/tankopedia";
-import { ArmorType } from "../SpacedArmorScene";
-import { SpacedArmorSubExternal } from "./components/SpacedArmorSubExternal";
-import { SpacedArmorSubSpaced } from "./components/SpacedArmorSubSpaced";
+} from "../stores/tankopedia";
+import { ArmorType } from "./SpacedArmorScene";
+import { SpacedArmorSubExternal } from "./SpacedArmorSubExternal";
+import { SpacedArmorSubSpaced } from "./SpacedArmorSubSpaced";
 
 type SpacedArmorSceneComponentProps = {
   node: Object3D;

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

@@ -7,12 +7,12 @@ import {
   Plane,
   ShaderMaterial,
 } from "three";
-import type { ArmorUserData, ExternalModuleVariant } from "../..";
-import { hasEquipment } from "../../../../../../core/blitzkit/hasEquipment";
-import { jsxTree } from "../../../../../../core/blitzkit/jsxTree";
-import { Duel } from "../../../../../../stores/duel";
-import { Tankopedia } from "../../../../../../stores/tankopedia";
-import { ArmorType } from "../../../SpacedArmorScene";
+import type { ArmorUserData, ExternalModuleVariant } from "../SpacedArmorSceneComponent";
+import { hasEquipment } from "../../core/blitzkit/hasEquipment";
+import { jsxTree } from "../../core/blitzkit/jsxTree";
+import { Duel } from "../../stores/duel";
+import { Tankopedia } from "../../stores/tankopedia";
+import { ArmorType } from "./SpacedArmorScene";
 import fragmentShader from "./shaders/fragment.glsl?raw";
 import vertexShader from "./shaders/vertex.glsl?raw";
 

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

@@ -7,12 +7,12 @@ import {
   type Object3D,
 } from "three";
 import { degToRad } from "three/src/math/MathUtils.js";
-import type { ArmorUserData } from "../..";
-import { hasEquipment } from "../../../../../../core/blitzkit/hasEquipment";
-import { jsxTree } from "../../../../../../core/blitzkit/jsxTree";
-import { Duel } from "../../../../../../stores/duel";
-import { Tankopedia } from "../../../../../../stores/tankopedia";
-import { ArmorType } from "../../../SpacedArmorScene";
+import type { ArmorUserData } from "../SpacedArmorSceneComponent";
+import { hasEquipment } from "../../core/blitzkit/hasEquipment";
+import { jsxTree } from "../../core/blitzkit/jsxTree";
+import { Duel } from "../../stores/duel";
+import { Tankopedia } from "../../stores/tankopedia";
+import { ArmorType } from "./SpacedArmorScene";
 import fragmentShader from "./shaders/fragment.glsl?raw";
 import vertexShader from "./shaders/vertex.glsl?raw";
 

packages/website/src/components/StaticArmor.tsx

@@ -1,20 +1,20 @@
 import { useThree, type ThreeEvent } from "@react-three/fiber";
 import { memo, useRef } from "react";
 import { Group, Plane, Vector2, Vector3 } from "three";
-import { applyPitchYawLimits } from "../../../core/blitz/applyPitchYawLimits";
-import { correctZYTuple } from "../../../core/blitz/correctZYTuple";
-import { hasEquipment } from "../../../core/blitzkit/hasEquipment";
-import { modelTransformEvent } from "../../../core/blitzkit/modelTransform";
-import { nameToArmorId } from "../../../core/blitzkit/nameToArmorId";
-import { resolveArmor } from "../../../core/blitzkit/resolveThickness";
-import { controlsEnabledEvent } from "../../../core/controlsEnabled";
-import { useArmor } from "../../../hooks/useArmor";
-import { useModel } from "../../../hooks/useModel";
-import { useTankModelDefinition } from "../../../hooks/useTankModelDefinition";
-import { useTankTransform } from "../../../hooks/useTankTransform";
-import { Duel } from "../../../stores/duel";
-import { Tankopedia } from "../../../stores/tankopedia";
-import { TankopediaPersistent } from "../../../stores/tankopediaPersistent";
+import { applyPitchYawLimits } from "../core/blitz/applyPitchYawLimits";
+import { correctZYTuple } from "../core/blitz/correctZYTuple";
+import { hasEquipment } from "../core/blitzkit/hasEquipment";
+import { modelTransformEvent } from "../core/blitzkit/modelTransform";
+import { nameToArmorId } from "../core/blitzkit/nameToArmorId";
+import { resolveArmor } from "../core/blitzkit/resolveThickness";
+import { controlsEnabledEvent } from "../core/controlsEnabled";
+import { useArmor } from "../hooks/useArmor";
+import { useModel } from "../hooks/useModel";
+import { useTankModelDefinition } from "../hooks/useTankModelDefinition";
+import { useTankTransform } from "../hooks/useTankTransform";
+import { Duel } from "../stores/duel";
+import { Tankopedia } from "../stores/tankopedia";
+import { TankopediaPersistent } from "../stores/tankopediaPersistent";
 import { ModelTankWrapper } from "./ModelTankWrapper";
 import { ArmorType } from "./SpacedArmorScene";
 import { StaticArmorSceneComponent } from "./StaticArmorSceneComponent";

packages/website/src/components/StaticArmorSceneComponent.tsx

@@ -16,18 +16,18 @@ import {
   Quaternion,
   Vector3,
 } from "three";
-import { unrotateDavaVector } from "../../../core/blitz/unrotateDavaVector";
-import { jsxTree } from "../../../core/blitzkit/jsxTree";
+import { unrotateDavaVector } from "../core/blitz/unrotateDavaVector";
+import { jsxTree } from "../core/blitzkit/jsxTree";
 import {
   modelTransformEvent,
   type ModelTransformEventData,
-} from "../../../core/blitzkit/modelTransform";
-import { defaultEqualizer } from "../../../core/blitzkit/tankToDuelMember";
-import { discardClippingPlane } from "../../../core/three/discardClippingPlane";
-import { useEquipment } from "../../../hooks/useEquipment";
-import { Duel } from "../../../stores/duel";
-import { Tankopedia } from "../../../stores/tankopedia";
-import { transitionEvent } from "../../Lighting";
+} from "../core/blitzkit/modelTransform";
+import { defaultEqualizer } from "../core/blitzkit/tankToDuelMember";
+import { discardClippingPlane } from "../core/three/discardClippingPlane";
+import { useEquipment } from "../hooks/useEquipment";
+import { Duel } from "../stores/duel";
+import { Tankopedia } from "../stores/tankopedia";
+import { transitionEvent } from "./Lighting";
 import { ArmorType } from "./SpacedArmorScene";
 import type {
   ArmorUserData,

packages/website/src/components/TankModel.tsx

@@ -12,7 +12,7 @@ import { useModel } from "../hooks/useModel";
 import { useTankTransform } from "../hooks/useTankTransform";
 import { Tankopedia } from "../stores/tankopedia";
 import { TankopediaDisplay } from "../stores/tankopediaPersistent/constants";
-import { ModelTankWrapper } from "./Armor/components/ModelTankWrapper";
+import { ModelTankWrapper } from "./ModelTankWrapper";
 
 export function TankModel() {
   const protagonist = Duel.use((draft) => draft.protagonist);

packages/website/src/components/Tankopedia/HeroSection/components/Options/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 "../../../../../Armor/components/StaticArmor";
+import type { ThicknessRange } from "../../../../../StaticArmor";
 import { DynamicArmorSwitcher } from "./DynamicArmorSwitcher";
 
 type ThicknessesProps = MaybeSkeletonComponentProps & {

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

@@ -37,7 +37,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 "../../../../Armor/components/StaticArmor";
+import type { ThicknessRange } from "../../../../StaticArmor";
 import { EqualIcon } from "../../../../EqualIcon";
 import { ModuleButton } from "../../../../ModuleButtons/ModuleButton";
 import { ScreenshotButton } from "../../../../ScreenshotButton";

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

@@ -7,7 +7,7 @@ import { useModel } from "../../../../../../../hooks/useModel";
 import { useTankModelDefinition } from "../../../../../../../hooks/useTankModelDefinition";
 import { useTankTransform } from "../../../../../../../hooks/useTankTransform";
 import { Duel } from "../../../../../../../stores/duel";
-import { ModelTankWrapper } from "../../../../../../Armor/components/ModelTankWrapper";
+import { ModelTankWrapper } from "../../../../../../ModelTankWrapper";
 import fragmentShader from "./shaders/fragment.glsl?raw";
 import vertexShader from "./shaders/vertex.glsl?raw";
 

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 "../../Armor/components/StaticArmor";
+import type { ThicknessRange } from "../../StaticArmor";
 import { Options } from "./components/Options";
 import { TankSandbox } from "./components/TankSandbox";
 import { Title } from "./components/TankSandbox/Title";

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

@@ -14,19 +14,16 @@ import { useModel } from "../../hooks/useModel";
 import { Tankopedia } from "../../stores/tankopedia";
 import { TankopediaPersistent } from "../../stores/tankopediaPersistent";
 import { TankopediaDisplay } from "../../stores/tankopediaPersistent/constants";
-import { Armor } from "../Armor";
-import { ArmorPlateDisplay } from "../Armor/components/ArmorPlateDisplay";
-import { ShotDisplay } from "../Armor/components/ShotDisplay";
-import {
-  StaticArmor,
-  type ThicknessRange,
-} from "../Armor/components/StaticArmor";
+import { ArmorPlateDisplay } from "../ArmorPlateDisplay";
 import { CanvasAutoClear } from "../CanvasAutoClear";
 import { CanvasControl } from "../CanvasControl";
+import { DynamicArmor } from "../DynamicArmor";
 import { InitialCameraAligner } from "../InitialCameraAligner";
 import { Lighting } from "../Lighting";
 import { SceneProps } from "../SceneProps";
+import { ShotDisplay } from "../ShotDisplay";
 import { SmartCanvas } from "../SmartCanvas";
+import { StaticArmor, type ThicknessRange } from "../StaticArmor";
 import { TankModel } from "../TankModel";
 import styles from "./index.module.css";
 
@@ -187,7 +184,7 @@ export const TankopediaSandbox = forwardRef<
           {/* Controls within Suspense to allow for frame-perfect start of camera auto-rotate */}
           <CanvasControl />
 
-          {display === TankopediaDisplay.DynamicArmor && <Armor />}
+          {display === TankopediaDisplay.DynamicArmor && <DynamicArmor />}
           {display === TankopediaDisplay.StaticArmor && (
             <StaticArmor thicknessRange={thicknessRange} />
           )}

packages/website/src/stores/tankopedia.ts

@@ -7,8 +7,8 @@ import type {
 import type { Vector3 } from "three";
 import { Varuna } from "varuna";
 import { api } from "../api/dynamic";
-import type { ArmorType } from "../components/Armor/components/SpacedArmorScene";
-import type { ExternalModuleVariant } from "../components/Armor/components/SpacedArmorSceneComponent";
+import type { ArmorType } from "../components/SpacedArmorScene";
+import type { ExternalModuleVariant } from "../components/SpacedArmorSceneComponent";
 import type { XP_MULTIPLIERS } from "../components/Tankopedia/TechTreeSection";
 import { createTankState } from "../tankopedia/createTankState";
 import type { TankState } from "../tankopedia/tankState";