@woosh/meep-engine 2.88.3 → 2.88.4

package/build/meep.module.js

@@ -57549,6 +57549,12 @@ class TerrainTile {
      */
     __initial_height_range = new NumericInterval(Number.NEGATIVE_INFINITY, Number.POSITIVE_INFINITY);
 
+    /**
+     * Used to track number of times tile was built
+     * @type {number}
+     */
+    version = 0;
+
     constructor() {
 
         this.mesh.name = "TerrainTile";
@@ -58036,6 +58042,8 @@ class TerrainTile {
         // console.timeEnd('total');
         // console.groupEnd();
 
+        this.version++;
+
         return mesh;
     }
 }
@@ -58179,7 +58187,10 @@ class TerrainTileManager {
         for (let i = 0; i < n; i++) {
             const terrainTile = tiles[i];
 
-            if (!terrainTile.isBuilt && !terrainTile.isBuildInProgress) {
+            if (
+                !terrainTile.isBuilt
+                && !terrainTile.isBuildInProgress
+            ) {
 
                 const bb = terrainTile.external_bvh;
 
@@ -58336,7 +58347,6 @@ class TerrainTileManager {
     }
 
     initializeTiles() {
-
         const total_size = this.totalSize;
 
         const gridSize = total_size.clone();
@@ -58348,6 +58358,10 @@ class TerrainTileManager {
 
         const tiles = this.tiles;
 
+        if (tiles.length > 0) {
+            throw new Error(`There are already ${tiles.length} initialized tiles, those must be destroyed before initialization can happen`);
+        }
+
         //populate tiles
         const tile_resolution_y = gridSize.y;
         const tile_resolution_x = gridSize.x;
@@ -58651,13 +58665,20 @@ class TerrainTileManager {
      *
      * @param {number} x
      * @param {number} y
-     * @param {function} resolve
-     * @param {function} reject
+     * @param {function(tile:TerrainTile)} resolve
+     * @param {function(reason:*)} reject
      */
     build(x, y, resolve, reject) {
 
-        const tileIndex = this.computeTileIndex(x, y);
-        const tile = this.tiles[tileIndex];
+        const tile_index = this.computeTileIndex(x, y);
+
+        const tile = this.tiles[tile_index];
+
+        if (tile.isBuildInProgress) {
+            throw new Error('Tile is already in process of being built');
+        }
+
+        const start_version = tile.version;
 
         tile.isBuilt = false;
         tile.isBuildInProgress = true;
@@ -58673,17 +58694,29 @@ class TerrainTileManager {
         ).then((tileData) => {
 
             //check that the tile under index is still the same tile
-            if (this.tiles[tileIndex] !== tile) {
+            if (this.tiles[tile_index] !== tile) {
                 //the original tile was destroyed
                 reject('Original tile was destroyed during build process');
                 return;
             }
 
-            if (!tile.isBuildInProgress) {
-                reject('Build request has been cancelled');
+            if (tile.version !== start_version) {
+                reject(`Tile version changed, likely due to concurrent build request. Expected version ${start_version}, actual version ${tile.version}`);
                 return;
             }
 
+            if (!tile.isBuildInProgress) {
+                if (tile.isBuilt) {
+                    // tile already built
+                    resolve(tile);
+                    return;
+                } else {
+
+                    reject('Build request has been cancelled');
+                    return;
+                }
+            }
+
             // const processName = 'building tile x = ' + x + ", y = " + y;
             // console.time(processName);
 
@@ -58705,7 +58738,14 @@ class TerrainTileManager {
             this.on.tileBuilt.send1(tile);
 
             resolve(tile);
-        }, reject);
+        }, (reason) => {
+
+            tile.isBuilt = false;
+            tile.isBuildInProgress = false;
+
+            reject(reason);
+
+        });
     }
 }
 

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.88.3",
+  "version": "2.88.4",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/engine/ecs/terrain/tiles/TerrainTile.d.ts

@@ -64,6 +64,11 @@ declare class TerrainTile {
      * @private
      */
     private __initial_height_range;
+    /**
+     * Used to track number of times tile was built
+     * @type {number}
+     */
+    version: number;
     /**
      *
      * @param {number[]|Float32Array|mat4} m4

package/src/engine/ecs/terrain/tiles/TerrainTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TerrainTile.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/tiles/TerrainTile.js"],"names":[],"mappings":";AAqCA;;GAEG;AACH;IACI,sBAA6B;IAC7B,eAA0B;IAC1B,cAAqB;IACrB,kBAAyB;IACzB,4BAAoC;IAEpC;;;OAGG;IACH,mBAAgB;IAChB,uGAAiE;IAGjE;;;OAGG;IACH,UAFU,MAAM,cAAc,CAEd;IAEhB;;;OAGG;IACH,WAFU,OAAO,CAEA;IAEjB;;;OAGG;IACH,cAFU,SAAS,CAEY;IAE/B;;;OAGG;IACH,KAFU,eAAe,CAEd;IAEX;;;OAGG;IACH,SAFU,OAAO,CAED;IAChB;;;OAGG;IACH,mBAFU,OAAO,CAES;IAC1B,uBAAmB;IAEnB;;;OAGG;IACH,SAFU,OAAO,WAAW,CAAC,CAEN;IACvB,4DAA2B;IAE3B;;;;OAIG;IACH,kBAWE;IAEF;;;;;OAKG;IACH,+BAAiG;IAqBjG;;;OAGG;IACH,6BAGC;IAfD;;;OAGG;IACH,0BAEC;IAWD;;;;;;;;;;OAUG;IACH,yBATW,aAAa,WACb,MAAM,WACN,MAAM,WACN,MAAM,cACN,MAAM,cACN,MAAM,cACN,MAAM,GACL,OAAO,CAkDlB;IAED,+CAKC;IAED,8CAOC;IAED;;;;;;;;;;OAUG;IACH,mBATW,WAAW,GAAC,SAAS,UACrB,WAAW,GAAC,SAAS,QACrB,WAAW,GAAC,SAAS,SACrB,WAAW,GAAC,SAAS,WACrB,WAAW,GAAC,SAAS,YACrB,WAAW,GAAC,SAAS,cACrB,WAAW,GAAC,SAAS,eACrB,WAAW,GAAC,SAAS,QAsN/B;IAED,2BAiFC;IAED;;;;OAIG;IACH,mCAHW,MAAM,cACN,MAAM,QAIhB;IAED,gBAYC;IAED;;;;OAIG;IACH,gBAHW;QAAC,QAAQ,CAAC;QAAC,GAAG,CAAC,EAAC;YAAC,UAAU,EAAC,MAAM,CAAC;YAAC,IAAI,EAAC,WAAW,CAAA;SAAC,CAAA;KAAC,QAkDhE;CACJ;oBA/kBmB,kCAAkC;4BAG1B,2CAA2C;sDAZhE,OAAO;0BAEY,yCAAyC;gCADnC,mDAAmD;mBAGhE,0CAA0C;8BAI/B,2CAA2C"}
+{"version":3,"file":"TerrainTile.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/tiles/TerrainTile.js"],"names":[],"mappings":";AAqCA;;GAEG;AACH;IACI,sBAA6B;IAC7B,eAA0B;IAC1B,cAAqB;IACrB,kBAAyB;IACzB,4BAAoC;IAEpC;;;OAGG;IACH,mBAAgB;IAChB,uGAAiE;IAGjE;;;OAGG;IACH,UAFU,MAAM,cAAc,CAEd;IAEhB;;;OAGG;IACH,WAFU,OAAO,CAEA;IAEjB;;;OAGG;IACH,cAFU,SAAS,CAEY;IAE/B;;;OAGG;IACH,KAFU,eAAe,CAEd;IAEX;;;OAGG;IACH,SAFU,OAAO,CAED;IAChB;;;OAGG;IACH,mBAFU,OAAO,CAES;IAC1B,uBAAmB;IAEnB;;;OAGG;IACH,SAFU,OAAO,WAAW,CAAC,CAEN;IACvB,4DAA2B;IAE3B;;;;OAIG;IACH,kBAWE;IAEF;;;;;OAKG;IACH,+BAAiG;IAEjG;;;OAGG;IACH,SAFU,MAAM,CAEJ;IAqBZ;;;OAGG;IACH,6BAGC;IAfD;;;OAGG;IACH,0BAEC;IAWD;;;;;;;;;;OAUG;IACH,yBATW,aAAa,WACb,MAAM,WACN,MAAM,WACN,MAAM,cACN,MAAM,cACN,MAAM,cACN,MAAM,GACL,OAAO,CAkDlB;IAED,+CAKC;IAED,8CAOC;IAED;;;;;;;;;;OAUG;IACH,mBATW,WAAW,GAAC,SAAS,UACrB,WAAW,GAAC,SAAS,QACrB,WAAW,GAAC,SAAS,SACrB,WAAW,GAAC,SAAS,WACrB,WAAW,GAAC,SAAS,YACrB,WAAW,GAAC,SAAS,cACrB,WAAW,GAAC,SAAS,eACrB,WAAW,GAAC,SAAS,QAsN/B;IAED,2BAiFC;IAED;;;;OAIG;IACH,mCAHW,MAAM,cACN,MAAM,QAIhB;IAED,gBAYC;IAED;;;;OAIG;IACH,gBAHW;QAAC,QAAQ,CAAC;QAAC,GAAG,CAAC,EAAC;YAAC,UAAU,EAAC,MAAM,CAAC;YAAC,IAAI,EAAC,WAAW,CAAA;SAAC,CAAA;KAAC,QAoDhE;CACJ;oBAvlBmB,kCAAkC;4BAG1B,2CAA2C;sDAZhE,OAAO;0BAEY,yCAAyC;gCADnC,mDAAmD;mBAGhE,0CAA0C;8BAI/B,2CAA2C"}

package/src/engine/ecs/terrain/tiles/TerrainTile.js

@@ -122,6 +122,12 @@ class TerrainTile {
      */
     __initial_height_range = new NumericInterval(Number.NEGATIVE_INFINITY, Number.POSITIVE_INFINITY);
 
+    /**
+     * Used to track number of times tile was built
+     * @type {number}
+     */
+    version = 0;
+
     constructor() {
 
         this.mesh.name = "TerrainTile";
@@ -609,6 +615,8 @@ class TerrainTile {
         // console.timeEnd('total');
         // console.groupEnd();
 
+        this.version++;
+
         return mesh;
     }
 }

package/src/engine/ecs/terrain/tiles/TerrainTileManager.d.ts

@@ -187,10 +187,10 @@ declare class TerrainTileManager {
      *
      * @param {number} x
      * @param {number} y
-     * @param {function} resolve
-     * @param {function} reject
+     * @param {function(tile:TerrainTile)} resolve
+     * @param {function(reason:*)} reject
      */
-    build(x: number, y: number, resolve: Function, reject: Function): void;
+    build(x: number, y: number, resolve: any, reject: any): void;
 }
 import TerrainTile from './TerrainTile.js';
 import Signal from '../../../../core/events/signal/Signal.js';

package/src/engine/ecs/terrain/tiles/TerrainTileManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TerrainTileManager.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/tiles/TerrainTileManager.js"],"names":[],"mappings":";AA+BA;IA6DI;;;;;OAKG;IACH,wCAJW,OAAO,EA8BjB;IA5FD;;;OAGG;IACH,OAFU,WAAW,EAAE,CAEZ;IAEX;;;MAGE;IAEF;;;OAGG;IACH,UAFU,OAAO,CAEc;IAE/B;;;OAGG;IACH,WAFU,OAAO,CAEa;IAC9B;;;OAGG;IACH,YAFU,eAAe,CAEW;IAEpC;;;OAGG;IACH,OAFU,OAAO,CAES;IAG1B;;;;OAIG;IACH,oBAAmC;IAEnC;;;OAGG;IACH,cAFU,GAAG,CAEG;IAEhB;;;OAGG;IACH,aAFU,eAAe,CAEe;IAExC;;;OAGG;IACH,yBAFU,OAAO,CAEe;IAqB5B,6BAA2C;IAG3C;;;OAGG;IACH,yBAA8B;IAQlC,iCAWC;IAED,8BAEC;IAED;;;;OAIG;IACH,2BAHW,MAAM,cACN,MAAM,QA8BhB;IAED,mBAIC;IAED;;;OAGG;IACH,yBAFW,WAAW,QAerB;IAED;;;;OAIG;IACH,6CASC;IAED,qBAmBC;IAED;;OAEG;IACH,gBAIC;IAED;;;;;;OAMG;IACH,qBALW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,QAuBhB;IAGD;;;;;;;OAOG;IACH,oCANW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,WAAW,EAAE,CAgCzB;IAED,wBA6CC;IAED;;;;;OAKG;IACH,oBAJW,MAAM,KACN,MAAM,GACJ,MAAM,CAYlB;IAED;;;;;OAKG;IACH,UAJW,MAAM,KACN,MAAM,GACJ,WAAW,GAAC,SAAS,CAiBjC;IAED;;;;;OAKG;IACH,wBAJW,MAAM,KACN,MAAM,GACJ,WAAW,CAavB;IAED;;;;;OAKG;IACH,4BAJW,MAAM,KACN,MAAM,GACL,WAAW,GAAC,SAAS,CAahC;IAED;;;;;OAKG;IACH,+BAJW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CAYhC;IAED;;;;;;OAMG;IACH,UALW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CA4BhC;IAED;;;OAGG;IACH,cAFW,WAAW,QAcrB;IAED,gBASC;IAED;;;;;;OAMG;IACH,cAJW,MAAM,KACN,MAAM,QACN,WAAW,QAsCrB;IAED;;;;;;;;;;OAUG;IACH,yBATW,aAAa,WACb,MAAM,WACN,MAAM,WACN,MAAM,cACN,MAAM,cACN,MAAM,cACN,MAAM,GACJ,OAAO,CAuDnB;IAED;;;;;;OAMG;IACH,kCALW,aAAa,KACb,MAAM,KACN,MAAM,GACL,OAAO,CAOlB;IAED;;;;;;OAMG;IACH,SALW,MAAM,KACN,MAAM,6CA6DhB;CACJ;wBAvrBuB,kBAAkB;mBAVvB,0CAA0C;oBAGzC,kCAAkC;4BAG1B,2CAA2C;oBAVnD,mCAAmC;gCAQvB,mDAAmD;0BAGzD,yCAAyC;8BALrC,2CAA2C"}
+{"version":3,"file":"TerrainTileManager.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/tiles/TerrainTileManager.js"],"names":[],"mappings":";AA+BA;IA6DI;;;;;OAKG;IACH,wCAJW,OAAO,EA8BjB;IA5FD;;;OAGG;IACH,OAFU,WAAW,EAAE,CAEZ;IAEX;;;MAGE;IAEF;;;OAGG;IACH,UAFU,OAAO,CAEc;IAE/B;;;OAGG;IACH,WAFU,OAAO,CAEa;IAC9B;;;OAGG;IACH,YAFU,eAAe,CAEW;IAEpC;;;OAGG;IACH,OAFU,OAAO,CAES;IAG1B;;;;OAIG;IACH,oBAAmC;IAEnC;;;OAGG;IACH,cAFU,GAAG,CAEG;IAEhB;;;OAGG;IACH,aAFU,eAAe,CAEe;IAExC;;;OAGG;IACH,yBAFU,OAAO,CAEe;IAqB5B,6BAA2C;IAG3C;;;OAGG;IACH,yBAA8B;IAQlC,iCAWC;IAED,8BAEC;IAED;;;;OAIG;IACH,2BAHW,MAAM,cACN,MAAM,QAiChB;IAED,mBAIC;IAED;;;OAGG;IACH,yBAFW,WAAW,QAerB;IAED;;;;OAIG;IACH,6CASC;IAED,qBAqBC;IAED;;OAEG;IACH,gBAIC;IAED;;;;;;OAMG;IACH,qBALW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,QAuBhB;IAGD;;;;;;;OAOG;IACH,oCANW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,WAAW,EAAE,CAgCzB;IAED,wBAgDC;IAED;;;;;OAKG;IACH,oBAJW,MAAM,KACN,MAAM,GACJ,MAAM,CAYlB;IAED;;;;;OAKG;IACH,UAJW,MAAM,KACN,MAAM,GACJ,WAAW,GAAC,SAAS,CAiBjC;IAED;;;;;OAKG;IACH,wBAJW,MAAM,KACN,MAAM,GACJ,WAAW,CAavB;IAED;;;;;OAKG;IACH,4BAJW,MAAM,KACN,MAAM,GACL,WAAW,GAAC,SAAS,CAahC;IAED;;;;;OAKG;IACH,+BAJW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CAYhC;IAED;;;;;;OAMG;IACH,UALW,MAAM,KACN,MAAM,GACJ,QAAQ,WAAW,CAAC,CA4BhC;IAED;;;OAGG;IACH,cAFW,WAAW,QAcrB;IAED,gBASC;IAED;;;;;;OAMG;IACH,cAJW,MAAM,KACN,MAAM,QACN,WAAW,QAsCrB;IAED;;;;;;;;;;OAUG;IACH,yBATW,aAAa,WACb,MAAM,WACN,MAAM,WACN,MAAM,cACN,MAAM,cACN,MAAM,cACN,MAAM,GACJ,OAAO,CAuDnB;IAED;;;;;;OAMG;IACH,kCALW,aAAa,KACb,MAAM,KACN,MAAM,GACL,OAAO,CAOlB;IAED;;;;;;OAMG;IACH,SALW,MAAM,KACN,MAAM,mCAuFhB;CACJ;wBAztBuB,kBAAkB;mBAVvB,0CAA0C;oBAGzC,kCAAkC;4BAG1B,2CAA2C;oBAVnD,mCAAmC;gCAQvB,mDAAmD;0BAGzD,yCAAyC;8BALrC,2CAA2C"}

package/src/engine/ecs/terrain/tiles/TerrainTileManager.js

@@ -162,7 +162,10 @@ class TerrainTileManager {
         for (let i = 0; i < n; i++) {
             const terrainTile = tiles[i];
 
-            if (!terrainTile.isBuilt && !terrainTile.isBuildInProgress) {
+            if (
+                !terrainTile.isBuilt
+                && !terrainTile.isBuildInProgress
+            ) {
 
                 const bb = terrainTile.external_bvh;
 
@@ -223,6 +226,8 @@ class TerrainTileManager {
         const tiles = this.tiles;
         const tile_count = tiles.length;
 
+        console.warn(`#destroyTiles tile_count=${tile_count}`);
+
         for (let i = 0; i < tile_count; i++) {
             const tile = tiles[i];
 
@@ -319,7 +324,6 @@ class TerrainTileManager {
     }
 
     initializeTiles() {
-
         const total_size = this.totalSize;
 
         const gridSize = total_size.clone();
@@ -331,6 +335,10 @@ class TerrainTileManager {
 
         const tiles = this.tiles;
 
+        if (tiles.length > 0) {
+            throw new Error(`There are already ${tiles.length} initialized tiles, those must be destroyed before initialization can happen`);
+        }
+
         //populate tiles
         const tile_resolution_y = gridSize.y;
         const tile_resolution_x = gridSize.x;
@@ -654,16 +662,23 @@ class TerrainTileManager {
      *
      * @param {number} x
      * @param {number} y
-     * @param {function} resolve
-     * @param {function} reject
+     * @param {function(tile:TerrainTile)} resolve
+     * @param {function(reason:*)} reject
      */
     build(x, y, resolve, reject) {
 
-        assert.typeOf(resolve, 'function', 'resolve');
-        assert.typeOf(reject, 'function', 'reject');
+        assert.isFunction(resolve, 'resolve');
+        assert.isFunction(reject, 'reject');
 
-        const tileIndex = this.computeTileIndex(x, y);
-        const tile = this.tiles[tileIndex];
+        const tile_index = this.computeTileIndex(x, y);
+
+        const tile = this.tiles[tile_index];
+
+        if (tile.isBuildInProgress) {
+            throw new Error('Tile is already in process of being built');
+        }
+
+        const start_version = tile.version;
 
         tile.isBuilt = false;
         tile.isBuildInProgress = true;
@@ -679,17 +694,29 @@ class TerrainTileManager {
         ).then((tileData) => {
 
             //check that the tile under index is still the same tile
-            if (this.tiles[tileIndex] !== tile) {
+            if (this.tiles[tile_index] !== tile) {
                 //the original tile was destroyed
                 reject('Original tile was destroyed during build process');
                 return;
             }
 
-            if (!tile.isBuildInProgress) {
-                reject('Build request has been cancelled');
+            if (tile.version !== start_version) {
+                reject(`Tile version changed, likely due to concurrent build request. Expected version ${start_version}, actual version ${tile.version}`);
                 return;
             }
 
+            if (!tile.isBuildInProgress) {
+                if (tile.isBuilt) {
+                    // tile already built
+                    resolve(tile);
+                    return;
+                } else {
+
+                    reject('Build request has been cancelled');
+                    return;
+                }
+            }
+
             // const processName = 'building tile x = ' + x + ", y = " + y;
             // console.time(processName);
 
@@ -713,7 +740,14 @@ class TerrainTileManager {
             this.on.tileBuilt.send1(tile);
 
             resolve(tile);
-        }, reject);
+        }, (reason) => {
+
+            tile.isBuilt = false;
+            tile.isBuildInProgress = false;
+
+            reject(reason);
+
+        });
     }
 }