chore(map): avoid typed array overhead for short array lengths

wowserhq · Feb 8, 2024 · 97796b6 · 97796b6
1 parent e78d399
commit 97796b6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 29 deletions.
diff --git a/src/lib/map/Map.ts b/src/lib/map/Map.ts
@@ -63,8 +63,8 @@ class Map {
    *
    * @param defPosition - Vector in doodad / map obj def coordinate system
    */
-  static getNormalizedDefPosition(defPosition: Float32Array) {
-    const normalized = new Float32Array(3);
+  static getNormalizedDefPosition(defPosition: number[]) {
+    const normalized = new Array(3);
 
     normalized[0] = MAP_CORNER_X - defPosition[2];
     normalized[1] = MAP_CORNER_Y - defPosition[0];
@@ -79,13 +79,13 @@ class Map {
    *
    * @param defRotation - Euler angle in doodad / map obj def coordinate system
    */
-  static getNormalizedDefRotation(defRotation: Float32Array) {
+  static getNormalizedDefRotation(defRotation: number[]) {
     const normalized = quat.create();
 
     // glMatrix defaults to the correct euler order (zyx) to convert to the map coordinate system
     quat.fromEuler(normalized, defRotation[2], defRotation[0], defRotation[1] + 180);
 
-    return normalized as Float32Array;
+    return Array.from(normalized);
   }
 
   load(source: IoSource) {

diff --git a/src/lib/map/MapChunk.ts b/src/lib/map/MapChunk.ts
@@ -16,11 +16,11 @@ class MapChunk {
   #areaId: number;
   #holes: number = 0;
   #layers: MapLayer[] = [];
-  #position: Float32Array;
+  #position: number[];
   #vertexHeights: Float32Array;
   #vertexNormals: Int8Array;
 
-  constructor(position: Float32Array, areaId: number, holes: number = 0) {
+  constructor(position: number[], areaId: number, holes: number = 0) {
     this.#position = position;
     this.#areaId = areaId;
     this.#holes = holes;

diff --git a/src/lib/map/MapDoodadDef.ts b/src/lib/map/MapDoodadDef.ts
@@ -1,17 +1,11 @@
 class MapDoodadDef {
   #name: string;
   #id: number;
-  #position: Float32Array;
-  #rotation: Float32Array;
+  #position: number[];
+  #rotation: number[];
   #scale: number;
 
-  constructor(
-    name: string,
-    id: number,
-    position: Float32Array,
-    rotation: Float32Array,
-    scale: number,
-  ) {
+  constructor(name: string, id: number, position: number[], rotation: number[], scale: number) {
     this.#name = name;
     this.#id = id;
     this.#position = position;

diff --git a/src/lib/map/MapObjDef.ts b/src/lib/map/MapObjDef.ts
@@ -1,10 +1,10 @@
 class MapObjDef {
   #name: string;
   #id: number;
-  #position: Float32Array;
-  #rotation: Float32Array;
+  #position: number[];
+  #rotation: number[];
 
-  constructor(name: string, id: number, position: Float32Array, rotation: Float32Array) {
+  constructor(name: string, id: number, position: number[], rotation: number[]) {
     this.#name = name;
     this.#id = id;
     this.#position = position;

diff --git a/src/lib/map/io/adt.ts b/src/lib/map/io/adt.ts
@@ -13,18 +13,18 @@ const mapChunkInfo = io.struct({
 const mapDoodadDef = io.struct({
   nameId: io.uint32le,
   uniqueId: io.uint32le,
-  position: io.typedArray(io.float32le, { size: 3 }),
-  rotation: io.typedArray(io.float32le, { size: 3 }),
+  position: io.array(io.float32le, { size: 3 }),
+  rotation: io.array(io.float32le, { size: 3 }),
   scale: io.uint16le,
   flags: io.uint16le,
 });
 
 const mapObjDef = io.struct({
   nameId: io.uint32le,
   uniqueId: io.uint32le,
-  position: io.typedArray(io.float32le, { size: 3 }),
-  rotation: io.typedArray(io.float32le, { size: 3 }),
-  extents: io.typedArray(io.float32le, { size: 6 }),
+  position: io.array(io.float32le, { size: 3 }),
+  rotation: io.array(io.float32le, { size: 3 }),
+  extents: io.array(io.float32le, { size: 6 }),
   flags: io.uint16le,
   doodadSet: io.uint16le,
   nameSet: io.uint16le,

diff --git a/src/spec/map/MapArea.spec.ts b/src/spec/map/MapArea.spec.ts
@@ -21,15 +21,13 @@ describe('MapArea', () => {
 
         const doodadDef1 = mapArea.doodadDefs.find((def) => def.id === 206410);
         expect(doodadDef1.name.split(/\\/).at(-1)).toBe('TIRISFALLGLADECANOPYTREE05.M2');
-        expect(doodadDef1.rotation).toEqual(new Float32Array([0, 0, 1, 6.123234262925839e-17]));
+        expect(doodadDef1.rotation).toEqual([0, 0, 1, 6.123234262925839e-17]);
 
         const doodadDef2 = mapArea.doodadDefs.find((def) => def.id === 2542963);
         expect(doodadDef2.name.split(/\\/).at(-1)).toBe('TIRISFALLGLADECANOPYTREE05.M2');
-        expect(doodadDef2.rotation).toEqual(
-          new Float32Array([
-            0.0701502189040184, -0.038644179701805115, 0.9901213645935059, 0.11508788913488388,
-          ]),
-        );
+        expect(doodadDef2.rotation).toEqual([
+          0.0701502189040184, -0.038644179701805115, 0.9901213645935059, 0.11508788913488388,
+        ]);
       });
     });