feat: new bank model, types refactor

Nityam573 · Nov 3, 2024 · 1e94beb · 1e94beb
1 parent 8cbdb57
commit 1e94beb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/client/public/models/buildings/bank.glb b/client/public/models/buildings/bank.glb
diff --git a/client/src/three/components/Minimap.ts b/client/src/three/components/Minimap.ts
@@ -1,6 +1,7 @@
 import useUIStore from "@/hooks/store/useUIStore";
 import { FELT_CENTER } from "@/ui/config";
 import { getHexForWorldPosition } from "@/ui/utils/utils";
+import { StructureType } from "@bibliothecadao/eternum";
 import { throttle } from "lodash";
 import * as THREE from "three";
 import WorldmapScene from "../scenes/Worldmap";
@@ -18,11 +19,11 @@ const MINIMAP_CONFIG = {
     MY_ARMY: "#00FF00",
     CAMERA: "#FFFFFF",
     STRUCTURES: {
-      Realm: "#0000ff",
-      Hyperstructure: "#FFFFFF",
-      Bank: "#FFFF00",
-      FragmentMine: "#00FFFF",
-      Settlement: "#FFA500",
+      [StructureType.Realm]: "#0000ff",
+      [StructureType.Hyperstructure]: "#FFFFFF",
+      [StructureType.Bank]: "#FFFF00",
+      [StructureType.FragmentMine]: "#00FFFF",
+      [StructureType.Settlement]: "#FFA500",
     },
   },
   SIZES: {

diff --git a/client/src/three/components/StructureManager.ts b/client/src/three/components/StructureManager.ts
@@ -38,7 +38,7 @@ export class StructureManager {
     const loader = new GLTFLoader();
 
     for (const [key, modelPaths] of Object.entries(StructureModelPaths)) {
-      const structureType = StructureType[key as keyof typeof StructureType];
+      const structureType = parseInt(key) as StructureType;
 
       if (structureType === undefined) continue;
       if (!modelPaths || modelPaths.length === 0) continue;
@@ -97,8 +97,7 @@ export class StructureManager {
       this.totalStructures++;
     }
 
-    const key = StructureType[structureType] as unknown as StructureType;
-
+    const key = structureType;
     // Add the structure to the structures map
     this.structures.addStructure(entityId, key, normalizedCoord, stage, isMine);
 
@@ -130,7 +129,8 @@ export class StructureManager {
   }
 
   private updateVisibleStructures() {
-    for (const [structureType, structures] of this.structures.getStructures()) {
+    const _structures = this.structures.getStructures();
+    for (const [structureType, structures] of _structures) {
       const visibleStructures = this.getVisibleStructures(structures);
       const models = this.structureModels.get(structureType);
 
@@ -152,6 +152,10 @@ export class StructureManager {
             this.scene.add(label);
           }
           this.dummy.position.copy(position);
+
+          if (structureType === StructureType.Bank) {
+            this.dummy.rotation.y = 4 * Math.PI / 6;
+          }
           this.dummy.updateMatrix();
 
           const modelType = models[structure.stage];

diff --git a/client/src/three/scenes/constants.ts b/client/src/three/scenes/constants.ts
@@ -90,7 +90,7 @@ export const StructureModelPaths: Record<StructureType, string[]> = {
     "models/buildings/hyperstructure_half.glb",
     "models/buildings/hyperstructure.glb",
   ],
-  [StructureType.Bank]: ["/models/buildings/market.glb"],
+  [StructureType.Bank]: ["/models/buildings/bank.glb"],
   [StructureType.FragmentMine]: ["models/buildings/mine.glb"],
   // placeholder for now
   [StructureType.Settlement]: ["models/buildings/mine.glb"],