SpacedArmorScene

packages/website/src/components/SpacedArmorScene.tsx

@@ -6,9 +6,9 @@ import { resolveArmor } from "../core/blitzkit/resolveThickness";
 import { useArmor } from "../hooks/useArmor";
 import { useConsumable } from "../hooks/useConsumable";
 import { DuelModule, useDuel } from "../hooks/useDuel";
+import { useDuelModel } from "../hooks/useDuelModel";
 import { useModel } from "../hooks/useModel";
 import { useTankTransform } from "../hooks/useTankTransform";
-import { Tankopedia } from "../stores/tankopedia";
 import { SpacedArmorSceneComponent } from "./SpacedArmorSceneComponent";
 
 export enum ArmorType {
@@ -32,9 +32,7 @@ export const SpacedArmorScene = memo<SpacedArmorSceneProps>(({ scene }) => {
   const { gltf: modelGltf } = useModel(tank.id);
   const armorNodes = Object.values(armorGltf.nodes);
   const modelNodes = Object.values(modelGltf.nodes);
-  const tankModelDefinition = Tankopedia.use(
+  const tankModelDefinition = useDuelModel("protagonist");
-    (state) => state.protagonist.model,
-  );
   const trackModelDefinition = tankModelDefinition.tracks[track.id];
   const turretModelDefinition = tankModelDefinition.turrets[turret.id];
   const gunModelDefinition = turretModelDefinition.guns[gun.id];

packages/website/src/hooks/useDuelModel.ts

@@ -0,0 +1,6 @@
+import { Tankopedia } from "../stores/tankopedia";
+import type { DuelSide } from "./useEquipment";
+
+export function useDuelModel(side: DuelSide) {
+  return Tankopedia.use((state) => state[side].model);
+}

packages/website/src/hooks/useTankTransform.ts

@@ -10,7 +10,7 @@ import {
   modelTransformEvent,
   type ModelTransformEventData,
 } from "../core/blitzkit/modelTransform";
-import { useTankModelDefinition } from "./useTankModelDefinition";
+import { useDuelModel } from "./useDuelModel";
 
 export function useTankTransform(
   track: TrackDefinition,
@@ -18,7 +18,7 @@ export function useTankTransform(
   turretContainer: RefObject<Group>,
   gunContainer: RefObject<Group>,
 ) {
-  const tankModelDefinition = useTankModelDefinition();
+  const tankModelDefinition = useDuelModel("protagonist");
 
   useEffect(() => {
     const trackModelDefinition = tankModelDefinition.tracks[track.id];