@woosh/meep-engine 2.156.0 → 2.157.0

package/src/generation/markers/transform/MarkerNodeTransformerYRotateByFilterGradient.js

@@ -28,9 +28,7 @@ export class MarkerNodeTransformerYRotateByFilterGradient extends MarkerNodeTran
     offset = 0;
 
     initialize(grid, seed) {
-        if (!this.filter.initialized) {
-            this.filter.initialize(grid, seed);
-        }
+        this.filter.ensureInitialized(grid, seed);
     }
 
     /**

package/src/generation/placement/GridCellPlacementRule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridCellPlacementRule.d.ts","sourceRoot":"","sources":["../../../../src/generation/placement/GridCellPlacementRule.js"],"names":[],"mappings":"AAKA;IAgCI;;;;;;;;;OASG;IACH,4FAFa,qBAAqB,CAkCjC;IAzED;;;OAGG;IACH,qBAAe;IAEf;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,gBAFU,OAAO,CAEc;IAG/B;;;OAGG;IACH,uBAAc;IAEd;;;OAGG;IACH,eAFU,OAAO,CAEI;IA8CrB;;;;OAIG;IACH,iCAFW,MAAM,QAWhB;IAED;;;;;;OAMG;IACH,2BAJW,MAAM,KACN,MAAM,YACN,MAAM,QAgBhB;CACJ;oBAtHmB,4BAA4B"}
+{"version":3,"file":"GridCellPlacementRule.d.ts","sourceRoot":"","sources":["../../../../src/generation/placement/GridCellPlacementRule.js"],"names":[],"mappings":"AAKA;IAgCI;;;;;;;;;OASG;IACH,4FAFa,qBAAqB,CAkCjC;IAzED;;;OAGG;IACH,qBAAe;IAEf;;;OAGG;IACH,wBAA6C;IAE7C;;;OAGG;IACH,gBAFU,OAAO,CAEc;IAG/B;;;OAGG;IACH,uBAAc;IAEd;;;OAGG;IACH,eAFU,OAAO,CAEI;IA8CrB;;;;OAIG;IACH,iCAFW,MAAM,QAShB;IAED;;;;;;OAMG;IACH,2BAJW,MAAM,KACN,MAAM,YACN,MAAM,QAgBhB;CACJ;oBApHmB,4BAA4B"}

package/src/generation/placement/GridCellPlacementRule.js

@@ -90,9 +90,7 @@ export class GridCellPlacementRule {
 
         this.pattern.initialize(grid, seed);
 
-        if (!this.probability.initialized) {
-            this.probability.initialize(grid, seed);
-        }
+        this.probability.ensureInitialized(grid, seed);
     }
 
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"GridCellActionWriteFilterToLayer.d.ts","sourceRoot":"","sources":["../../../../../src/generation/placement/action/GridCellActionWriteFilterToLayer.js"],"names":[],"mappings":"AAGA;IAqBI;;;;OAIG;IACH,mBAHW,MAAM,wDAahB;IAlCD;;;OAGG;IACH,mBAAc;IAEd;;;OAGG;IACH,SAFU,MAAM,CAED;IAEf;;;;OAIG;IACH,gBAAe;IAmBf,uCAaC;IAED,wDA6BC;CACJ;+BArF8B,qBAAqB"}
+{"version":3,"file":"GridCellActionWriteFilterToLayer.d.ts","sourceRoot":"","sources":["../../../../../src/generation/placement/action/GridCellActionWriteFilterToLayer.js"],"names":[],"mappings":"AAIA;IAqBI;;;;OAIG;IACH,mBAHW,MAAM,wDAahB;IAlCD;;;OAGG;IACH,mBAAc;IAEd;;;OAGG;IACH,SAFU,MAAM,CAED;IAEf;;;;OAIG;IACH,gBAAe;IAmBf,uCAaC;IAED,wDA0BC;CACJ;+BAlF8B,qBAAqB"}

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

@@ -1,4 +1,5 @@
 import { assert } from "../../../core/assert.js";
+import { grid_to_texel } from "../../grid/coords/grid_to_texel.js";
 import { GridCellAction } from "./GridCellAction.js";
 
 export class GridCellActionWriteFilterToLayer extends GridCellAction {
@@ -58,10 +59,6 @@ export class GridCellActionWriteFilterToLayer extends GridCellAction {
 
         const value = this.filter.execute(data, x, y, rotation);
 
-        // convert coordinates to UV
-        const u = x / (data.width - 1);
-        const v = y / (data.height - 1);
-
         /**
          *
          * @type {GridDataLayer}
@@ -74,14 +71,15 @@ export class GridCellActionWriteFilterToLayer extends GridCellAction {
          */
         const sampler = layer.sampler;
 
