@woosh/meep-engine 2.169.0 → 2.169.2

package/src/generation/markers/actions/probability/MarkerNodeActionSelectWeighted.js

@@ -1,14 +1,8 @@
 import { seededRandom } from "../../../../core/math/random/seededRandom.js";
-import { random_pick_weighted_index } from "../../../../core/math/random/random_pick_weighted_index.js";
+import { cell_filter_weights_pick } from "../../../filtering/util/cell_filter_weights_pick.js";
 import { MarkerNodeAction } from "../MarkerNodeAction.js";
 import { assert } from "../../../../core/assert.js";
 
-/**
- *
- * @type {number[]}
- */
-const evaluatedWeights = [];
-
 export class MarkerNodeActionSelectWeighted extends MarkerNodeAction {
 
     /**
@@ -55,43 +49,14 @@ export class MarkerNodeActionSelectWeighted extends MarkerNodeAction {
 
     execute(grid, ecd, node) {
         const elements = this.elements;
-        const n = elements.length;
-
-        let totalWeight = 0;
-
-        for (let i = 0; i < n; i++) {
-            /**
-             *
-             * @type {MarkerNodeActionWeightedElement}
-             */
-            const weightedElement = elements[i];
 
-            /**
-             *
-             * @type {CellFilter}
-             */
-            const weightFilter = weightedElement.weight;
-
-            /**
-             *
-             * @type {Vector2}
-             */
-            const nodePosition = node.position;
-
-            const weightValue = weightFilter.execute(grid, nodePosition.x, nodePosition.y, 0);
-
-
-            if (weightValue > 0) {
-                //if the weight is negative, we clamp it to 0
-
-                totalWeight += weightValue;
-            }
-
-            evaluatedWeights[i] = totalWeight;
-
-        }
+        /**
+         *
+         * @type {Vector2}
+         */
+        const nodePosition = node.position;
 
