@woosh/meep-engine 2.88.2 → 2.88.4

package/build/meep.cjs

@@ -57551,6 +57551,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";
@@ -58038,6 +58044,8 @@ class TerrainTile {
         // console.timeEnd('total');
         // console.groupEnd();
 
+        this.version++;
+
         return mesh;
     }
 }
@@ -58181,7 +58189,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;
 
@@ -58338,7 +58349,6 @@ class TerrainTileManager {
     }
 
     initializeTiles() {
-
         const total_size = this.totalSize;
 
         const gridSize = total_size.clone();
@@ -58350,6 +58360,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;
@@ -58653,13 +58667,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;
@@ -58675,17 +58696,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);
 
@@ -58707,7 +58740,14 @@ class TerrainTileManager {
             this.on.tileBuilt.send1(tile);
 
             resolve(tile);
-        }, reject);
+        }, (reason) => {
+
+            tile.isBuilt = false;
+            tile.isBuildInProgress = false;
+
+            reject(reason);
+
+        });
     }
 }