@woosh/meep-engine 2.155.0 → 2.157.0

package/src/generation/filtering/numeric/sampling/AbstractCellFilterSampleGridLayer.js

@@ -29,7 +29,13 @@ export class AbstractCellFilterSampleGridLayer extends CellFilter {
     initialize(grid, seed) {
         super.initialize(grid, seed);
 
-        this.__layer = grid.getLayerById(this.layerId);
+        const layer = grid.getLayerById(this.layerId);
+
+        if (layer === undefined) {
+            throw new Error(`Layer '${this.layerId}' not found`);
+        }
+
+        this.__layer = layer;
 
         // cache required values
         this.__sampler = this.__layer.sampler;

package/src/generation/filtering/numeric/util/populateSampler2DFromCellFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"populateSampler2DFromCellFilter.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/filtering/numeric/util/populateSampler2DFromCellFilter.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,2FA8BC"}
+{"version":3,"file":"populateSampler2DFromCellFilter.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/filtering/numeric/util/populateSampler2DFromCellFilter.js"],"names":[],"mappings":"AAEA;;;;;GAKG;AACH,2FA2BC"}

package/src/generation/filtering/numeric/util/populateSampler2DFromCellFilter.js

@@ -11,24 +11,21 @@ export function populateSampler2DFromCellFilter({ result, filter, grid }) {
     assert.defined(filter,'filter');
     assert.defined(grid,'grid');
 
-    if (!filter.initialized) {
-        filter.initialize(grid, 0);
-    }
+    filter.ensureInitialized(grid, 0);
+
+    // ratio mapping, texel t of the result represents grid t / scale (see generation/COORDINATES.md)
+    const scale_x = result.width / grid.width;
+    const scale_y = result.height / grid.height;
 
     const result_height = result.height;
-    const v_scale_result = 1 / (result_height - 1);
 
     for (let y = 0; y < result_height; y++) {
 
-        const v = y * v_scale_result;
-
-        const grid_y = v * (grid.height - 1);
+        const grid_y = y / scale_y;
 
         for (let x = 0; x < result.width; x++) {
 
-            const u = x / (result.width - 1);
-
-            const grid_x = u * (grid.width - 1);
+            const grid_x = x / scale_x;
 
             const filterValue = filter.execute(grid, grid_x, grid_y, 0);
 

package/src/generation/filtering/numeric/util/sampler_from_filter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sampler_from_filter.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/filtering/numeric/util/sampler_from_filter.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,2FAFW,MAAM,aAiBhB;0BAxByB,0DAA0D"}
+{"version":3,"file":"sampler_from_filter.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/filtering/numeric/util/sampler_from_filter.js"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,2FAFW,MAAM,aAkBhB;0BAzByB,0DAA0D"}

package/src/generation/filtering/numeric/util/sampler_from_filter.js

@@ -9,7 +9,8 @@ import { populateSampler2DFromCellFilter } from "./populateSampler2DFromCellFilt
  * @param {number} resolution_scale must be a positive integer
  */
 export function sampler_from_filter(grid, filter, resolution_scale = 1) {
-    assert.isNonNegativeInteger(resolution_scale, 'scale');
+    assert.isNonNegativeInteger(resolution_scale, 'resolution_scale');
+    assert.greaterThan(resolution_scale, 0, 'resolution_scale');
     assert.defined(grid, 'grid');
     assert.defined(filter, 'filter');
 

package/src/generation/grid/GridData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridData.d.ts","sourceRoot":"","sources":["../../../../src/generation/grid/GridData.js"],"names":[],"mappings":"AAYA;IAEI,cAAU;IACV,eAAW;IAEX;;;OAGG;IACH,oBAFU,sBAAsB,CAES;IAEzC;;;OAGG;IACH,kBAFU,wBAAwB,CAEL;IAE7B;;;;OAIG;IACH,iBAFU,eAAe,CAEb;IAGZ;;;OAGG;IACH,qCAmBC;IAED;;;;OAIG;IACH,iBAHW,MAAM,GACJ,gBAAc,SAAS,CAkBnC;IAED;;;;;;;OAOG;IACH,0BANW,MAAM,KACN,MAAM,UACN,MAAM,+BAEJ,OAAO,CAInB;IAED;;;;;;;OAOG;IACH,uBANW,MAAM,KACN,MAAM,UACN,MAAM,+BAEJ,MAAM,CAsClB;IAED;;;OAGG;IACH,kCAMC;IAED;;;OAGG;IACH,kCASC;IAED;;;;OAIG;IACH,cAHW,MAAM,UACN,MAAM,QAqChB;IAKL;;;OAGG;IACH,qBAFU,OAAO,CAEY;CAP5B;uCAhNsC,wDAAwD;6BAFlE,8CAA8C"}
+{"version":3,"file":"GridData.d.ts","sourceRoot":"","sources":["../../../../src/generation/grid/GridData.js"],"names":[],"mappings":"AAmBA;IAEI,cAAU;IACV,eAAW;IAEX;;;OAGG;IACH,oBAFU,sBAAsB,CAES;IAEzC;;;OAGG;IACH,kBAFU,wBAAwB,CAEL;IAE7B;;;;OAIG;IACH,iBAFU,eAAe,CAEb;IAGZ;;;OAGG;IACH,qCAmBC;IAED;;;;OAIG;IACH,iBAHW,MAAM,GACJ,gBAAc,SAAS,CAkBnC;IAED;;;;;;;OAOG;IACH,0BANW,MAAM,KACN,MAAM,UACN,MAAM,+BAEJ,OAAO,CAInB;IAED;;;;;;;OAOG;IACH,uBANW,MAAM,KACN,MAAM,UACN,MAAM,+BAEJ,MAAM,CA4ClB;IAED;;;OAGG;IACH,kCAMC;IAED;;;OAGG;IACH,kCASC;IAED;;;;OAIG;IACH,cAHW,MAAM,UACN,MAAM,QAqChB;IAKL;;;OAGG;IACH,qBAFU,OAAO,CAEY;CAP5B;uCA7NsC,wDAAwD;6BAFlE,8CAA8C"}

package/src/generation/grid/GridData.js

@@ -10,6 +10,13 @@ import { OffsetScaleTransform2D } from "../../engine/ecs/terrain/ecs/OffsetScale
  */
 const marker_collection = [];
 
+/**
+ * Guards against re-entrant use of the shared scratch array, which would corrupt an in-flight query
+ * (e.g. a {@link MarkerNodeMatcher} that itself queries the grid)
+ * @type {boolean}
+ */
+let marker_collection_locked = false;
+
 export class GridData {
 
     width = 0;
@@ -104,6 +111,10 @@ export class GridData {
      * @returns {number}
      */
     countMarkerInCircle(x, y, radius, matcher) {
+        assert.equal(marker_collection_locked, false, 're-entrant marker query, the matcher of an outer query is querying the grid again');
+
+        marker_collection_locked = true;
+
         const match_count = qt_collect_by_circle(marker_collection, 0, this.markers, x, y, radius);
 
         let result = 0;
@@ -138,6 +149,8 @@ export class GridData {
             }
         }
 
+        marker_collection_locked = false;
+
         return result;
     }
 
@@ -181,7 +194,7 @@ export class GridData {
         assert.isNonNegativeInteger(height, 'height');
 
         assert.isFinite(width, 'width');
-        assert.isFinite(height, 'width');
+        assert.isFinite(height, 'height');
 
         if (width === this.width && height === this.height) {
             //no need, already the right size

package/src/generation/grid/actions/ContinuousGridCellAction.d.ts

@@ -11,12 +11,19 @@ export class ContinuousGridCellAction {
      */
     get initialized(): boolean;
     /**
-     *
-     * @param {number} seed
+     * Guarded entry point, no-op when already initialized
+     * @param {GridData} grid
      * @param {EntityComponentDataset} ecd
+     * @param {number} seed
+     */
+    ensureInitialized(grid: GridData, ecd: EntityComponentDataset, seed: number): void;
+    /**
+     *
      * @param {GridData} grid
+     * @param {EntityComponentDataset} ecd
+     * @param {number} seed
      */
-    initialize(seed: number, ecd: EntityComponentDataset, grid: GridData): void;
+    initialize(grid: GridData, ecd: EntityComponentDataset, seed: number): void;
     finalize(): void;
     /**
      *

package/src/generation/grid/actions/ContinuousGridCellAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContinuousGridCellAction.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/actions/ContinuousGridCellAction.js"],"names":[],"mappings":"AAAA;IAEI;;;;OAIG;IACH,sBAAsB;IAGtB;;;OAGG;IACH,2BAEC;IAED;;;;;OAKG;IACH,iBAJW,MAAM,qDAMhB;IAED,iBAEC;IAED;;;;;;;;OAQG;IACH,wDALW,MAAM,KACN,MAAM,YACN,MAAM,8BAKhB;IAIL;;;OAGG;IACH,qCAFU,OAAO,CAE4C;CAP5D"}
+{"version":3,"file":"ContinuousGridCellAction.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/actions/ContinuousGridCellAction.js"],"names":[],"mappings":"AAAA;IAEI;;;;OAIG;IACH,sBAAsB;IAGtB;;;OAGG;IACH,2BAEC;IAED;;;;;OAKG;IACH,qEAFW,MAAM,QAShB;IAED;;;;;OAKG;IACH,8DAFW,MAAM,QAIhB;IAED,iBAEC;IAED;;;;;;;;OAQG;IACH,wDALW,MAAM,KACN,MAAM,YACN,MAAM,8BAKhB;IAIL;;;OAGG;IACH,qCAFU,OAAO,CAE4C;CAP5D"}

package/src/generation/grid/actions/ContinuousGridCellAction.js

@@ -17,12 +17,27 @@ export class ContinuousGridCellAction {
     }
 
     /**
-     *
-     * @param {number} seed
+     * Guarded entry point, no-op when already initialized
+     * @param {GridData} grid
      * @param {EntityComponentDataset} ecd
+     * @param {number} seed
+     */
+    ensureInitialized(grid, ecd, seed) {
+        if (!this.__initialized) {
+            this.initialize(grid, ecd, seed);
+
+            // make sure initialization flag is set
+            this.__initialized = true;
+        }
+    }
+
+    /**
+     *
      * @param {GridData} grid
+     * @param {EntityComponentDataset} ecd
+     * @param {number} seed
      */
-    initialize(seed, ecd, grid) {
+    initialize(grid, ecd, seed) {
         this.__initialized = true;
     }
 

package/src/generation/grid/actions/ContinuousGridCellActionSetTerrainHeight.d.ts

@@ -1,3 +1,13 @@
+/**
+ * Lerps terrain heightmap texels towards a target height filter.
+ *
+ * NOTE: the terrain heightmap is the terrain renderer's vertex-aligned domain — this action
+ * deliberately maps grid corners to sampler corners (x/(w-1) form), unlike grid layers which
+ * use the ratio mapping (see generation/COORDINATES.md). Each invocation writes only the
+ * <=4 texels under the given position's bilinear footprint; when the heightmap is more than
+ * twice as dense as the invocation grid, callers must invoke at sub-cell resolution
+ * (e.g. GridActionRuleSet's `resolution` parameter) or texels between cells stay untouched.
+ */
 export class ContinuousGridCellActionSetTerrainHeight extends ContinuousGridCellAction {
     /**
      *
@@ -9,7 +19,7 @@ export class ContinuousGridCellActionSetTerrainHeight extends ContinuousGridCell
      * @type {CellFilter}
      */
     target: CellFilter;
-    initialize(seed: any, ecd: any, grid: any): void;
+    initialize(grid: any, ecd: any, seed: any): void;
     execute(ecd: any, grid: any, x: any, y: any, rotation: any, strength: any): void;
 }
 import { ContinuousGridCellAction } from "./ContinuousGridCellAction.js";

package/src/generation/grid/actions/ContinuousGridCellActionSetTerrainHeight.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContinuousGridCellActionSetTerrainHeight.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/actions/ContinuousGridCellActionSetTerrainHeight.js"],"names":[],"mappings":"AAQA;IAEI;;;OAGG;IACH,eAFU,SAAS,CAEE;IAErB;;;OAGG;IACH,mBAAwC;IAGxC,iDAeC;IAED,iFAsDC;CACJ;yCAzFwC,+BAA+B;0BAF9C,uDAAuD"}
+{"version":3,"file":"ContinuousGridCellActionSetTerrainHeight.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/actions/ContinuousGridCellActionSetTerrainHeight.js"],"names":[],"mappings":"AAQA;;;;;;;;;GASG;AACH;IAEI;;;OAGG;IACH,eAFU,SAAS,CAEE;IAErB;;;OAGG;IACH,mBAAwC;IAGxC,iDAeC;IAED,iFAsDC;CACJ;yCAnGwC,+BAA+B;0BAF9C,uDAAuD"}

package/src/generation/grid/actions/ContinuousGridCellActionSetTerrainHeight.js

@@ -6,6 +6,16 @@ import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js
 import { CellFilterLiteralFloat } from "../../filtering/numeric/CellFilterLiteralFloat.js";
 import { ContinuousGridCellAction } from "./ContinuousGridCellAction.js";
 
+/**
+ * Lerps terrain heightmap texels towards a target height filter.
+ *
+ * NOTE: the terrain heightmap is the terrain renderer's vertex-aligned domain — this action
+ * deliberately maps grid corners to sampler corners (x/(w-1) form), unlike grid layers which
+ * use the ratio mapping (see generation/COORDINATES.md). Each invocation writes only the
+ * <=4 texels under the given position's bilinear footprint; when the heightmap is more than
+ * twice as dense as the invocation grid, callers must invoke at sub-cell resolution
+ * (e.g. GridActionRuleSet's `resolution` parameter) or texels between cells stay untouched.
+ */
 export class ContinuousGridCellActionSetTerrainHeight extends ContinuousGridCellAction {
 
     /**
@@ -21,8 +31,8 @@ export class ContinuousGridCellActionSetTerrainHeight extends ContinuousGridCell
     target = CellFilterLiteralFloat.from(0);
 
 
-    initialize(seed, ecd, grid) {
-        super.initialize(seed, ecd, grid);
+    initialize(grid, ecd, seed) {
+        super.initialize(grid, ecd, seed);
 
         /**
          *
@@ -35,7 +45,7 @@ export class ContinuousGridCellActionSetTerrainHeight extends ContinuousGridCell
         this.heightSampler = terrain.samplerHeight;
 
 
-        this.target.initialize(grid, seed);
+        this.target.ensureInitialized(grid, seed);
     }
 
     execute(ecd, grid, x, y, rotation, strength) {

package/src/generation/grid/actions/ContinuousGridCellActionSetTerrainObstacle.d.ts

@@ -9,7 +9,7 @@ export class ContinuousGridCellActionSetTerrainObstacle extends ContinuousGridCe
      * @type {CellFilter}
      */
     threshold: CellFilter;
-    initialize(seed: any, ecd: any, grid: any): void;
+    initialize(grid: any, ecd: any, seed: any): void;
     execute(ecd: any, grid: any, x: any, y: any, rotation: any, strength: any): void;
 }
 import { ContinuousGridCellAction } from "./ContinuousGridCellAction.js";

package/src/generation/grid/actions/ContinuousGridCellActionSetTerrainObstacle.js

@@ -21,8 +21,8 @@ export class ContinuousGridCellActionSetTerrainObstacle extends ContinuousGridCe
         this.threshold = CellFilterLiteralFloat.from(0);
     }
 
-    initialize(seed, ecd, grid) {
-        super.initialize(seed, ecd, grid);
+    initialize(grid, ecd, seed) {
+        super.initialize(grid, ecd, seed);
 
 
         const cp = ecd.getAnyComponent(Terrain);

package/src/generation/grid/actions/ContinuousGridCellActionWriteObstacle.d.ts

@@ -33,7 +33,7 @@ export class ContinuousGridCellActionWriteObstacle extends ContinuousGridCellAct
      * @type {GridObstacle}
      */
     targetGridObstacle: GridObstacle;
-    initialize(seed: any, ecd: any, grid: any): void;
+    initialize(grid: any, ecd: any, seed: any): void;
     execute(ecd: any, grid: any, x: any, y: any, rotation: any, strength: any): void;
 }
 import { ContinuousGridCellAction } from "./ContinuousGridCellAction.js";

package/src/generation/grid/actions/ContinuousGridCellActionWriteObstacle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ContinuousGridCellActionWriteObstacle.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/actions/ContinuousGridCellActionWriteObstacle.js"],"names":[],"mappings":"AAOA;IA0CI;;;;;;OAMG;IACH,2DAFY,qCAAqC,CAahD;IAzDG;;;OAGG;IACH,qBAA8C;IAE9C,kBAAkB;IAElB;;;;;OAKG;IACH;kBAFuB,YAAY;kBAAY,YAAY;MAa1D;IAED;;;OAGG;IACH,oBAFU,YAAY,CAEQ;IAC9B;;;OAGG;IACH,oBAFU,YAAY,CAEQ;IAuBlC,iDAwBC;IAED,iFA0BC;CACJ;yCA1HwC,+BAA+B;yBAG/C,+CAA+C;yBAC/C,+CAA+C"}
+{"version":3,"file":"ContinuousGridCellActionWriteObstacle.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/actions/ContinuousGridCellActionWriteObstacle.js"],"names":[],"mappings":"AAOA;IA0CI;;;;;;OAMG;IACH,2DAFY,qCAAqC,CAahD;IAzDG;;;OAGG;IACH,qBAA8C;IAE9C,kBAAkB;IAElB;;;;;OAKG;IACH;kBAFuB,YAAY;kBAAY,YAAY;MAa1D;IAED;;;OAGG;IACH,oBAFU,YAAY,CAEQ;IAC9B;;;OAGG;IACH,oBAFU,YAAY,CAEQ;IAuBlC,iDAsBC;IAED,iFA0BC;CACJ;yCAxHwC,+BAA+B;yBAG/C,+CAA+C;yBAC/C,+CAA+C"}

package/src/generation/grid/actions/ContinuousGridCellActionWriteObstacle.js

@@ -67,8 +67,8 @@ export class ContinuousGridCellActionWriteObstacle extends ContinuousGridCellAct
         return r;
     }
 
-    initialize(seed, ecd, grid) {
-        super.initialize(seed, ecd, grid);
+    initialize(grid, ecd, seed) {
+        super.initialize(grid, ecd, seed);
 
         const target = this.extractTarget(grid, ecd);
 
@@ -88,9 +88,7 @@ export class ContinuousGridCellActionWriteObstacle extends ContinuousGridCellAct
 
 
         //initialize obstacle filter
-        if (!this.obstacle.initialized) {
-            this.obstacle.initialize(grid, seed);
-        }
+        this.obstacle.ensureInitialized(grid, seed);
     }
 
     execute(ecd, grid, x, y, rotation, strength) {
@@ -118,6 +116,6 @@ export class ContinuousGridCellActionWriteObstacle extends ContinuousGridCellAct
         const isObstacle = v > this.threshold;
 
 
-        to.writePoint(x, y, isObstacle ? 1 : 0);
+        to.writePoint(local_x, local_y, isObstacle ? 1 : 0);
     }
 }

package/src/generation/grid/coords/grid_to_texel.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Canonical grid → layer-texel mapping (see generation/COORDINATES.md).
+ * Integer grid coordinates are cell centers, integer texel coordinates are texel centers.
+ * @param {number} v grid coordinate
+ * @param {number} resolution texels per grid cell ({@link GridDataLayer#resolution})
+ * @returns {number} texel coordinate
+ */
+export function grid_to_texel(v: number, resolution: number): number;
+//# sourceMappingURL=grid_to_texel.d.ts.map

package/src/generation/grid/coords/grid_to_texel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grid_to_texel.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/coords/grid_to_texel.js"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,iCAJW,MAAM,cACN,MAAM,GACJ,MAAM,CAIlB"}

package/src/generation/grid/coords/grid_to_texel.js

@@ -0,0 +1,10 @@
+/**
+ * Canonical grid → layer-texel mapping (see generation/COORDINATES.md).
+ * Integer grid coordinates are cell centers, integer texel coordinates are texel centers.
+ * @param {number} v grid coordinate
+ * @param {number} resolution texels per grid cell ({@link GridDataLayer#resolution})
+ * @returns {number} texel coordinate
+ */
+export function grid_to_texel(v, resolution) {
+    return v * resolution;
+}

package/src/generation/grid/coords/texel_to_grid.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Canonical layer-texel → grid mapping (see generation/COORDINATES.md).
+ * Inverse of {@link grid_to_texel}.
+ * @param {number} v texel coordinate
+ * @param {number} resolution texels per grid cell ({@link GridDataLayer#resolution})
+ * @returns {number} grid coordinate
+ */
+export function texel_to_grid(v: number, resolution: number): number;
+//# sourceMappingURL=texel_to_grid.d.ts.map

package/src/generation/grid/coords/texel_to_grid.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"texel_to_grid.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/coords/texel_to_grid.js"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,iCAJW,MAAM,cACN,MAAM,GACJ,MAAM,CAIlB"}

package/src/generation/grid/coords/texel_to_grid.js

@@ -0,0 +1,10 @@
+/**
+ * Canonical layer-texel → grid mapping (see generation/COORDINATES.md).
+ * Inverse of {@link grid_to_texel}.
+ * @param {number} v texel coordinate
+ * @param {number} resolution texels per grid cell ({@link GridDataLayer#resolution})
+ * @returns {number} grid coordinate
+ */
+export function texel_to_grid(v, resolution) {
+    return v / resolution;
+}

package/src/generation/grid/generation/GridTaskApplyActionToCells.d.ts

@@ -4,7 +4,7 @@ export class GridTaskApplyActionToCells extends GridTaskGenerator {
      * @returns {GridTaskApplyActionToCells}
      * @param {CellSupplier} selector
      * @param {GridCellAction} action
-     * @param {string} name
+     * @param {string} [name]
      */
     static from({ selector, action, name }: CellSupplier): GridTaskApplyActionToCells;
     /**
@@ -16,7 +16,7 @@ export class GridTaskApplyActionToCells extends GridTaskGenerator {
      *
      * @type {CellSupplier|null}
      */
-    fitness: CellSupplier | null;
+    supplier: CellSupplier | null;
     build(grid: any, ecd: any, seed: any): TaskGroup;
 }
 import { GridTaskGenerator } from "../GridTaskGenerator.js";

package/src/generation/grid/generation/GridTaskApplyActionToCells.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridTaskApplyActionToCells.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/generation/GridTaskApplyActionToCells.js"],"names":[],"mappings":"AAOA;IAcI;;;;;;OAMG;IACH,uDALa,0BAA0B,CAetC;IA7BD;;;OAGG;IACH,QAFU,iBAAe,IAAI,CAEf;IAEd;;;OAGG;IACH,SAFU,eAAa,IAAI,CAEZ;IAqBf,iDAwCC;CACJ;kCA5EiC,yBAAyB;sBAHrC,yCAAyC"}
+{"version":3,"file":"GridTaskApplyActionToCells.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/generation/GridTaskApplyActionToCells.js"],"names":[],"mappings":"AAOA;IAcI;;;;;;OAMG;IACH,uDALa,0BAA0B,CAmBtC;IAjCD;;;OAGG;IACH,QAFU,iBAAe,IAAI,CAEf;IAEd;;;OAGG;IACH,UAFU,eAAa,IAAI,CAEX;IAyBhB,iDAwCC;CACJ;kCAhFiC,yBAAyB;sBAHrC,yCAAyC"}

package/src/generation/grid/generation/GridTaskApplyActionToCells.js

@@ -17,14 +17,14 @@ export class GridTaskApplyActionToCells extends GridTaskGenerator {
      *
      * @type {CellSupplier|null}
      */
-    fitness = null;
+    supplier = null;
 
     /**
      *
      * @returns {GridTaskApplyActionToCells}
      * @param {CellSupplier} selector
      * @param {GridCellAction} action
-     * @param {string} name
+     * @param {string} [name]
      */
     static from({ selector, action, name }) {
         assert.equal(selector.isCellSupplier, true, 'selector.isCellSupplier !== true');
@@ -33,14 +33,18 @@ export class GridTaskApplyActionToCells extends GridTaskGenerator {
         const r = new GridTaskApplyActionToCells();
 
         r.action = action;
-        r.fitness = selector;
+        r.supplier = selector;
+
+        if (name !== undefined) {
+            r.name = name;
+        }
 
         return r;
     }
 
     build(grid, ecd, seed) {
         const tInitialize = actionTask(() => {
-            this.fitness.initialize(grid, seed);
+            this.supplier.initialize(grid, seed);
             this.action.initialize(grid, seed);
         });
 
@@ -49,7 +53,7 @@ export class GridTaskApplyActionToCells extends GridTaskGenerator {
         const tMain = new Task({
             name: `Apply action to cells`,
             computeProgress: () => {
-                const c = this.fitness.count();
+                const c = this.supplier.count();
 
                 if (c <= 0) {
                     return 0;
@@ -58,7 +62,7 @@ export class GridTaskApplyActionToCells extends GridTaskGenerator {
                 return cursor / c;
             },
             cycleFunction: () => {
-                const cell_data = this.fitness.next();
+                const cell_data = this.supplier.next();
 
                 if (cell_data === undefined) {
                     return TaskSignal.EndSuccess;

package/src/generation/grid/generation/GridTaskDensityMarkerDistribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridTaskDensityMarkerDistribution.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/generation/GridTaskDensityMarkerDistribution.js"],"names":[],"mappings":"AAgBA;IA4BI;;;;;;OAMG;IACH,2EAHW,eAAe,SACf,MAAM,qCAgBhB;IA/CD;;;OAGG;IACH,oBAAe;IAEf;;;OAGG;IACH,kCAAc;IAEd;;;OAGG;IACH,OAFU,eAAe,CAES;IAElC;;;;OAIG;IACH,eAAW;IA2BX;;;;;;;;OAQG;IACH,qCANW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,MAAM,CAwFlB;IAED;;;;;;;;;OASG;IACH,kBARW,MAAM,sBAEN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,IAAI,CAkIhB;IAGD,iDA6EC;CACJ;kCAlXiC,yBAAyB;gCAT3B,gDAAgD;iBAI/D,oCAAoC;sBAC/B,yCAAyC"}
+{"version":3,"file":"GridTaskDensityMarkerDistribution.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/generation/GridTaskDensityMarkerDistribution.js"],"names":[],"mappings":"AAgBA;IA4BI;;;;;;OAMG;IACH,2EAHW,eAAe,SACf,MAAM,qCAgBhB;IA/CD;;;OAGG;IACH,oBAAe;IAEf;;;OAGG;IACH,kCAAc;IAEd;;;OAGG;IACH,OAFU,eAAe,CAES;IAElC;;;;OAIG;IACH,eAAW;IA2BX;;;;;;;;OAQG;IACH,qCANW,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,MAAM,CAqFlB;IAED;;;;;;;;;OASG;IACH,kBARW,MAAM,sBAEN,MAAM,MACN,MAAM,MACN,MAAM,MACN,MAAM,GACJ,IAAI,CAsIhB;IAGD,iDA2EC;CACJ;kCAjXiC,yBAAyB;gCAT3B,gDAAgD;iBAI/D,oCAAoC;sBAC/B,yCAAyC"}

package/src/generation/grid/generation/GridTaskDensityMarkerDistribution.js

@@ -124,17 +124,14 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
                 continue;
             }
 
-            const node = this.action.buildNode(grid, x, y, 0);
+            // estimate the marker size directly; building nodes here would run the action's
+            // transformers, which may be stateful (e.g. consume from a finite value pool)
+            const node_size = this.action.size * this.scale.sampleRandom(random);
 
-            const markerScale = this.scale.sampleRandom(random);
+            samplesSize.push(node_size);
 
-            //modify size and scale
-            node.size *= markerScale;
-
-            samplesSize.push(node.size);
 
-
-            const overlap = grid.containsMarkerInCircle(x, y, node.size, MarkerNodeMatcherAny.INSTANCE);
+            const overlap = grid.containsMarkerInCircle(x, y, node_size, MarkerNodeMatcherAny.INSTANCE);
 
             if (overlap) {
                 //collision
@@ -244,19 +241,11 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
                 return TaskSignal.Continue;
             }
 
-            const node = action.buildNode(grid, _x, _y, 0);
-
-            // remember the filter value for debug purposes
-            node.properties['@filter_density'] = densityValue;
-
             const markerScale = scale.sampleRandom(random);
 
-            //modify size and scale
-            node.size *= markerScale;
-
-            node.transform.scale.multiplyScalar(markerScale);
+            const node_size = action.size * markerScale;
 
-            const overlap = grid.containsMarkerInCircle(_x, _y, node.size, MarkerNodeMatcherAny.INSTANCE);
+            const overlap = grid.containsMarkerInCircle(_x, _y, node_size, MarkerNodeMatcherAny.INSTANCE);
 
             if (overlap) {
                 rejectedSampleBudget--;
@@ -271,6 +260,18 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
 
             }
 
+            // build the node only once the placement is committed; transformers may be
+            // stateful and must not run for rejected attempts
+            const node = action.buildNode(grid, _x, _y, 0);
+
+            // remember the filter value for debug purposes
+            node.properties['@filter_density'] = densityValue;
+
+            //modify size and scale
+            node.size *= markerScale;
+
+            node.transform.scale.multiplyScalar(markerScale);
+
             grid.addMarker(node);
 
             return TaskSignal.Continue;
@@ -316,9 +317,7 @@ export class GridTaskDensityMarkerDistribution extends GridTaskGenerator {
         //we want to estimate average size of a marker
         const tInitialize = actionTask(() => {
 
-            if (!this.density.initialized) {
-                this.density.initialize(grid, seed);
-            }
+            this.density.ensureInitialized(grid, seed);
 
             this.action.initialize(grid, seed);
         });

package/src/generation/grid/generation/GridTaskExecuteRuleTimes.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Executes a placement rule a fixed number of times at random matching cells.
+ *
+ * Each cell is attempted at most once per build — cells whose pattern could become
+ * true later (as the grid mutates) are not retried. If every cell has been attempted
+ * before the rule completed the requested number of times, the task ends in failure.
+ */
 export class GridTaskExecuteRuleTimes extends GridTaskGenerator {
     /**
      *

package/src/generation/grid/generation/GridTaskExecuteRuleTimes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridTaskExecuteRuleTimes.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/generation/GridTaskExecuteRuleTimes.js"],"names":[],"mappings":"AAUA;IAUI;;;;OAIG;IACH,iDAFW,MAAM,4BAShB;IApBD;;;OAGG;IACH,4BAAY;IAEZ,cAAU;IAgBV,iDA+EC;CACJ;kCA1GiC,yBAAyB;sBAHrC,yCAAyC"}
+{"version":3,"file":"GridTaskExecuteRuleTimes.d.ts","sourceRoot":"","sources":["../../../../../src/generation/grid/generation/GridTaskExecuteRuleTimes.js"],"names":[],"mappings":"AAUA;;;;;;GAMG;AACH;IAUI;;;;OAIG;IACH,iDAFW,MAAM,4BAShB;IApBD;;;OAGG;IACH,4BAAY;IAEZ,cAAU;IAgBV,iDAgFC;CACJ;kCAlHiC,yBAAyB;sBAHrC,yCAAyC"}

package/src/generation/grid/generation/GridTaskExecuteRuleTimes.js

@@ -8,6 +8,13 @@ import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
 import { actionTask } from "../../../core/process/task/util/actionTask.js";
 import { GridTaskGenerator } from "../GridTaskGenerator.js";
 
+/**
+ * Executes a placement rule a fixed number of times at random matching cells.
+ *
+ * Each cell is attempted at most once per build — cells whose pattern could become
+ * true later (as the grid mutates) are not retried. If every cell has been attempted
+ * before the rule completed the requested number of times, the task ends in failure.
+ */
 export class GridTaskExecuteRuleTimes extends GridTaskGenerator {
 
     /**
@@ -47,11 +54,13 @@ export class GridTaskExecuteRuleTimes extends GridTaskGenerator {
         const endIndex = gridSize - 1;
 
         /**
-         *
+         * Cells that have been attempted, successfully or not
          * @type {BitSet}
          */
         const closed = new BitSet();
 
+        let closedCount = 0;
+
         const random = seededRandom(seed);
 
         const tInitialize = actionTask(() => {
@@ -65,21 +74,20 @@ export class GridTaskExecuteRuleTimes extends GridTaskGenerator {
                     return TaskSignal.EndSuccess;
                 }
 
-                let index = randomIntegerBetween(random, 0, endIndex);
+                if (closedCount >= gridSize) {
+                    //we tried every cell, ran out of cells before reaching the requested count
+                    return TaskSignal.EndFailure;
+                }
 
-                let i = 0;
+                let index = randomIntegerBetween(random, 0, endIndex);
 
                 while (closed.get(index)) {
                     index = (index + 1) % gridSize;
-
-                    i++;
-
-                    if (i >= endIndex) {
-                        //we tried every cell, everything is taken
-                        return TaskSignal.EndFailure;
-                    }
                 }
 
+                closed.set(index, true);
+                closedCount++;
+
                 const y = (index / width) | 0;
                 const x = index % width;
 

package/src/generation/grid/generation/discrete/GridTaskCellularAutomata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridTaskCellularAutomata.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/grid/generation/discrete/GridTaskCellularAutomata.js"],"names":[],"mappings":"AASA;IA0BI;;;;;;OAMG;IACH;;;;;iCAyBC;IAvDD,mBAAe;IACf,oBAAgB;IAChB,kBAAc;IACd,qBAAiB;IAEjB;;;OAGG;IACH,OAFU,MAAM,CAEL;IAEX;;;OAGG;IACH,WAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,uBAAc;IAoCd,iDA8DC;CACJ;kCA7HiC,4BAA4B;sBALxC,4CAA4C"}
+{"version":3,"file":"GridTaskCellularAutomata.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/grid/generation/discrete/GridTaskCellularAutomata.js"],"names":[],"mappings":"AAQA;IA0BI;;;;;;OAMG;IACH;;;;;iCAyBC;IAvDD,mBAAe;IACf,oBAAgB;IAChB,kBAAc;IACd,qBAAiB;IAEjB;;;OAGG;IACH,OAFU,MAAM,CAEL;IAEX;;;OAGG;IACH,WAFU,MAAM,CAEC;IAEjB;;;OAGG;IACH,uBAAc;IAoCd,iDAwEC;CACJ;kCAvIiC,4BAA4B;sBAJxC,4CAA4C"}