-        const index = random_pick_weighted_index(this.__random, evaluatedWeights, n);
+        const index = cell_filter_weights_pick(this.__random, elements, grid, nodePosition.x, nodePosition.y);
 
         if (index === -1) {
             // every element has zero weight at this position, nothing to select

package/src/generation/markers/transform/MarkerNodeTransformRotateRandom.d.ts

@@ -2,7 +2,8 @@ export class MarkerNodeTransformRotateRandom extends MarkerNodeTransformer {
     static from(seed?: number): MarkerNodeTransformRotateRandom;
     seed: number;
     random: (() => number) | {
-        setCurrentSeed: (arg0: v) => number;
+        setCurrentSeed: (v: number) => void;
+        getCurrentSeed: () => number;
     };
     initialize(grid: any, seed: any): void;
     transform(node: any, grid: any): any;

package/src/generation/markers/transform/MarkerNodeTransformRotateRandom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarkerNodeTransformRotateRandom.d.ts","sourceRoot":"","sources":["../../../../../src/generation/markers/transform/MarkerNodeTransformRotateRandom.js"],"names":[],"mappings":"AAGA;IAMI,4DAMC;IAVD,aAAS;IAET;;MAAyB;IAUzB,uCAEC;IAED,qCAMC;CACJ;sCA3BqC,4BAA4B"}
+{"version":3,"file":"MarkerNodeTransformRotateRandom.d.ts","sourceRoot":"","sources":["../../../../../src/generation/markers/transform/MarkerNodeTransformRotateRandom.js"],"names":[],"mappings":"AAGA;IAMI,4DAMC;IAVD,aAAS;IAET;;;MAAyB;IAUzB,uCAEC;IAED,qCAMC;CACJ;sCA3BqC,4BAA4B"}

package/src/generation/markers/transform/MarkerNodeTransformerOffsetPosition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarkerNodeTransformerOffsetPosition.d.ts","sourceRoot":"","sources":["../../../../../src/generation/markers/transform/MarkerNodeTransformerOffsetPosition.js"],"names":[],"mappings":"AAIA;;;;GAIG;AACH;IAII;;;;;OAKG;IACH,eAJW,MAAM,KACN,MAAM,GACL,mCAAmC,CAQ9C;IAdD,gBAAuB;IAgBvB,qCA4BC;CACJ;sCAxDqC,4BAA4B;oBAC9C,+BAA+B"}
+{"version":3,"file":"MarkerNodeTransformerOffsetPosition.d.ts","sourceRoot":"","sources":["../../../../../src/generation/markers/transform/MarkerNodeTransformerOffsetPosition.js"],"names":[],"mappings":"AAWA;;;;GAIG;AACH;IAII;;;;;OAKG;IACH,eAJW,MAAM,KACN,MAAM,GACL,mCAAmC,CAQ9C;IAdD,gBAAuB;IAgBvB,qCA0BC;CACJ;sCA7DqC,4BAA4B;oBAC9C,+BAA+B"}

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

@@ -1,6 +1,13 @@
 import { MarkerNodeTransformer } from "./MarkerNodeTransformer.js";
 import Vector2 from "../../../core/geom/Vector2.js";
 import Vector3 from "../../../core/geom/Vector3.js";
+import { v2_rotate } from "../../../core/geom/vec2/v2_rotate.js";
+
+/**
+ * Scratch for the rotated offset. Read out immediately, so it cannot alias.
+ * @type {Float64Array}
+ */
+const scratch_offset = new Float64Array(2);
 
 /**
  * Relocates the marker by an offset given in grid units, rotated by the node's yaw.
@@ -31,14 +38,12 @@ export class MarkerNodeTransformerOffsetPosition extends MarkerNodeTransformer {
         //rotate offset
         const rotation = r.transform.rotation.computeTwistAngle(Vector3.down);
 
-        const sin = Math.sin(rotation);
-        const cos = Math.cos(rotation);
+        const offset = this.offset;
 
-        const local_x = this.offset.x;
-        const local_y = this.offset.y;
+        v2_rotate(scratch_offset, 0, offset.x, offset.y, rotation);
 
-        const rotated_local_x = local_x * cos - local_y * sin
-        const rotated_local_y = local_x * sin + local_y * cos;
+        const rotated_local_x = scratch_offset[0];
+        const rotated_local_y = scratch_offset[1];
 
         r.position._add(rotated_local_x, rotated_local_y);
 

package/src/generation/markers/transform/MarkerNodeTransformerRecordPropertyClosure.d.ts

@@ -2,10 +2,10 @@ export class MarkerNodeTransformerRecordPropertyClosure extends MarkerNodeTransf
     /**
      *
      * @param {string} propertyName
-     * @param {function(node:MarkerNode, random:function, grid:GridData):*} value
+     * @param {(node: MarkerNode, random: function, grid: GridData) => *} value
      * @returns {MarkerNodeTransformerRecordPropertyClosure}
      */
-    static from(propertyName: string, value: any): MarkerNodeTransformerRecordPropertyClosure;
+    static from(propertyName: string, value: (node: MarkerNode, random: Function, grid: GridData) => any): MarkerNodeTransformerRecordPropertyClosure;
     /**
      *
      * @type {function}
@@ -17,7 +17,8 @@ export class MarkerNodeTransformerRecordPropertyClosure extends MarkerNodeTransf
      */
     propertyName: string;
     random: (() => number) | {
-        setCurrentSeed: (arg0: v) => number;
+        setCurrentSeed: (v: number) => void;
+        getCurrentSeed: () => number;
     };
     initialize(grid: any, seed: any): void;
     transform(node: any, grid: any): any;

package/src/generation/markers/transform/MarkerNodeTransformerRecordPropertyClosure.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarkerNodeTransformerRecordPropertyClosure.d.ts","sourceRoot":"","sources":["../../../../../src/generation/markers/transform/MarkerNodeTransformerRecordPropertyClosure.js"],"names":[],"mappings":"AAIA;IAgBI;;;;;OAKG;IACH,0BAJW,MAAM,eAEJ,0CAA0C,CAYtD;IA9BD;;;OAGG;IACH,gBAAa;IAEb;;;OAGG;IACH,cAFU,MAAM,CAEI;IAEpB;;MAAyB;IAqBzB,uCAEC;IAGD,qCAQC;CACJ;sCAnDqC,4BAA4B"}
+{"version":3,"file":"MarkerNodeTransformerRecordPropertyClosure.d.ts","sourceRoot":"","sources":["../../../../../src/generation/markers/transform/MarkerNodeTransformerRecordPropertyClosure.js"],"names":[],"mappings":"AAIA;IAgBI;;;;;OAKG;IACH,0BAJW,MAAM,uEAEJ,0CAA0C,CAYtD;IA9BD;;;OAGG;IACH,gBAAa;IAEb;;;OAGG;IACH,cAFU,MAAM,CAEI;IAEpB;;;MAAyB;IAqBzB,uCAEC;IAGD,qCAQC;CACJ;sCAnDqC,4BAA4B"}

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

@@ -21,7 +21,7 @@ export class MarkerNodeTransformerRecordPropertyClosure extends MarkerNodeTransf
     /**
      *
      * @param {string} propertyName
-     * @param {function(node:MarkerNode, random:function, grid:GridData):*} value
+     * @param {(node: MarkerNode, random: function, grid: GridData) => *} value
      * @returns {MarkerNodeTransformerRecordPropertyClosure}
      */
     static from(propertyName, value) {

package/src/generation/markers/transform/MarkerNodeTransformerRecordUniqueRandomEnum.d.ts

@@ -22,7 +22,8 @@ export class MarkerNodeTransformerRecordUniqueRandomEnum extends MarkerNodeTrans
      */
     propertyName: string;
     random: (() => number) | {
-        setCurrentSeed: (arg0: v) => number;
+        setCurrentSeed: (v: number) => void;
+        getCurrentSeed: () => number;
     };
     initialize(grid: any, seed: any): void;
     transform(node: any, grid: any): any;

package/src/generation/markers/transform/MarkerNodeTransformerRecordUniqueRandomEnum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MarkerNodeTransformerRecordUniqueRandomEnum.d.ts","sourceRoot":"","sources":["../../../../../src/generation/markers/transform/MarkerNodeTransformerRecordUniqueRandomEnum.js"],"names":[],"mappings":"AAKA;IAuBI;;;;;OAKG;IACH,0BAJW,MAAM,SACN,GAAG,GACD,2CAA2C,CAYvD;IArCD;;;OAGG;IACH,OAFU,GAAG,CAEF;IAEX;;;OAGG;IACH,QAFU,GAAG,CAED;IAEZ;;;OAGG;IACH,cAFU,MAAM,CAEI;IAEpB;;MAAyB;IAsBzB,uCAKC;IAGD,qCAkBC;CACJ;sCAvEqC,4BAA4B"}
+{"version":3,"file":"MarkerNodeTransformerRecordUniqueRandomEnum.d.ts","sourceRoot":"","sources":["../../../../../src/generation/markers/transform/MarkerNodeTransformerRecordUniqueRandomEnum.js"],"names":[],"mappings":"AAKA;IAuBI;;;;;OAKG;IACH,0BAJW,MAAM,SACN,GAAG,GACD,2CAA2C,CAYvD;IArCD;;;OAGG;IACH,OAFU,GAAG,CAEF;IAEX;;;OAGG;IACH,QAFU,GAAG,CAED;IAEZ;;;OAGG;IACH,cAFU,MAAM,CAEI;IAEpB;;;MAAyB;IAsBzB,uCAKC;IAGD,qCAkBC;CACJ;sCAvEqC,4BAA4B"}

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,QAShB;IAED;;;;;;OAMG;IACH,2BAJW,MAAM,KACN,MAAM,YACN,MAAM,QAgBhB;CACJ;oBApHmB,4BAA4B"}
+{"version":3,"file":"GridCellPlacementRule.d.ts","sourceRoot":"","sources":["../../../../src/generation/placement/GridCellPlacementRule.js"],"names":[],"mappings":"AAYA;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,QAYhB;CACJ;oBAvHmB,4BAA4B"}

package/src/generation/placement/GridCellPlacementRule.js

@@ -1,8 +1,15 @@
 import { assert } from "../../core/assert.js";
 import Vector2 from "../../core/geom/Vector2.js";
+import { v2_rotate } from "../../core/geom/vec2/v2_rotate.js";
 import { CellFilterLiteralFloat } from "../filtering/numeric/CellFilterLiteralFloat.js";
 import { GridCellActionSequence } from "./action/util/GridCellActionSequence.js";
 
+/**
+ * Scratch for the rotated position offset. Read out before the nested action call, so it cannot alias.
+ * @type {Float64Array}
+ */
+const scratch_offset = new Float64Array(2);
+
 export class GridCellPlacementRule {
     /**
      *
@@ -101,16 +108,12 @@ export class GridCellPlacementRule {
      * @param {number} rotation in Radians
      */
     execute(grid, x, y, rotation) {
-        const sin = Math.sin(rotation);
-        const cos = Math.cos(rotation);
-
         const offset = this.positionOffset;
 
-        const local_x = offset.x;
-        const local_y = offset.y;
+        v2_rotate(scratch_offset, 0, offset.x, offset.y, rotation);
 
-        const rotated_local_x = local_x * cos - local_y * sin
-        const rotated_local_y = local_x * sin + local_y * cos;
+        const rotated_local_x = scratch_offset[0];
+        const rotated_local_y = scratch_offset[1];
 
         this.action.execute(grid, x + rotated_local_x, y + rotated_local_y, rotation);
 

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,CAcnC;IAtDD;;;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;IAsBD;;;OAGG;IACH,WAFW,MAAM,QAMhB;IAED;;;;OAIG;IACH,UAHW,MAAM,KACN,MAAM,QAIhB;IAED;;OAEG;IACH,wDA2CC;CACJ;+BA9H8B,qBAAqB;0BAD1B,uDAAuD"}
+{"version":3,"file":"GridCellActionPlaceTags.d.ts","sourceRoot":"","sources":["../../../../../src/generation/placement/action/GridCellActionPlaceTags.js"],"names":[],"mappings":"AAYA;IAsCI;;;;;OAKG;IACH,mBAJW,MAAM,SACN,MAAM,GACJ,uBAAuB,CAcnC;IAtDD;;;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;IAsBD;;;OAGG;IACH,WAFW,MAAM,QAMhB;IAED;;;;OAIG;IACH,UAHW,MAAM,KACN,MAAM,QAIhB;IAED;;OAEG;IACH,wDA0CC;CACJ;+BAnI8B,qBAAqB;0BAD1B,uDAAuD"}

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

@@ -1,8 +1,15 @@
 import { assert } from "../../../core/assert.js";
 import { bitwiseOr } from "../../../core/binary/operations/bitwiseOr.js";
+import { v2_rotate_cos_sin } from "../../../core/geom/vec2/v2_rotate_cos_sin.js";
 import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
 import { GridCellAction } from "./GridCellAction.js";
 
+/**
+ * Scratch for the rotated tag-pattern offset. Read out at the top of every iteration, so it cannot alias.
+ * @type {Float64Array}
+ */
+const scratch_offset = new Float64Array(2);
+
 export class GridCellActionPlaceTags extends GridCellAction {
 
     /**
@@ -99,12 +106,11 @@ export class GridCellActionPlaceTags extends GridCellAction {
 
 
                 //rotate rule position
-                const rotated_local_x = local_x * cos - local_y * sin
-                const rotated_local_y = local_x * sin + local_y * cos;
+                v2_rotate_cos_sin(scratch_offset, 0, local_x, local_y, cos, sin);
 
                 //
-                const target_x = Math.round(rotated_local_x + x);
-                const target_y = Math.round(rotated_local_y + y);
+                const target_x = Math.round(scratch_offset[0] + x);
+                const target_y = Math.round(scratch_offset[1] + y);
 
                 if (
                     target_x < 0

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":"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"}
+{"version":3,"file":"CellActionSelectWeightedRandom.d.ts","sourceRoot":"","sources":["../../../../../../../src/generation/placement/action/random/weighted/CellActionSelectWeightedRandom.js"],"names":[],"mappings":"AAKA;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,wDAaC;CACJ;+BAnF8B,yBAAyB"}

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

@@ -1,14 +1,8 @@
 import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
-import { random_pick_weighted_index } from "../../../../../core/math/random/random_pick_weighted_index.js";
+import { cell_filter_weights_pick } from "../../../../filtering/util/cell_filter_weights_pick.js";
 import { GridCellAction } from "../../GridCellAction.js";
 import { assert } from "../../../../../core/assert.js";
 
-/**
- *
- * @type {number[]}
- */
-const evaluatedWeights = [];
-
 export class CellActionSelectWeightedRandom extends GridCellAction {
 
     /**
@@ -77,38 +71,8 @@ export class CellActionSelectWeightedRandom extends GridCellAction {
 
     execute(data, x, y, rotation) {
         const elements = this.options;
-        const n = elements.length;
-
-        let totalWeight = 0;
-
-
-        for (let i = 0; i < n; i++) {
-            /**
-             *
-             * @type {WeightedGridCellAction}
-             */
-            const weightedElement = elements[i];
-
-            /**
-             *
-             * @type {CellFilter}
-             */
-            const weightFilter = weightedElement.weight;
-
-            const weightValue = weightFilter.execute(data, x, y, 0);
-
-
-            if (weightValue > 0) {
-                //if the weight is negative, we clamp it to 0
-
-                totalWeight += weightValue;
-            }
-
-            evaluatedWeights[i] = totalWeight;
-
-        }
 
-        const index = random_pick_weighted_index(this.__random, evaluatedWeights, n);
+        const index = cell_filter_weights_pick(this.__random, elements, data, x, y);
 
         if (index === -1) {
             // every option has zero weight at this position, nothing to select

package/src/generation/placement/action/util/GridCellDisplacedAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridCellDisplacedAction.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/placement/action/util/GridCellDisplacedAction.js"],"names":[],"mappings":"AAIA;IAUI;;;;;;OAMG;IACH,oBALW,cAAc,KACd,MAAM,KACN,MAAM,GACJ,uBAAuB,CAYnC;IAzBD,gBAAuB;IAEvB;;;OAGG;IACH,QAFU,cAAc,CAEV;IAqBd,uCAGC;IAED,wDAYC;CACJ;+BAnD8B,sBAAsB;oBACjC,kCAAkC"}
+{"version":3,"file":"GridCellDisplacedAction.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/placement/action/util/GridCellDisplacedAction.js"],"names":[],"mappings":"AAWA;IAUI;;;;;;OAMG;IACH,oBALW,cAAc,KACd,MAAM,KACN,MAAM,GACJ,uBAAuB,CAYnC;IAzBD,gBAAuB;IAEvB;;;OAGG;IACH,QAFU,cAAc,CAEV;IAqBd,uCAGC;IAED,wDAUC;CACJ;+BAxD8B,sBAAsB;oBACjC,kCAAkC"}

package/src/generation/placement/action/util/GridCellDisplacedAction.js

@@ -1,7 +1,14 @@
 import { GridCellAction } from "../GridCellAction.js";
 import Vector2 from "../../../../core/geom/Vector2.js";
+import { v2_rotate } from "../../../../core/geom/vec2/v2_rotate.js";
 import { assert } from "../../../../core/assert.js";
 
+/**
+ * Scratch for the rotated offset. Read out before the nested action call, so it cannot alias.
+ * @type {Float64Array}
+ */
+const scratch_offset = new Float64Array(2);
+
 export class GridCellDisplacedAction extends GridCellAction {
 
     offset = new Vector2();
@@ -38,14 +45,12 @@ export class GridCellDisplacedAction extends GridCellAction {
 
     execute(data, x, y, rotation) {
 
-        const sin = Math.sin(rotation);
-        const cos = Math.cos(rotation);
+        const offset = this.offset;
 
-        const local_x = this.offset.x;
-        const local_y = this.offset.y;
+        v2_rotate(scratch_offset, 0, offset.x, offset.y, rotation);
 
-        const rotated_local_x = local_x * cos - local_y * sin
-        const rotated_local_y = local_x * sin + local_y * cos;
+        const rotated_local_x = scratch_offset[0];
+        const rotated_local_y = scratch_offset[1];
 
         this.action.execute(data, x + rotated_local_x, y + rotated_local_y, rotation);
     }

package/src/generation/rules/cell/CellMatcherGridPattern.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CellMatcherGridPattern.d.ts","sourceRoot":"","sources":["../../../../../src/generation/rules/cell/CellMatcherGridPattern.js"],"names":[],"mappings":"AAIA;IAQI;;;;OAIG;IACH,mBAHW,sBAAsB,EAAE,GACtB,sBAAsB,CAQlC;IAjBD;;;OAGG;IACH,OAFU,sBAAsB,EAAE,CAEvB;IAeX,uCASC;IAED;;;;;OAKG;IACH,WAJW,MAAM,KACN,MAAM,QACN,WAAW,QAerB;IAED;;;;;OAKG;IACH,qBAJW,MAAM,KACN,MAAM,GACL,SAAS,GAAC,sBAAsB,CAc3C;CA8CJ;4BAvH2B,mBAAmB;uCADR,6BAA6B"}
+{"version":3,"file":"CellMatcherGridPattern.d.ts","sourceRoot":"","sources":["../../../../../src/generation/rules/cell/CellMatcherGridPattern.js"],"names":[],"mappings":"AAYA;IAQI;;;;OAIG;IACH,mBAHW,sBAAsB,EAAE,GACtB,sBAAsB,CAQlC;IAjBD;;;OAGG;IACH,OAFU,sBAAsB,EAAE,CAEvB;IAeX,uCASC;IAED;;;;;OAKG;IACH,WAJW,MAAM,KACN,MAAM,QACN,WAAW,QAerB;IAED;;;;;OAKG;IACH,qBAJW,MAAM,KACN,MAAM,GACL,SAAS,GAAC,sBAAsB,CAc3C;CA6CJ;4BA9H2B,mBAAmB;uCADR,6BAA6B"}

package/src/generation/rules/cell/CellMatcherGridPattern.js

@@ -1,6 +1,14 @@
 import { CellMatcherAnd } from "../logic/CellMatcherAnd.js";
 import { GridPatternMatcherCell } from "./GridPatternMatcherCell.js";
 import { CellMatcher } from "../CellMatcher.js";
+import { v2_rotate_cos_sin } from "../../../core/geom/vec2/v2_rotate_cos_sin.js";
+
+/**
+ * Scratch for the rotated rule position. Read out before the nested matcher call, so it cannot alias
+ * even when patterns nest.
+ * @type {Float64Array}
+ */
+const scratch_offset = new Float64Array(2);
 
 export class CellMatcherGridPattern extends CellMatcher {
 
@@ -103,11 +111,10 @@ export class CellMatcherGridPattern extends CellMatcher {
             const local_x = position.x;
 
             //rotate rule position
-            const rotated_local_x = local_x * cos - local_y * sin
-            const rotated_local_y = local_x * sin + local_y * cos;
+            v2_rotate_cos_sin(scratch_offset, 0, local_x, local_y, cos, sin);
 
-            const target_x = Math.round(x + rotated_local_x);
-            const target_y = Math.round(y + rotated_local_y);
+            const target_x = Math.round(x + scratch_offset[0]);
+            const target_y = Math.round(y + scratch_offset[1]);
 
             const match = tagRule.rule.match(grid, target_x, target_y, rotation);
 

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":"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;;;;;;;;;;;;;OAaG;IACH,iCAFa,IAAI,CA+BhB;IAED;;;;OAIG;IACH,uCAHa,SAAS,CAYrB;IAED;;;;;OAKG;IACH,oDAFa,SAAS,CA6DrB;CACJ;6BA7qB4B,8CAA8C;iBAO1D,iCAAiC;sBAC5B,sCAAsC"}
+{"version":3,"file":"ThemeEngine.d.ts","sourceRoot":"","sources":["../../../../src/generation/theme/ThemeEngine.js"],"names":[],"mappings":"AAmFA;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,CAwG1B;IAED;;;;OAIG;IACH,kEAqCC;IAED;;;;;;;;;;;;;OAaG;IACH,iCAFa,IAAI,CA+BhB;IAED;;;;OAIG;IACH,uCAHa,SAAS,CAYrB;IAED;;;;;OAKG;IACH,oDAFa,SAAS,CA6DrB;CACJ;6BAzqB4B,8CAA8C;iBAM1D,iCAAiC;sBAC5B,sCAAsC"}

package/src/generation/theme/ThemeEngine.js

@@ -1,12 +1,10 @@
 import { assert } from "../../core/assert.js";
-import { binarySearchLowIndex } from "../../core/collection/array/binarySearchLowIndex.js";
 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 { random_pick_weighted_index } from "../../core/math/random/random_pick_weighted_index.js";
 import { randomIntegerBetween } from "../../core/math/random/randomIntegerBetween.js";
 import { randomSeed } from "../../core/math/random/randomSeed.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";
 import Task from "../../core/process/task/Task.js";
 import TaskGroup from "../../core/process/task/TaskGroup.js";
@@ -466,20 +464,17 @@ export class ThemeEngine {
 
                 const influence = areaMask.distanceField.readChannel(x, y, 0);
 
-                themeInfluence[j] = influenceSum;
-
                 influenceSum += influence;
+
+                // inclusive prefix sum, the convention random_pick_weighted_index expects
+                themeInfluence[j] = influenceSum;
             }
 
             //select a theme
-            let themeIndex;
-
-            if (influenceSum > 0) {
-                const t = randomFloatBetween(random, 0, influenceSum);
+            // NOTE: themeInfluence is reused between nodes, the search must be bounded to the current match count
+            let themeIndex = random_pick_weighted_index(random, themeInfluence, matchingThemeCount);
 
-                // 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 {
+            if (themeIndex === -1) {
                 // all matching themes have zero influence (e.g. node sits on every mask's edge), pick uniformly
                 themeIndex = randomIntegerBetween(random, 0, matchingThemeCount - 1);
             }

package/src/view/common/VirtualListView.d.ts

@@ -10,7 +10,7 @@ declare class VirtualListView extends View {
      * @param {List.<T>} list
      * @param {number} [lineSize=20]
      * @param {number} [lineSpacing=0]
-     * @param {function(element:T, index:number):View} elementFactory
+     * @param {(element: T, index: number) => View} elementFactory
      * @param classList
      * @param {number} [cacheSize=1000]
      * @param {AlignmentOption} [verticalAlignment]

package/src/view/common/VirtualListView.js

@@ -20,7 +20,7 @@ class VirtualListView extends View {
      * @param {List.<T>} list
      * @param {number} [lineSize=20]
      * @param {number} [lineSpacing=0]
-     * @param {function(element:T, index:number):View} elementFactory
+     * @param {(element: T, index: number) => View} elementFactory
      * @param classList
      * @param {number} [cacheSize=1000]
      * @param {AlignmentOption} [verticalAlignment]

package/src/view/elements/Group.d.ts

@@ -1,9 +1,30 @@
 export default GroupView;
+/**
+ * A `div` with the `group` class that holds a list of child views.
+ *
+ * @deprecated Use {@link EmptyView.group} instead — it builds the same element and takes the class
+ * list from the caller. This class predates it and used to keep its own child array, bypassing
+ * {@link View#addChild} / {@link View#removeChild} and with them the `parent` back-reference and
+ * the `unlink` of a removed child. It now delegates, so the two are equivalent.
+ */
 declare class GroupView extends View {
     el: HTMLDivElement;
-    children: any[];
-    add(view: any): this;
-    remove(view: any): this;
+    /**
+     *
+     * @param {View} view
+     * @returns {GroupView} this
+     */
+    add(view: View): GroupView;
+    /**
+     *
+     * @param {View} view
+     * @returns {GroupView} this
+     */
+    remove(view: View): GroupView;
+    /**
+     * Forwards to every child. Note that `update` is not part of the {@link View} protocol, so this
+     * only works for groups built exclusively out of views that happen to define it.
+     */
     update(): void;
 }
 import View from "../View.js";

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

@@ -1 +1 @@
-{"version":3,"file":"Group.d.ts","sourceRoot":"","sources":["../../../../src/view/elements/Group.js"],"names":[],"mappings":";AAEA;IAGmB,mBAAuC;IAElD,gBAAkB;IAGtB,qBAIC;IAED,wBAOC;IAED,eAIC;CACJ;iBA9BgB,YAAY"}
+{"version":3,"file":"Group.d.ts","sourceRoot":"","sources":["../../../../src/view/elements/Group.js"],"names":[],"mappings":";AAEA;;;;;;;GAOG;AACH;IAImB,mBAAuC;IAKtD;;;;OAIG;IACH,UAHW,IAAI,GACF,SAAS,CAMrB;IAED;;;;OAIG;IACH,aAHW,IAAI,GACF,SAAS,CAMrB;IAED;;;OAGG;IACH,eAMC;CACJ;iBApDgB,YAAY"}

package/src/view/elements/Group.js

@@ -1,34 +1,56 @@
-import View from "../View.js";
-
-class GroupView extends View {
-    constructor() {
-        super();
-        const el = this.el = document.createElement("div");
-        el.classList.add("group");
-        this.children = [];
-    }
-
-    add(view) {
-        this.children.push(view);
-        this.el.appendChild(view.el);
-        return this;
-    }
-
-    remove(view) {
-        const indexOf = this.children.indexOf(view);
-        if (indexOf !== -1) {
-            this.children.splice(indexOf, 1);
-            this.el.removeChild(view.el);
-        }
-        return this;
-    }
-
-    update() {
-        this.children.forEach(function (c) {
-            c.update();
-        });
-    }
-}
-
-
-export default GroupView;
+import View from "../View.js";
+
+/**
+ * A `div` with the `group` class that holds a list of child views.
+ *
+ * @deprecated Use {@link EmptyView.group} instead — it builds the same element and takes the class
+ * list from the caller. This class predates it and used to keep its own child array, bypassing
+ * {@link View#addChild} / {@link View#removeChild} and with them the `parent` back-reference and
+ * the `unlink` of a removed child. It now delegates, so the two are equivalent.
+ */
+class GroupView extends View {
+    constructor() {
+        super();
+
+        const el = this.el = document.createElement("div");
+
+        el.classList.add("group");
+    }
+
+    /**
+     *
+     * @param {View} view
+     * @returns {GroupView} this
+     */
+    add(view) {
+        this.addChild(view);
+
+        return this;
+    }
+
+    /**
+     *
+     * @param {View} view
+     * @returns {GroupView} this
+     */
+    remove(view) {
+        this.removeChild(view);
+
+        return this;
+    }
+
+    /**
+     * Forwards to every child. Note that `update` is not part of the {@link View} protocol, so this
+     * only works for groups built exclusively out of views that happen to define it.
+     */
+    update() {
+        const children = this.children;
+
+        for (let i = 0; i < children.length; i++) {
+            children[i].update();
+        }
+    }
+}
+
+
+export default GroupView;

package/src/view/tooltip/gml/compiler/GMLReferenceCompiler.d.ts

@@ -4,10 +4,10 @@
 export class GMLReferenceCompiler<T> {
     /**
      * @template T
-     * @param {function(options, database:StaticKnowledgeDatabase, localization:Localization, gml:GMLEngine, tooltips:DomTooltipManager):T} f
+     * @param {(options: *, database: StaticKnowledgeDatabase, localization: Localization, gml: GMLEngine, tooltips: DomTooltipManager) => T} f
      * @returns {GMLReferenceCompiler<T>}
      */
-    static fromFunction<T_1>(f: any): GMLReferenceCompiler<T_1>;
+    static fromFunction<T_1>(f: (options: any, database: StaticKnowledgeDatabase, localization: Localization, gml: GMLEngine, tooltips: DomTooltipManager) => T_1): GMLReferenceCompiler<T_1>;
     /**
      *
      * @param options

package/src/view/tooltip/gml/compiler/GMLReferenceCompiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GMLReferenceCompiler.d.ts","sourceRoot":"","sources":["../../../../../../src/view/tooltip/gml/compiler/GMLReferenceCompiler.js"],"names":[],"mappings":"AAEA;;GAEG;AACH;IAgBI;;;;OAIG;IACH,4DASC;IA7BD;;;;;;;;OAQG;IACH,mIAFa,CAAC,CAKb;CAkBJ"}
+{"version":3,"file":"GMLReferenceCompiler.d.ts","sourceRoot":"","sources":["../../../../../../src/view/tooltip/gml/compiler/GMLReferenceCompiler.js"],"names":[],"mappings":"AAEA;;GAEG;AACH;IAgBI;;;;OAIG;IACH,0LASC;IA7BD;;;;;;;;OAQG;IACH,mIAFa,CAAC,CAKb;CAkBJ"}

package/src/view/tooltip/gml/compiler/GMLReferenceCompiler.js

@@ -21,7 +21,7 @@ export class GMLReferenceCompiler {
 
     /**
      * @template T
-     * @param {function(options, database:StaticKnowledgeDatabase, localization:Localization, gml:GMLEngine, tooltips:DomTooltipManager):T} f
+     * @param {(options: *, database: StaticKnowledgeDatabase, localization: Localization, gml: GMLEngine, tooltips: DomTooltipManager) => T} f
      * @returns {GMLReferenceCompiler<T>}
      */
     static fromFunction(f) {