@woosh/meep-engine 2.88.1 → 2.88.3

package/package.json

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

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

@@ -5,13 +5,15 @@
  * @param {ParameterLookupTable} [params.lut]
  * @param {NumericInterval} [params.range] Range of values of interest within the sampler that are to be mapped onto LUT
  * @param {function(number):number} [params.lookupScaleFunction]
+ * @param {number} [params.channel]
  */
-export function paintTerrainOverlayViaLookupTable({ overlay, sampler, lut, range, lookupScaleFunction }: {
+export function paintTerrainOverlayViaLookupTable({ overlay, sampler, lut, range, lookupScaleFunction, channel }: {
     overlay: TerrainOverlay;
     sampler: Sampler2D;
     lut?: ParameterLookupTable;
     range?: NumericInterval;
     lookupScaleFunction?: (arg0: number) => number;
+    channel?: number;
 }): void;
 import { Sampler2D } from "../../../graphics/texture/sampler/Sampler2D.js";
 import { ParameterLookupTable } from "../../../graphics/particles/particular/engine/parameter/ParameterLookupTable.js";

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

@@ -1 +1 @@
-{"version":3,"file":"paintTerrainOverlayViaLookupTable.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/util/paintTerrainOverlayViaLookupTable.js"],"names":[],"mappings":"AAmBA;;;;;;;GAOG;AACH;IANkC,OAAO;IACZ,OAAO,EAAzB,SAAS;IACqB,GAAG,GAAjC,oBAAoB;IACK,KAAK,GAA9B,eAAe;IACkB,mBAAmB,UAA3C,MAAM,KAAE,MAAM;SA0CjC;0BA9DyB,gDAAgD;qCAFrC,iFAAiF;gCADtF,mDAAmD"}
+{"version":3,"file":"paintTerrainOverlayViaLookupTable.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/util/paintTerrainOverlayViaLookupTable.js"],"names":[],"mappings":"AAmBA;;;;;;;;GAQG;AACH;IAPkC,OAAO;IACZ,OAAO,EAAzB,SAAS;IACqB,GAAG,GAAjC,oBAAoB;IACK,KAAK,GAA9B,eAAe;IACkB,mBAAmB,UAA3C,MAAM,KAAE,MAAM;IACP,OAAO,GAAvB,MAAM;SA2ChB;0BAhEyB,gDAAgD;qCAFrC,iFAAiF;gCADtF,mDAAmD"}

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

@@ -24,13 +24,15 @@ heatmap_lut.computeUniformPositions();
  * @param {ParameterLookupTable} [params.lut]
  * @param {NumericInterval} [params.range] Range of values of interest within the sampler that are to be mapped onto LUT
  * @param {function(number):number} [params.lookupScaleFunction]