-        const _x = u * (sampler.width - 1)
-        const _y = v * (sampler.height - 1);
+        // round the coordinates to the nearest texel
+        const iX = Math.round(grid_to_texel(x, layer.resolution));
+        const iY = Math.round(grid_to_texel(y, layer.resolution));
 
-        // round the coordinates to nearest integer
-        const iX = Math.round(_x);
-        const iY = Math.round(_y);
+        if (iX < 0 || iX >= sampler.width || iY < 0 || iY >= sampler.height) {
+            // out of bounds, write is discarded
+            return;
+        }
 
-        // write
         sampler.writeChannel(iX, iY, 0, value);
     }
 }

package/src/generation/placement/action/random/weighted/CellActionSelectWeightedRandom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CellActionSelectWeightedRandom.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/placement/action/random/weighted/CellActionSelectWeightedRandom.js"],"names":[],"mappings":"AAYA;IAgBI;;;;OAIG;IACH,qBAHW,wBAAwB,GACtB,8BAA8B,CAS1C;IA1BD;;;;OAIG;IACH,iBAA2B;IAE3B;;;OAGG;IACH,SAFU,wBAAwB,CAErB;IAiBb;;;OAGG;IACH,wBAFW,wBAAwB,QASlC;IAED;;;OAGG;IACH,gDAIC;IAED,uCAWC;IAED,wDAwCC;CACJ;+BAtH8B,yBAAyB"}
+{"version":3,"file":"CellActionSelectWeightedRandom.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/placement/action/random/weighted/CellActionSelectWeightedRandom.js"],"names":[],"mappings":"AAWA;IAgBI;;;;OAIG;IACH,qBAHW,wBAAwB,GACtB,8BAA8B,CAS1C;IA1BD;;;;OAIG;IACH,iBAA2B;IAE3B;;;OAGG;IACH,SAFU,wBAAwB,CAErB;IAiBb;;;OAGG;IACH,wBAFW,wBAAwB,QASlC;IAED;;;OAGG;IACH,gDAIC;IAED,uCAWC;IAED,wDA2CC;CACJ;+BAvH8B,yBAAyB"}

package/src/generation/placement/action/random/weighted/CellActionSelectWeightedRandom.js

@@ -1,8 +1,7 @@
 import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
+import { random_pick_weighted_index } from "../../../../../core/math/random/random_pick_weighted_index.js";
 import { GridCellAction } from "../../GridCellAction.js";
 import { assert } from "../../../../../core/assert.js";
-import { binarySearchHighIndex } from "../../../../../core/collection/array/binarySearchHighIndex.js";
-import { number_compare_ascending } from "../../../../../core/primitives/numbers/number_compare_ascending.js";
 
 /**
  *
@@ -109,9 +108,12 @@ export class CellActionSelectWeightedRandom extends GridCellAction {
 
         }
 
-        const targetWeight = this.__random() * totalWeight;
+        const index = random_pick_weighted_index(this.__random, evaluatedWeights, n);
 
-        const index = binarySearchHighIndex(evaluatedWeights, targetWeight, number_compare_ascending, 0, n - 1);
+        if (index === -1) {
+            // every option has zero weight at this position, nothing to select
+            return;
+        }
 
         const targetElement = elements[index];
 

package/src/generation/placement/action/random/weighted/WeightedGridCellAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WeightedGridCellAction.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/placement/action/random/weighted/WeightedGridCellAction.js"],"names":[],"mappings":"AAEA;IAcI;;;;OAIG;IACH,gFAUC;IA3BD;;;OAGG;IACH,uBAAc;IAEd;;;OAGG;IACH,mBAAc;IAmBd;;;OAGG;IACH,iCAFW,MAAM,QAQhB;IAGL;;;OAGG;IACH,mCAFU,OAAO,CAEwC;CANxD"}
+{"version":3,"file":"WeightedGridCellAction.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/placement/action/random/weighted/WeightedGridCellAction.js"],"names":[],"mappings":"AAEA;IAcI;;;;OAIG;IACH,gFAUC;IA3BD;;;OAGG;IACH,uBAAc;IAEd;;;OAGG;IACH,mBAAc;IAmBd;;;OAGG;IACH,iCAFW,MAAM,QAMhB;IAGL;;;OAGG;IACH,mCAFU,OAAO,CAEwC;CANxD"}

package/src/generation/placement/action/random/weighted/WeightedGridCellAction.js

@@ -38,9 +38,7 @@ export class WeightedGridCellAction {
     initialize(grid, seed) {
         this.action.initialize(grid, seed);
 
-        if (!this.weight.initialized) {
-            this.weight.initialize(grid, seed);
-        }
+        this.weight.ensureInitialized(grid, seed);
     }
 }
 

package/src/generation/rules/CellMatcher.d.ts

@@ -1,6 +1,8 @@
 export class CellMatcher {
     /**
-     *
+     * Matchers are initialized unconditionally by every consumer (there is no initialized
+     * flag) — implementations MUST be idempotent. Matchers wrapping a {@link CellFilter}
+     * initialize it through {@link CellFilter#ensureInitialized}.
      * @param {GridData} grid
      * @param {number} seed
      */

