@woosh/meep-engine 2.168.1 → 2.169.1

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

@@ -90,10 +90,10 @@ declare class TerrainTileManager {
     assignTileMaterial(tile: TerrainTile): void;
     /**
      *
-     * @param {function(tile:TerrainTile)} callback
+     * @param {(tile: TerrainTile) => void} callback
      * @param {*} [thisArg]
      */
-    traverse(callback: any, thisArg?: any): void;
+    traverse(callback: (tile: TerrainTile) => void, thisArg?: any): void;
     destroyTiles(): void;
     /**
      * Rebuild all tiles
@@ -124,6 +124,19 @@ declare class TerrainTileManager {
      * @returns {number}
      */
     computeTileIndex(x: number, y: number): number;
+    /**
+     * Number of tiles along X. A terrain whose size is not a whole multiple of
+     * the tile size ends in a partial tile, and that tile is real, so this
+     * rounds up. Every consumer must agree on this or edge tiles fall outside
+     * whatever grid the consumer imagined.
+     * @returns {number}
+     */
+    get gridWidth(): number;
+    /**
+     * Number of tiles along Y.
+     * @returns {number}
+     */
+    get gridHeight(): number;
     /**
      *
      * @param {number} x
@@ -174,6 +187,22 @@ declare class TerrainTileManager {
      * @param {TerrainTile} tile
      */
     stitchTile(x: number, y: number, tile: TerrainTile): void;
+    /**
+     * The eight tiles surrounding a grid cell, each undefined where the cell sits
+     * on the edge of the grid.
+     *
+     * Partial edge tiles are real tiles, so the neighbour grid must round up
+     * exactly as tile creation and getRaw do. Flooring it -- as this did until
+     * recently -- leaves the last row and column believing they have no
+     * neighbour on the outward side, so their seams are never stitched.
+     *
+     * @param {number} x Tile X coordinate
+     * @param {number} y Tile Y coordinate
+     * @returns {Object<string,TerrainTile|undefined>}
+     */
+    collectTileNeighbours(x: number, y: number): {
+        [x: string]: TerrainTile | undefined;
+    };
     /**
      *
      * @param {SurfacePoint3} result
@@ -198,10 +227,10 @@ declare class TerrainTileManager {
      *
      * @param {number} x
      * @param {number} y
-     * @param {function(tile:TerrainTile)} resolve
-     * @param {function(reason:*)} reject
+     * @param {(tile: TerrainTile) => void} resolve
+     * @param {(reason: *) => void} reject
      */
-    build(x: number, y: number, resolve: any, reject: any): void;
+    build(x: number, y: number, resolve: (tile: TerrainTile) => void, reject: (reason: any) => void): 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":";AA6BA;IA6DI;;;;;;;;OAQG;IACH,uDAPW,OAAO,EA2CjB;IAzGD;;;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;IAyB5B,wBAA2C;IAE3C;;;;;;OAMG;IACH,eAFU,WAAS,IAAI,CAEW;IAGlC;;;OAGG;IACH,yBAA8B;IAQlC,iCAWC;IAED,8BAEC;IAED;;;;OAIG;IACH,2BAHW,MAAM,cACN,MAAM,QAiChB;IAED,mBAIC;IAED;;;OAGG;IACH,yBAFW,WAAW,QAuBrB;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;wBA9uBuB,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":";AA6BA;IA6DI;;;;;;;;OAQG;IACH,uDAPW,OAAO,EA2CjB;IAzGD;;;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;IAyB5B,wBAA2C;IAE3C;;;;;;OAMG;IACH,eAFU,WAAS,IAAI,CAEW;IAGlC;;;OAGG;IACH,yBAA8B;IAQlC,iCAWC;IAED,8BAEC;IAED;;;;OAIG;IACH,2BAHW,MAAM,cACN,MAAM,QAiChB;IAED,mBAIC;IAED;;;OAGG;IACH,yBAFW,WAAW,QAuBrB;IAED;;;;OAIG;IACH,0BAHkB,WAAW,KAAK,IAAI,uBAYrC;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;;;;;;OAMG;IACH,wBAEC;IAED;;;OAGG;IACH,yBAEC;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,CAoBhC;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,QAUrB;IAED;;;;;;;;;;;;OAYG;IACH,yBAJW,MAAM,KACN,MAAM;YACG,MAAM,GAAC,WAAW,GAAC,SAAS;MAkD/C;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,kBACC,WAAW,KAAK,IAAI,2BACZ,IAAI,QAqF7B;CACJ;wBA3yBuB,kBAAkB;mBAVvB,0CAA0C;oBAGzC,kCAAkC;4BAG1B,2CAA2C;oBAVnD,mCAAmC;gCAQvB,mDAAmD;0BAGzD,yCAAyC;8BALrC,2CAA2C"}

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

@@ -225,7 +225,7 @@ class TerrainTileManager {
 
     /**
      *
-     * @param {function(tile:TerrainTile)} callback
+     * @param {(tile: TerrainTile) => void} callback
      * @param {*} [thisArg]
      */
     traverse(callback, thisArg) {
@@ -402,14 +402,33 @@ class TerrainTileManager {
         assert.isNonNegativeInteger(x, 'x');
         assert.isNonNegativeInteger(y, 'y');
 
-        const w = Math.ceil(this.totalSize.x / this.tileSize.x);
+        const w = this.gridWidth;
 
         assert.ok(x < w, `x(=${x}) must be less than than width(=${w})`);
-        assert.ok(y < Math.ceil(this.totalSize.y / this.tileSize.y), `y(=${y}) must be less than than height(=${Math.ceil(this.totalSize.y / this.tileSize.y)})`);
+        assert.ok(y < this.gridHeight, `y(=${y}) must be less than than height(=${this.gridHeight})`);
 
         return y * w + x;
     }
 
+    /**
+     * Number of tiles along X. A terrain whose size is not a whole multiple of
+     * the tile size ends in a partial tile, and that tile is real, so this
+     * rounds up. Every consumer must agree on this or edge tiles fall outside
+     * whatever grid the consumer imagined.
+     * @returns {number}
+     */
+    get gridWidth() {
+        return Math.ceil(this.totalSize.x / this.tileSize.x);
+    }
+
+    /**
+     * Number of tiles along Y.
+     * @returns {number}
+     */
+    get gridHeight() {
+        return Math.ceil(this.totalSize.y / this.tileSize.y);
+    }
+
     /**
      *
      * @param {number} x
@@ -419,7 +438,7 @@ class TerrainTileManager {
     getRaw(x, y) {
         if (
             x < 0
-            || x >= Math.ceil(this.totalSize.x / this.tileSize.x)
+            || x >= this.gridWidth
             || y < 0
         ) {
             return undefined;
@@ -468,7 +487,14 @@ class TerrainTileManager {
 
         v3_matrix4_multiply(v3, 0, v3, 0, world_inverse);
 
-        return this.getRawTileByPosition(v3[0], v3[1]);
+        // v3 was built as (x, 0, z): index 1 is the vertical axis, which is not
+        // a grid row. The top-down plane is X/Z.
+        //
+        // getRawTileByPosition takes *grid* coordinates, and `transform` does
+        // not carry the grid scale -- tiles apply it themselves (see
+        // assignTileScale). Divide it out here, matching Terrain's own
+        // mapPointWorld2Grid.
+        return this.getRawTileByPosition(v3[0] / this.scale.x, v3[2] / this.scale.y);
     }
 
     /**
@@ -561,40 +587,75 @@ class TerrainTileManager {
      */
     stitchTile(x, y, tile) {
 
-        const gridSize = this.totalSize.clone();
-        gridSize.divide(this.tileSize);
-        gridSize.floor();
+        const n = this.collectTileNeighbours(x, y);
 
-        const self = this;
-        //normal stitching
-        let top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight;
+        tile.stitchNormals(
+            n.top, n.bottom, n.left, n.right,
+            n.topLeft, n.topRight, n.bottomLeft, n.bottomRight
+        );
+    }
+
+    /**
+     * The eight tiles surrounding a grid cell, each undefined where the cell sits
+     * on the edge of the grid.
+     *
+     * Partial edge tiles are real tiles, so the neighbour grid must round up
+     * exactly as tile creation and getRaw do. Flooring it -- as this did until
+     * recently -- leaves the last row and column believing they have no
+     * neighbour on the outward side, so their seams are never stitched.
+     *
+     * @param {number} x Tile X coordinate
+     * @param {number} y Tile Y coordinate
+     * @returns {Object<string,TerrainTile|undefined>}
+     */
+    collectTileNeighbours(x, y) {
+        const gridWidth = this.gridWidth;
+        const gridHeight = this.gridHeight;
+
+        const result = {
+            top: undefined,
+            bottom: undefined,
+            left: undefined,
+            right: undefined,
+            topLeft: undefined,
+            topRight: undefined,
+            bottomLeft: undefined,
+            bottomRight: undefined
+        };
 
         if (y > 0) {
-            top = self.getRaw(x, y - 1);
+            result.top = this.getRaw(x, y - 1);
+
             if (x > 0) {
-                topLeft = self.getRaw(x - 1, y - 1);
+                result.topLeft = this.getRaw(x - 1, y - 1);
             }
-            if (x < gridSize.x - 1) {
-                topRight = self.getRaw(x + 1, y - 1);
+
+            if (x < gridWidth - 1) {
+                result.topRight = this.getRaw(x + 1, y - 1);
             }
         }
-        if (y < gridSize.y - 1) {
-            bottom = self.getRaw(x, y + 1);
+
+        if (y < gridHeight - 1) {
+            result.bottom = this.getRaw(x, y + 1);
+
             if (x > 0) {
-                bottomLeft = self.getRaw(x - 1, y + 1);
+                result.bottomLeft = this.getRaw(x - 1, y + 1);
             }
-            if (x < gridSize.x - 1) {
-                bottomRight = self.getRaw(x + 1, y + 1);
+
+            if (x < gridWidth - 1) {
+                result.bottomRight = this.getRaw(x + 1, y + 1);
             }
         }
+
         if (x > 0) {
-            left = self.getRaw(x - 1, y);
+            result.left = this.getRaw(x - 1, y);
         }
-        if (x < gridSize.x - 1) {
-            right = self.getRaw(x + 1, y);
+
+        if (x < gridWidth - 1) {
+            result.right = this.getRaw(x + 1, y);
         }
 
-        tile.stitchNormals(top, bottom, left, right, topLeft, topRight, bottomLeft, bottomRight);
+        return result;
     }
 
     /**
@@ -681,8 +742,8 @@ class TerrainTileManager {
      *
      * @param {number} x
      * @param {number} y
-     * @param {function(tile:TerrainTile)} resolve
-     * @param {function(reason:*)} reject
+     * @param {(tile: TerrainTile) => void} resolve
+     * @param {(reason: *) => void} reject
      */
     build(x, y, resolve, reject) {
 

package/src/engine/ecs/terrain/util/obtainTerrain.d.ts

@@ -1,10 +1,9 @@
 /**
  *
  * @param {EntityComponentDataset} ecd
- * @param {function(terrain:Terrain,entity:number)} [callback]
+ * @param {(terrain: Terrain, entity: number) => void} [callback]
  * @returns {Terrain|null}
  */
-export function obtainTerrain(ecd: EntityComponentDataset, callback?: typeof noop): Terrain | null;
-import { noop } from "../../../../core/function/noop.js";
+export function obtainTerrain(ecd: EntityComponentDataset, callback?: (terrain: Terrain, entity: number) => void): Terrain | null;
 import Terrain from "../ecs/Terrain.js";
 //# sourceMappingURL=obtainTerrain.d.ts.map

package/src/engine/ecs/terrain/util/obtainTerrain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"obtainTerrain.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/util/obtainTerrain.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,oFAFa,OAAO,GAAC,IAAI,CAaxB;qBApBoB,mCAAmC;oBACpC,mBAAmB"}
+{"version":3,"file":"obtainTerrain.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/util/obtainTerrain.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,gFAHqB,OAAO,UAAU,MAAM,KAAK,IAAI,GACxC,OAAO,GAAC,IAAI,CAaxB;oBAnBmB,mBAAmB"}

package/src/engine/ecs/terrain/util/obtainTerrain.js

@@ -5,7 +5,7 @@ import Terrain from "../ecs/Terrain.js";
 /**
  *
  * @param {EntityComponentDataset} ecd
- * @param {function(terrain:Terrain,entity:number)} [callback]
+ * @param {(terrain: Terrain, entity: number) => void} [callback]
  * @returns {Terrain|null}
  */
 export function obtainTerrain(ecd, callback=noop) {

package/src/engine/ecs/util/hideEntityGracefully.js

@@ -26,14 +26,14 @@ const SHUTDOWN_GRACE_PERIOD = 60;
 
 /**
  *
- * @type {Map<Class|function, function(T,entity?:Entity,createEntity?:function,createEntityContext?:*):number>}
+ * @type {Map<Class|function, (component: T, entity?: Entity, createEntity?: function, createEntityContext?: *) => number>}
  */
 const component_shutdown = new Map();
 
 /**
  * @template T
  * @param {Class<T>} type
- * @param {function(T,entity?:Entity,createEntity?:function,createEntityContext?:*):number} method
+ * @param {(component: T, entity?: Entity, createEntity?: function, createEntityContext?: *) => number} method
  */
 function addShutdown(type, method) {
     component_shutdown.set(type, method);