+ * @param {number} [params.channel]
  */
 export function paintTerrainOverlayViaLookupTable({
                                                       overlay,
                                                       sampler,
                                                       lut = heatmap_lut,
                                                       range = new NumericInterval(0, 1),
-                                                      lookupScaleFunction = passThrough
+                                                      lookupScaleFunction = passThrough,
+                                                      channel = 0
                                                   }) {
     let i, j;
 
@@ -51,7 +53,7 @@ export function paintTerrainOverlayViaLookupTable({
 
         for (i = 0; i < w; i++) {
 
-            const p = scaled_sampler.readChannel(i, j, 0);
+            const p = scaled_sampler.readChannel(i, j, channel);
 
             const scaledPosition = lookupScaleFunction(p);
 

package/src/engine/grid/obstacle/GridObstacle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridObstacle.d.ts","sourceRoot":"","sources":["../../../../../src/engine/grid/obstacle/GridObstacle.js"],"names":[],"mappings":";AAWA;IA0NI,sCAMC;IA/ND,eAAW;IAEX;;;OAGG;IACH,eAFU,OAAO,CAEQ;IAEzB;;;;OAIG;IACH,UAHW,MAAM,KACN,MAAM,QAiChB;IAED;;;;;;OAMG;IACH,sBALW,MAAM,WACN,MAAM,qCAmChB;IAED;;;;;OAKG;IACH,aAJW,MAAM,KACN,MAAM,GACJ,MAAM,CAWlB;IAED;;;;;OAKG;IACH,cAJW,MAAM,KACN,MAAM,SACN,MAAM,QAShB;IAED;;;;;OAKG;IACH,iBAJW,MAAM,KACN,MAAM,GACJ,OAAO,CAYnB;IAED;;;;;;OAMG;IACH,mBALW,MAAM,KACN,MAAM,iBACN,MAAM,EAAE,GACN,OAAO,CAoDnB;IAED;;;MAKC;IAED;;;aAaC;IAUD;;;OAGG;IACH,QAFa,MAAM,CAOlB;IAED;;;;OAIG;IACH,cAHW,YAAY,GACV,OAAO,CAQnB;CACJ;;;;oBA/PmB,+BAA+B"}
+{"version":3,"file":"GridObstacle.d.ts","sourceRoot":"","sources":["../../../../../src/engine/grid/obstacle/GridObstacle.js"],"names":[],"mappings":";AAWA;IA0NI,sCAMC;IA/ND,eAAW;IAEX;;;OAGG;IACH,eAFU,OAAO,CAEQ;IAEzB;;;;OAIG;IACH,UAHW,MAAM,KACN,MAAM,QAiChB;IAED;;;;;;OAMG;IACH,sBALW,MAAM,WACN,MAAM,qCAmChB;IAED;;;;;OAKG;IACH,aAJW,MAAM,KACN,MAAM,GACJ,MAAM,CAWlB;IAED;;;;;OAKG;IACH,cAJW,MAAM,KACN,MAAM,SACN,MAAM,QAShB;IAED;;;;;OAKG;IACH,iBAJW,MAAM,KACN,MAAM,GACJ,OAAO,CAYnB;IAED;;;;;;OAMG;IACH,mBALW,MAAM,KACN,MAAM,iBACN,MAAM,EAAE,GACN,OAAO,CAoDnB;IAED;;;MAKC;IAED;;;aAaC;IAUD;;;OAGG;IACH,QAFa,MAAM,CAOlB;IAED;;;;OAIG;IACH,cAHW,YAAY,GACV,OAAO,CAQnB;CACJ;;;;oBA5PmB,+BAA+B"}

package/src/engine/grid/obstacle/GridObstacle.js

@@ -3,11 +3,11 @@
  */
 
 
-import Vector2 from '../../../core/geom/Vector2.js';
 import { assert } from "../../../core/assert.js";
-import { computeIntegerArrayHash } from "../../../core/primitives/array/computeIntegerArrayHash.js";
-import { isArrayEqualStrict } from "../../../core/collection/array/isArrayEqualStrict.js";
 import { computeHashIntegerArray } from "../../../core/collection/array/computeHashIntegerArray.js";
+import { isArrayEqualStrict } from "../../../core/collection/array/isArrayEqualStrict.js";
+import Vector2 from '../../../core/geom/Vector2.js';
+import { computeIntegerArrayHash } from "../../../core/primitives/array/computeIntegerArrayHash.js";
 
 class GridObstacle {
     data = [1];
@@ -208,7 +208,7 @@ class GridObstacle {
     toJSON() {
         return {
             size: this.size.toJSON(),
-            data: this.data
+            data: Array.from(this.data) //make sure to force it to Array type for JSON serialization to work correctly
         };
     }
 

package/src/generation/placement/action/GridCellActionPlaceTags.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridCellActionPlaceTags.d.ts","sourceRoot":"","sources":["../../../../../src/generation/placement/action/GridCellActionPlaceTags.js"],"names":[],"mappings":"AAKA;IAsCI;;;;;OAKG;IACH,mBAJW,MAAM,SACN,MAAM,GACJ,uBAAuB,CAgBnC;IAxDD;;;OAGG;IACH,kBAFmB,MAAM,QAAE,MAAM,KAAG,MAAM,CAEpB;IAEtB;;;OAGG;IACH,MAFU,SAAS,CAEc;IAEjC;;;OAGG;IACH,SAFU,MAAM,CAED;IAEf;;;;OAIG;IACH,gBAAe;IAGf,uCAQC;IAwBD;;;OAGG;IACH,WAFW,MAAM,QAMhB;IAED;;;;OAIG;IACH,UAHW,MAAM,KACN,MAAM,QAIhB;IAED;;OAEG;IACH,wDAgCC;CACJ;+BAxH8B,qBAAqB;0BAC1B,uDAAuD"}
+{"version":3,"file":"GridCellActionPlaceTags.d.ts","sourceRoot":"","sources":["../../../../../src/generation/placement/action/GridCellActionPlaceTags.js"],"names":[],"mappings":"AAKA;IAsCI;;;;;OAKG;IACH,mBAJW,MAAM,SACN,MAAM,GACJ,uBAAuB,CAgBnC;IAxDD;;;OAGG;IACH,kBAFmB,MAAM,QAAE,MAAM,KAAG,MAAM,CAEpB;IAEtB;;;OAGG;IACH,MAFU,SAAS,CAEc;IAEjC;;;OAGG;IACH,SAFU,MAAM,CAED;IAEf;;;;OAIG;IACH,gBAAe;IAGf,uCAQC;IAwBD;;;OAGG;IACH,WAFW,MAAM,QAMhB;IAED;;;;OAIG;IACH,UAHW,MAAM,KACN,MAAM,QAIhB;IAED;;OAEG;IACH,wDA2CC;CACJ;+BAhI8B,qBAAqB;0BAD1B,uDAAuD"}

package/src/generation/placement/action/GridCellActionPlaceTags.js

@@ -1,7 +1,7 @@
-import { GridCellAction } from "./GridCellAction.js";
-import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
 import { assert } from "../../../core/assert.js";
 import { bitwiseOr } from "../../../core/binary/operations/bitwiseOr.js";
+import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
+import { GridCellAction } from "./GridCellAction.js";
 
 export class GridCellActionPlaceTags extends GridCellAction {
 
@@ -99,8 +99,6 @@ export class GridCellActionPlaceTags extends GridCellAction {
         for (let local_y = 0; local_y < height; local_y++) {
             for (let local_x = 0; local_x < width; local_x++) {
 
-                //read the tag value
-                const cell_tags = tags.readChannel(local_x, local_y, 0);
 
                 //rotate rule position
                 const rotated_local_x = local_x * cos - local_y * sin
@@ -110,6 +108,19 @@ export class GridCellActionPlaceTags extends GridCellAction {
                 const target_x = Math.round(rotated_local_x + x);
                 const target_y = Math.round(rotated_local_y + y);
 
+                if (
+                    target_x < 0
+                    || target_x >= sampler.width
+                    || target_y < 0
+                    || target_y >= sampler.height
+                ) {
+                    // out of bounds
+                    continue;
+                }
+
+                //read the tag value
+                const cell_tags = tags.readChannel(local_x, local_y, 0);
+
                 const source = sampler.readChannel(target_x, target_y, 0);
 
                 const result = this.operation(source, cell_tags);