package/src/generation/rules/CellMatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CellMatcher.d.ts","sourceRoot":"","sources":["../../../../src/generation/rules/CellMatcher.js"],"names":[],"mappings":"AAAA;IAEI;;;;OAIG;IACH,iCAFW,MAAM,QAIhB;IAED;;;;;;;OAOG;IACH,yBAJW,MAAM,KACN,MAAM,YACN,MAAM,GAJJ,OAAO,CAQnB;IAGL;;;OAGG;IACH,wBAFU,OAAO,CAEkB;CANlC"}
+{"version":3,"file":"CellMatcher.d.ts","sourceRoot":"","sources":["../../../../src/generation/rules/CellMatcher.js"],"names":[],"mappings":"AAAA;IAEI;;;;;;OAMG;IACH,iCAFW,MAAM,QAIhB;IAED;;;;;;;OAOG;IACH,yBAJW,MAAM,KACN,MAAM,YACN,MAAM,GAJJ,OAAO,CAQnB;IAGL;;;OAGG;IACH,wBAFU,OAAO,CAEkB;CANlC"}

package/src/generation/rules/CellMatcher.js

@@ -1,7 +1,9 @@
 export class CellMatcher {
 
     /**
-     *
+     * Matchers are initialized unconditionally by every consumer (there is no initialized
+     * flag) — implementations MUST be idempotent. Matchers wrapping a {@link CellFilter}
+     * initialize it through {@link CellFilter#ensureInitialized}.
      * @param {GridData} grid
      * @param {number} seed
      */

package/src/generation/rules/CellMatcherFromFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CellMatcherFromFilter.d.ts","sourceRoot":"","sources":["../../../../src/generation/rules/CellMatcherFromFilter.js"],"names":[],"mappings":"AAEA;IAQI;;;;OAIG;IACH,4BAFa,qBAAqB,CAQjC;IAjBD;;;OAGG;IACH,QAFU,aAAW,IAAI,CAEX;IAed,uCAIC;IAED,yDAIC;CACJ;4BAlC2B,kBAAkB"}
+{"version":3,"file":"CellMatcherFromFilter.d.ts","sourceRoot":"","sources":["../../../../src/generation/rules/CellMatcherFromFilter.js"],"names":[],"mappings":"AAEA;IAQI;;;;OAIG;IACH,4BAFa,qBAAqB,CAQjC;IAjBD;;;OAGG;IACH,QAFU,aAAW,IAAI,CAEX;IAed,uCAEC;IAED,yDAIC;CACJ;4BAhC2B,kBAAkB"}

package/src/generation/rules/CellMatcherFromFilter.js

@@ -22,9 +22,7 @@ export class CellMatcherFromFilter extends CellMatcher {
     }
 
     initialize(grid, seed) {
-        if (!this.filter.initialized) {
-            this.filter.initialize(grid, seed);
-        }
+        this.filter.ensureInitialized(grid, seed);
     }
 
     match(grid, x, y, rotation) {

package/src/generation/rules/CellMatcherLayerBitMaskTest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CellMatcherLayerBitMaskTest.d.ts","sourceRoot":"","sources":["../../../../src/generation/rules/CellMatcherLayerBitMaskTest.js"],"names":[],"mappings":"AAIA;IA0CI;;;;;OAKG;IACH,kBAJW,MAAM,SACN,MAAM,GACL,2BAA2B,CAYtC;IAxDD;;;OAGG;IACH,MAFU,MAAM,CAEP;IAGT,yDA+BC;CAmBJ;qCA7DoC,2BAA2B"}
+{"version":3,"file":"CellMatcherLayerBitMaskTest.d.ts","sourceRoot":"","sources":["../../../../src/generation/rules/CellMatcherLayerBitMaskTest.js"],"names":[],"mappings":"AAIA;IA4BI;;;;;OAKG;IACH,kBAJW,MAAM,SACN,MAAM,GACL,2BAA2B,CAYtC;IA1CD;;;OAGG;IACH,MAFU,MAAM,CAEP;IAGT,yDAiBC;CAmBJ;qCA/CoC,2BAA2B"}

package/src/generation/rules/CellMatcherLayerBitMaskTest.js

@@ -1,5 +1,5 @@
 import { assert } from "../../core/assert.js";
-import { clamp01 } from "../../core/math/clamp01.js";
+import { grid_to_texel } from "../grid/coords/grid_to_texel.js";
 import { GridLayerCellMatcher } from "./GridLayerCellMatcher.js";
 
 export class CellMatcherLayerBitMaskTest extends GridLayerCellMatcher {
@@ -17,28 +17,14 @@ export class CellMatcherLayerBitMaskTest extends GridLayerCellMatcher {
         const layer = this.__layer;
         const sampler = layer.sampler;
 
-        //convert to uv
-        const x_max = grid.width - 1;
-        const y_max = grid.height - 1;
+        const _x = Math.round(grid_to_texel(x, layer.resolution));
+        const _y = Math.round(grid_to_texel(y, layer.resolution));
 
-        let u;
-        let v;
-
-        if (x_max === 0) {
-            u = 0;
-        } else {
-            u = clamp01(x / x_max);
-        }
-
-        if (y_max === 0) {
-            v = 0;
-        } else {
-            v = clamp01(y / y_max);
+        if (_x < 0 || _x >= sampler.width || _y < 0 || _y >= sampler.height) {
+            // out of bounds matches nothing; probing off-map must not match border cells
+            return false;
         }
 
-        const _x = Math.round(u * (sampler.width - 1));
-        const _y = Math.round(v * (sampler.height - 1));
-
         const tags = sampler.readChannel(_x, _y, 0);
 
         return (tags & this.mask) === this.mask;

package/src/generation/test_support/executeTaskTreeSync.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Test helper. Execute a {@link Task}/{@link TaskGroup} tree synchronously, respecting dependencies.
+ * Stops at the first failing task.
+ * @param {Task|TaskGroup} root
+ * @returns {TaskSignal} EndSuccess if every task completed, EndFailure as soon as one task fails
+ */
+export function executeTaskTreeSync(root: Task | TaskGroup): TaskSignal;
+import { TaskSignal } from "../../core/process/task/TaskSignal.js";
+//# sourceMappingURL=executeTaskTreeSync.d.ts.map

package/src/generation/test_support/executeTaskTreeSync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"executeTaskTreeSync.d.ts","sourceRoot":"","sources":["../../../../src/generation/test_support/executeTaskTreeSync.js"],"names":[],"mappings":"AAoBA;;;;;GAKG;AACH,0CAHW,gBAAc,GACZ,UAAU,CAqDtB;2BA7E0B,uCAAuC"}

package/src/generation/test_support/executeTaskTreeSync.js

@@ -0,0 +1,78 @@
+import { TaskSignal } from "../../core/process/task/TaskSignal.js";
+
+/**
+ * Collect leaf {@link Task}s of a task tree
+ * @param {Task|TaskGroup} node
+ * @param {Task[]} result
+ */
+function collectTasks(node, result) {
+    if (node.isTaskGroup) {
+        const children = node.children;
+        const n = children.length;
+
+        for (let i = 0; i < n; i++) {
+            collectTasks(children[i], result);
+        }
+    } else if (result.indexOf(node) === -1) {
+        result.push(node);
+    }
+}
+
+/**
+ * Test helper. Execute a {@link Task}/{@link TaskGroup} tree synchronously, respecting dependencies.
+ * Stops at the first failing task.
+ * @param {Task|TaskGroup} root
+ * @returns {TaskSignal} EndSuccess if every task completed, EndFailure as soon as one task fails
+ */
+export function executeTaskTreeSync(root) {
+    /**
+     * @type {Task[]}
+     */
+    const tasks = [];
+
+    collectTasks(root, tasks);
+
+    // dependencies may reference tasks outside the supplied tree, include them
+    for (let i = 0; i < tasks.length; i++) {
+        const dependencies = tasks[i].dependencies;
+
+        for (let j = 0; j < dependencies.length; j++) {
+            const dependency = dependencies[j];
+
+            if (tasks.indexOf(dependency) === -1) {
+                tasks.push(dependency);
+            }
+        }
+    }
+
+    const done = new Set();
+
+    while (done.size < tasks.length) {
+        let progressed = false;
+
+        for (const task of tasks) {
+            if (done.has(task)) {
+                continue;
+            }
+
+            if (!task.dependencies.every(d => done.has(d))) {
+                continue;
+            }
+
+            const signal = task.executeSync();
+
+            done.add(task);
+            progressed = true;
+
+            if (signal === TaskSignal.EndFailure) {
+                return signal;
+            }
+        }
+
+        if (!progressed) {
+            throw new Error('Task dependencies are unsatisfiable (cycle or missing task)');
+        }
+    }
+
+    return TaskSignal.EndSuccess;
+}

package/src/generation/theme/TerrainLayerRuleAggregator.d.ts

@@ -17,7 +17,8 @@ export class TerrainLayerRuleAggregator {
      */
     add(layer: number, power: number): void;
     /**
-     *
+     * Scales the weights so they sum to `m` (the terrain shader divides by the weight
+     * sum when blending, so splat weights are conventionally L1-normalized)
      * @param {number} m What should the weights add up to?
      */
     normalize(m?: number): void;

package/src/generation/theme/TerrainLayerRuleAggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TerrainLayerRuleAggregator.d.ts","sourceRoot":"","sources":["../../../../src/generation/theme/TerrainLayerRuleAggregator.js"],"names":[],"mappings":"AAEA;IACI;;;OAGG;IACH,wBAFW,MAAM,EAYhB;IANG;;;OAGG;IACH,YAFU,MAAM,CAEY;IAC5B,qBAA0C;IAG9C;;;;OAIG;IACH,WAHW,MAAM,SACN,MAAM,QAIhB;IAED;;;OAGG;IACH,cAFW,MAAM,QAwBhB;IAED,cAEC;CACJ"}
+{"version":3,"file":"TerrainLayerRuleAggregator.d.ts","sourceRoot":"","sources":["../../../../src/generation/theme/TerrainLayerRuleAggregator.js"],"names":[],"mappings":"AAEA;IACI;;;OAGG;IACH,wBAFW,MAAM,EAYhB;IANG;;;OAGG;IACH,YAFU,MAAM,CAEY;IAC5B,qBAA0C;IAG9C;;;;OAIG;IACH,WAHW,MAAM,SACN,MAAM,QAIhB;IAED;;;;OAIG;IACH,cAFW,MAAM,QA0BhB;IAED,cAEC;CACJ"}

package/src/generation/theme/TerrainLayerRuleAggregator.js

@@ -27,24 +27,27 @@ export class TerrainLayerRuleAggregator {
     }
 
     /**
-     *
+     * Scales the weights so they sum to `m` (the terrain shader divides by the weight
+     * sum when blending, so splat weights are conventionally L1-normalized)
      * @param {number} m What should the weights add up to?
      */
     normalize(m = 1) {
-        let magnitude = 0;
+        let sum = 0;
 
         const layerCount = this.layerCount;
 
         const powers = this.powers;
 
         for (let i = 0; i < layerCount; i++) {
-            const power = powers[i];
-            magnitude += power * power;
+            sum += powers[i];
         }
 
-        const d = Math.sqrt(magnitude);
+        if (sum === 0) {
+            // no contributions, leave the weights at zero
+            return;
+        }
 
-        const multiplier = m / d;
+        const multiplier = m / sum;
 
         for (let i = 0; i < layerCount; i++) {
             const power = powers[i];

package/src/generation/theme/Theme.d.ts

@@ -20,7 +20,7 @@ export class Theme {
      * @param {EntityComponentDataset} ecd
      * @param {GridData} grid
      */
-    initialize(seed: number, ecd: EntityComponentDataset, grid: GridData): void;
+    initialize(grid: GridData, ecd: EntityComponentDataset, seed: number): void;
 }
 import { TerrainTheme } from "./TerrainTheme.js";
 import { MarkerNodeProcessingRuleSet } from "../markers/actions/MarkerNodeProcessingRuleSet.js";

package/src/generation/theme/Theme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Theme.d.ts","sourceRoot":"","sources":["../../../../src/generation/theme/Theme.js"],"names":[],"mappings":"AAKA;IAEI;;;OAGG;IACH,SAFU,YAAY,CAEO;IAE7B;;;OAGG;IACH,OAFU,2BAA2B,CAEK;IAE1C;;;OAGG;IACH,OAFU,qBAAqB,CAEK;IAEpC;;;;;OAKG;IACH,iBAJW,MAAM,qDAchB;CACJ;6BA1C4B,mBAAmB;4CACJ,mDAAmD;sCACzD,iCAAiC"}
+{"version":3,"file":"Theme.d.ts","sourceRoot":"","sources":["../../../../src/generation/theme/Theme.js"],"names":[],"mappings":"AAKA;IAEI;;;OAGG;IACH,SAFU,YAAY,CAEO;IAE7B;;;OAGG;IACH,OAFU,2BAA2B,CAEK;IAE1C;;;OAGG;IACH,OAFU,qBAAqB,CAEK;IAEpC;;;;;OAKG;IACH,8DAJW,MAAM,QAchB;CACJ;6BA1C4B,mBAAmB;4CACJ,mDAAmD;sCACzD,iCAAiC"}

package/src/generation/theme/Theme.js

@@ -29,7 +29,7 @@ export class Theme {
      * @param {EntityComponentDataset} ecd
      * @param {GridData} grid
      */
-    initialize(seed, ecd, grid) {
+    initialize(grid, ecd, seed) {
         assert.defined(ecd, 'ecd');
         assert.notNull(ecd, 'ecd');
         assert.equal(ecd.isEntityComponentDataset, true, 'ecd.isEntityComponentDataset !== true');
@@ -38,6 +38,6 @@ export class Theme {
 
         this.terrain.initialize(grid, seed);
         this.nodes.initialize(grid, ecd, seed);
-        this.cells.initialize(seed, ecd, grid);
+        this.cells.initialize(grid, ecd, seed);
     }
 }

package/src/generation/theme/ThemeEngine.d.ts

@@ -41,12 +41,12 @@ export class ThemeEngine {
     getThemesByPosition(result: AreaTheme[], x: number, y: number): number;
     /**
      *
-     * @param {number} seed
-     * @param {EntityComponentDataset} ecd
      * @param {GridData} grid
+     * @param {EntityComponentDataset} ecd
+     * @param {number} seed
      * @returns {Task}
      */
-    initializeThemes(seed: number, ecd: EntityComponentDataset, grid: GridData): Task;
+    initializeThemes(grid: GridData, ecd: EntityComponentDataset, seed: number): Task;
     /**
      *
      * @param {GridData} grid

package/src/generation/theme/ThemeEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ThemeEngine.d.ts","sourceRoot":"","sources":["../../../../src/generation/theme/ThemeEngine.js"],"names":[],"mappings":"AAoFA;IAEI;;;OAGG;IACH,OAFU,uBAAuB,CAEN;IAE3B;;;OAGG;IACH,uBAFqB,MAAM,CAEF;IAEzB;;;;OAIG;IACH,uBAAsB;IAEtB,2BAEC;IAED;;;OAGG;IACH,sBAEC;IAED;;;OAGG;IACH,mBAEC;IAED;;;OAGG;IACH,4BAUC;IAED;;;;;;OAMG;IACH,4BALW,WAAW,KACX,MAAM,KACN,MAAM,GACJ,MAAM,CA8BlB;IAED;;;;;;OAMG;IACH,uBALW,MAAM,gDAGJ,IAAI,CAmChB;IAED;;;;;OAKG;IACH,sDAFa,SAAS,CA8KrB;IAED;;;;;;OAMG;IACH,+DAHW,MAAM,GACJ,IAAI,GAAC,SAAS,CAoG1B;IAED;;;;OAIG;IACH,kEAqCC;IAED;;;;OAIG;IACH,iCAFa,IAAI,CAIhB;IAED;;;;OAIG;IACH,uCAHa,SAAS,CAYrB;IAED;;;;;OAKG;IACH,oDAFa,SAAS,CA6DrB;CACJ;6BA/nB4B,8CAA8C;iBAK1D,iCAAiC;sBAC5B,sCAAsC"}
+{"version":3,"file":"ThemeEngine.d.ts","sourceRoot":"","sources":["../../../../src/generation/theme/ThemeEngine.js"],"names":[],"mappings":"AAqFA;IAEI;;;OAGG;IACH,OAFU,uBAAuB,CAEN;IAE3B;;;OAGG;IACH,uBAFqB,MAAM,CAEF;IAEzB;;;;OAIG;IACH,uBAAsB;IAEtB,2BAEC;IAED;;;OAGG;IACH,sBAEC;IAED;;;OAGG;IACH,mBAEC;IAED;;;OAGG;IACH,4BAUC;IAED;;;;;;OAMG;IACH,4BALW,WAAW,KACX,MAAM,KACN,MAAM,GACJ,MAAM,CA8BlB;IAED;;;;;;OAMG;IACH,oEAHW,MAAM,GACJ,IAAI,CAmChB;IAED;;;;;OAKG;IACH,sDAFa,SAAS,CAgLrB;IAED;;;;;;OAMG;IACH,+DAHW,MAAM,GACJ,IAAI,GAAC,SAAS,CA2G1B;IAED;;;;OAIG;IACH,kEAqCC;IAED;;;;OAIG;IACH,iCAFa,IAAI,CAIhB;IAED;;;;OAIG;IACH,uCAHa,SAAS,CAYrB;IAED;;;;;OAKG;IACH,oDAFa,SAAS,CA6DrB;CACJ;6BAzoB4B,8CAA8C;iBAM1D,iCAAiC;sBAC5B,sCAAsC"}

package/src/generation/theme/ThemeEngine.js

@@ -3,6 +3,7 @@ import { binarySearchLowIndex } from "../../core/collection/array/binarySearchLo
 import { HashMap } from "../../core/collection/map/HashMap.js";
 import { QuadTreeNode } from "../../core/geom/2d/quad-tree/QuadTreeNode.js";
 import { randomFloatBetween } from "../../core/math/random/randomFloatBetween.js";
+import { randomIntegerBetween } from "../../core/math/random/randomIntegerBetween.js";
 import { seededRandom } from "../../core/math/random/seededRandom.js";
 import { number_compare_ascending } from "../../core/primitives/numbers/number_compare_ascending.js";
 import Future from "../../core/process/Future.js";
@@ -178,12 +179,12 @@ export class ThemeEngine {
 
     /**
      *
-     * @param {number} seed
-     * @param {EntityComponentDataset} ecd
      * @param {GridData} grid
+     * @param {EntityComponentDataset} ecd
+     * @param {number} seed
      * @returns {Task}
      */
-    initializeThemes(seed, ecd, grid) {
+    initializeThemes(grid, ecd, seed) {
 
         return actionTask(() => {
             /**
@@ -211,7 +212,7 @@ export class ThemeEngine {
 
                     const seed = this.random();
 
-                    theme.initialize(seed, ecd, grid);
+                    theme.initialize(grid, ecd, seed);
                 }
             }
 
@@ -348,8 +349,9 @@ export class ThemeEngine {
 
 
                     if (matchingThemeCount > 1) {
-                        const distance = areaMask.distanceField.readChannel(x, y, 0);
-                        const influence = distance / matchingThemeCount;
+                        // themes deeper inside their mask win; the aggregator normalizes,
+                        // so only relative magnitudes matter
+                        const influence = areaMask.distanceField.readChannel(x, y, 0);
 
                         power *= influence;
                     }
@@ -376,11 +378,12 @@ export class ThemeEngine {
             const y = (index / splatWidth) | 0;
             const x = index % splatWidth;
 
-            const v = y / splatHeight;
-            const u = x / splatWidth;
+            // texel-center mapping between the two resolutions
+            const v = (y + 0.5) / splatHeight;
+            const u = (x + 0.5) / splatWidth;
 
-            const source_y = v * weights.height;
-            const source_x = u * weights.width;
+            const source_y = v * weights.height - 0.5;
+            const source_x = u * weights.width - 0.5;
 
 
             weights.sampleBilinear(source_x, source_y, weightSample, 0);
@@ -450,7 +453,7 @@ export class ThemeEngine {
 
             let influenceSum = 0;
 
-            //compute influences of active themes
+            //compute influences of active themes; only relative magnitudes matter for the pick
             for (let j = 0; j < matchingThemeCount; j++) {
 
                 /**
@@ -461,8 +464,7 @@ export class ThemeEngine {
 
                 const areaMask = theme.mask;
 
-                const distance = areaMask.distanceField.readChannel(x, y, 0);
-                const influence = distance / matchingThemeCount;
+                const influence = areaMask.distanceField.readChannel(x, y, 0);
 
                 themeInfluence[j] = influenceSum;
 
@@ -470,9 +472,17 @@ export class ThemeEngine {
             }
 
             //select a theme
-            const t = randomFloatBetween(random, 0, influenceSum);
+            let themeIndex;
+
+            if (influenceSum > 0) {
+                const t = randomFloatBetween(random, 0, influenceSum);
 
-            const themeIndex = binarySearchLowIndex(themeInfluence, t, number_compare_ascending);
+                // NOTE: themeInfluence is reused between nodes, search must be bounded to the current match count
+                themeIndex = binarySearchLowIndex(themeInfluence, t, number_compare_ascending, 0, matchingThemeCount - 1);
+            } else {
+                // all matching themes have zero influence (e.g. node sits on every mask's edge), pick uniformly
+                themeIndex = randomIntegerBetween(random, 0, matchingThemeCount - 1);
+            }
 
             const themeArea = themeAreas[themeIndex];
 
@@ -583,7 +593,7 @@ export class ThemeEngine {
     apply(grid, ecd) {
         const terrain = obtainTerrain(ecd);
 
-        const tInitializeThemes = this.initializeThemes(this.random(), ecd, grid);
+        const tInitializeThemes = this.initializeThemes(grid, ecd, this.random());
 
         const tNodes = this.applyNodes(grid, ecd);
 

package/src/generation/theme/cell/CellProcessingRule.d.ts

@@ -17,10 +17,10 @@ export class CellProcessingRule {
     action: ContinuousGridCellAction;
     /**
      *
-     * @param {number} seed
-     * @param {EntityComponentDataset} ecd
      * @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;
 }
 //# sourceMappingURL=CellProcessingRule.d.ts.map

package/src/generation/theme/cell/CellProcessingRule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CellProcessingRule.d.ts","sourceRoot":"","sources":["../../../../../src/generation/theme/cell/CellProcessingRule.js"],"names":[],"mappings":"AAEA;IAcI;;;;OAIG;IACH,sFAUC;IA3BD;;;OAGG;IACH,mBAAc;IAEd;;;OAGG;IACH,iCAAc;IAmBd;;;;;OAKG;IACH,iBAJW,MAAM,qDAYhB;CACJ"}
+{"version":3,"file":"CellProcessingRule.d.ts","sourceRoot":"","sources":["../../../../../src/generation/theme/cell/CellProcessingRule.js"],"names":[],"mappings":"AAEA;IAcI;;;;OAIG;IACH,sFAUC;IA3BD;;;OAGG;IACH,mBAAc;IAEd;;;OAGG;IACH,iCAAc;IAmBd;;;;;OAKG;IACH,8DAFW,MAAM,QAMhB;CACJ"}

package/src/generation/theme/cell/CellProcessingRule.js

@@ -33,17 +33,13 @@ export class CellProcessingRule {
 
     /**
      *
-     * @param {number} seed
-     * @param {EntityComponentDataset} ecd
      * @param {GridData} grid
+     * @param {EntityComponentDataset} ecd
+     * @param {number} seed
      */
-    initialize(seed, ecd, grid) {
-        if (!this.action.initialized) {
-            this.action.initialize(seed, ecd, grid);
-        }
-
-        if (!this.filter.initialized) {
-            this.filter.initialize(grid, seed);
-        }
+    initialize(grid, ecd, seed) {
+        this.action.ensureInitialized(grid, ecd, seed);
+
+        this.filter.ensureInitialized(grid, seed);
     }
 }

package/src/generation/theme/cell/CellProcessingRuleSet.d.ts

@@ -15,6 +15,6 @@ export class CellProcessingRuleSet {
      * @param {EntityComponentDataset} ecd
      * @param {GridData} grid
      */
-    initialize(seed: number, ecd: EntityComponentDataset, grid: GridData): void;
+    initialize(grid: GridData, ecd: EntityComponentDataset, seed: number): void;
 }
 //# sourceMappingURL=CellProcessingRuleSet.d.ts.map

package/src/generation/theme/cell/CellProcessingRuleSet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CellProcessingRuleSet.d.ts","sourceRoot":"","sources":["../../../../../src/generation/theme/cell/CellProcessingRuleSet.js"],"names":[],"mappings":"AAAA;IACI;;;OAGG;IACH,UAFU,oBAAoB,CAEhB;IAGd;;;OAGG;IACH,oCAEC;IAED;;;;;OAKG;IACH,iBAJW,MAAM,qDAYhB;CACJ"}
+{"version":3,"file":"CellProcessingRuleSet.d.ts","sourceRoot":"","sources":["../../../../../src/generation/theme/cell/CellProcessingRuleSet.js"],"names":[],"mappings":"AAAA;IACI;;;OAGG;IACH,UAFU,oBAAoB,CAEhB;IAGd;;;OAGG;IACH,oCAEC;IAED;;;;;OAKG;IACH,8DAJW,MAAM,QAYhB;CACJ"}

package/src/generation/theme/cell/CellProcessingRuleSet.js

@@ -20,13 +20,13 @@ export class CellProcessingRuleSet {
      * @param {EntityComponentDataset} ecd
      * @param {GridData} grid
      */
-    initialize(seed, ecd, grid) {
+    initialize(grid, ecd, seed) {
         const elements = this.elements;
         const n = elements.length;
         for (let i = 0; i < n; i++) {
             const element = elements[i];
 
-            element.initialize(seed, ecd, grid);
+            element.initialize(grid, ecd, seed);
         }
     }
 }

package/src/view/common/ListView.js

@@ -215,7 +215,7 @@ export class ListView extends View {
 
         this.addChild(elementView);
 
-        this.hooks.add(el, elementView, index, self);
+        this.hooks.add(el, elementView, index, this);
 
         return elementView;
     }

package/src/view/elements/BottomLeftResizeHandleView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BottomLeftResizeHandleView.d.ts","sourceRoot":"","sources":["../../../../src/view/elements/BottomLeftResizeHandleView.js"],"names":[],"mappings":";AAIA;IACI,8BAwCC;IAjCG,YAAgB;CAkCvB;iBA9CgB,YAAY"}
+{"version":3,"file":"BottomLeftResizeHandleView.d.ts","sourceRoot":"","sources":["../../../../src/view/elements/BottomLeftResizeHandleView.js"],"names":[],"mappings":";AAKA;IACI,8BA+CC;IAxCG,YAAgB;CAyCvB;iBAtDgB,YAAY"}