@woosh/meep-engine 2.55.0 → 2.56.1

package/src/generation/grid/GridData.spec.js

@@ -1,5 +1,46 @@
 import { GridData } from "./GridData.js";
+import { MarkerNode } from "../markers/MarkerNode.js";
+import { MarkerNodeMatcherAny } from "../markers/matcher/MarkerNodeMatcherAny.js";
 
 test("constructor does not throw", () => {
     expect(() => new GridData()).not.toThrow()
 });
+
+test("addMarker", () => {
+
+    const data = new GridData();
+
+    const node = new MarkerNode();
+
+    data.addMarker(node);
+
+});
+
+test("countMarkerInCircle", () => {
+
+    const data = new GridData();
+
+    const a = new MarkerNode();
+    a.position.set(1, 0);
+    a.size = 1;
+
+    data.addMarker(a);
+
+    const b = new MarkerNode();
+    b.position.set(1.5, 0);
+    b.size = 1;
+
+    data.addMarker(b);
+
+    expect(data.countMarkerInCircle(-1.1, 0, 1, MarkerNodeMatcherAny.INSTANCE))
+        .toBe(0);
+
+    expect(data.countMarkerInCircle(0, -2, 1, MarkerNodeMatcherAny.INSTANCE))
+        .toBe(0);
+
+    expect(data.countMarkerInCircle(-0.6, 0, 1, MarkerNodeMatcherAny.INSTANCE))
+        .toBe(1);
+
+    expect(data.countMarkerInCircle(0, 0, 1, MarkerNodeMatcherAny.INSTANCE))
+        .toBe(2);
+});

package/src/generation/grid/GridTaskGenerator.js

@@ -1,15 +1,14 @@
 import { assert } from "../../core/assert.js";
 
 export class GridTaskGenerator {
-    constructor() {
-        this.name = "Unnamed";
 
-        /**
-         *
-         * @type {GridTaskGenerator[]}
-         */
-        this.dependencies = [];
-    }
+    name = "Unnamed";
+
+    /**
+     *
+     * @type {GridTaskGenerator[]}
+     */
+    dependencies = [];
 
     /**
      *

package/src/generation/grid/layers/GridDataLayer.js

@@ -7,31 +7,29 @@ import {
 import { Sampler2D } from "../../../engine/graphics/texture/sampler/Sampler2D.js";
 
 export class GridDataLayer {
-    constructor() {
-        /**
-         * Unique ID to reference the layer
-         * @type {string}
-         */
-        this.id = "";
-
-        /**
-         * Relationship between size and number of cells in the sampler, higher resolution means more cells in the sampler
-         * @type {number}
-         */
-        this.resolution = 1;
-
-        /**
-         *
-         * @type {Sampler2D}
-         */
-        this.sampler = new Sampler2D([], 1, 0, 0);
-
-        /**
-         *
-         * @type {Vector2}
-         */
-        this.size = new Vector2(1, 1);
-    }
+    /**
+     * Unique ID to reference the layer
+     * @type {string}
+     */
+    id = "";
+
+    /**
+     * Relationship between size and number of cells in the sampler, higher resolution means more cells in the sampler
+     * @type {number}
+     */
+    resolution = 1;
+
+    /**
+     *
+     * @type {Sampler2D}
+     */
+    sampler = new Sampler2D([], 1, 0, 0);
+
+    /**
+     *
+     * @type {Vector2}
+     */
+    size = new Vector2(1, 1);
 
     /**
      *

package/src/generation/markers/GridActionRuleSet.js

@@ -19,32 +19,30 @@ const POLICY_ITERATORS = {
 };
 
 export class GridActionRuleSet {
-    constructor() {
-        /**
-         *
-         * @type {GridCellPlacementRule[]}
-         */
-        this.elements = [];
 
-        /**
-         *
-         * @type {RuleSelectionPolicyType|number}
-         */
-        this.policy = RuleSelectionPolicyType.Sequential;
+    /**
+     *
+     * @type {GridCellPlacementRule[]}
+     */
+    elements = [];
 
-        /**
-         * Rules will be evaluated for each cell, this pattern will be applied within each cell
-         * @type {number[]}
-         */
-        this.pattern = [0, 0];
+    /**
+     *
+     * @type {RuleSelectionPolicyType|number}
+     */
+    policy = RuleSelectionPolicyType.Sequential;
 
-        /**
-         *
-         * @type {boolean}
-         */
-        this.matchOrigin = true;
+    /**
+     * Rules will be evaluated for each cell, this pattern will be applied within each cell
+     * @type {number[]}
+     */
+    pattern = [0, 0];
 
-    }
+    /**
+     *
+     * @type {boolean}
+     */
+    matchOrigin = true;
 
     /**
      *

package/src/generation/markers/GridCellActionPlaceMarker.js

@@ -6,49 +6,46 @@ import { assert } from "../../core/assert.js";
 import Vector3 from "../../core/geom/Vector3.js";
 
 export class GridCellActionPlaceMarker extends GridCellAction {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {String}
-         */
-        this.type = null;
-
-        /**
-         *
-         * @type {Transform}
-         */
-        this.transform = new Transform();
-
-        /**
-         *
-         * @type {String[]}
-         */
-        this.tags = [];
-
-        this.properties = {};
-
-        this.size = 0;
-
-        /**
-         *
-         * @type {MarkerNodeTransformer[]}
-         */
-        this.transformers = [];
-
-        /**
-         *
-         * @type {number}
-         */
-        this.priority = 0;
-
-        /**
-         *
-         * @type {Vector2}
-         */
-        this.offset = new Vector2();
-    }
+
+    /**
+     *
+     * @type {String}
+     */
+    type = null;
+
+    /**
+     *
+     * @type {Transform}
+     */
+    transform = new Transform();
+
+    /**
+     *
+     * @type {String[]}
+     */
+    tags = [];
+
+    properties = {};
+
+    size = 0;
+
+    /**
+     *
+     * @type {MarkerNodeTransformer[]}
+     */
+    transformers = [];
+
+    /**
+     *
+     * @type {number}
+     */
+    priority = 0;
+
+    /**
+     *
+     * @type {Vector2}
+     */
+    offset = new Vector2();
 
     initialize(data, seed) {
         super.initialize(data, seed);

package/src/generation/markers/GridCellActionPlaceMarkerGroup.js

@@ -4,15 +4,13 @@ import { assert } from "../../core/assert.js";
 let idCounter = 0;
 
 export class GridCellActionPlaceMarkerGroup extends GridCellAction {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {GridCellActionPlaceMarker[]}
-         */
-        this.children = [];
-    }
+
+    /**
+     *
+     * @type {GridCellActionPlaceMarker[]}
+     */
+    children = [];
+
 
     /**
      *

package/src/generation/markers/MarkerNode.js

@@ -4,50 +4,50 @@ import { circleIntersectsCircle } from "../../core/geom/2d/circle/circleIntersec
 import { array_copy_entire } from "../../core/collection/array/array_copy_entire.js";
 
 export class MarkerNode {
-    constructor() {
-        /**
-         * Processing order, higher priority nodes are processed first
-         * @type {number}
-         */
-        this.priority = 0;
-
-        /**
-         *
-         * @type {String}
-         */
-        this.type = null;
-
-        /**
-         *
-         * @type {String[]}
-         */
-        this.tags = [];
-
-        /**
-         * Grid position
-         * @type {Vector2}
-         */
-        this.position = new Vector2();
-
-        /**
-         * World transform, this can differ from the grid position
-         * @type {Transform}
-         */
-        this.transform = new Transform();
-
-        /**
-         * Treated as a radius
-         * Used for spatial resolution, to allow spacing markers
-         * @type {number}
-         */
-        this.size = 0;
-
-        /**
-         *
-         * @type {Object}
-         */
-        this.properties = {};
-    }
+
+    /**
+     * Processing order, higher priority nodes are processed first
+     * @type {number}
+     */
+    priority = 0;
+
+    /**
+     *
+     * @type {String}
+     */
+    type = null;
+
+    /**
+     *
+     * @type {String[]}
+     */
+    tags = [];
+
+    /**
+     * Grid position
+     * @type {Vector2}
+     */
+    position = new Vector2();
+
+    /**
+     * World transform, this can differ from the grid position
+     * @type {Transform}
+     */
+    transform = new Transform();
+
+    /**
+     * Treated as a radius
+     * Used for spatial resolution, to allow spacing markers
+     * @type {number}
+     */
+    size = 0;
+
+    /**
+     *
+     * @type {Object}
+     */
+    properties = {};
+
 
     /**
      *

package/src/generation/markers/actions/MarkerNodeActionEntityPlacement.js

@@ -4,27 +4,24 @@ import { Transform } from "../../../engine/ecs/transform/Transform.js";
 import { EntityBlueprint } from "../../../engine/ecs/EntityBlueprint.js";
 
 export class MarkerNodeActionEntityPlacement extends MarkerNodeAction {
-    constructor() {
-        super();
 
-        /**
-         *
-         * @type {EntityBlueprint}
-         */
-        this.entity = new EntityBlueprint();
+    /**
+     *
+     * @type {EntityBlueprint}
+     */
+    entity = new EntityBlueprint();
 
-        /**
-         *
-         * @type {Transform}
-         */
-        this.transform = new Transform();
+    /**
+     *
+     * @type {Transform}
+     */
+    transform = new Transform();
 
-        /**
-         *
-         * @type {MarkerNodeEntityProcessor}
-         */
-        this.processor = null;
-    }
+    /**
+     *
+     * @type {MarkerNodeEntityProcessor}
+     */
+    processor = null;
 
     /**
      *

package/src/generation/markers/actions/MarkerNodeActionSequence.js

@@ -2,15 +2,12 @@ import { MarkerNodeAction } from "./MarkerNodeAction.js";
 import { assert } from "../../../core/assert.js";
 
 export class MarkerNodeActionSequence extends MarkerNodeAction {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {MarkerNodeAction[]}
-         */
-        this.elements = [];
-    }
+
+    /**
+     *
+     * @type {MarkerNodeAction[]}
+     */
+    elements = [];
 
     /**
      *

package/src/generation/markers/actions/MarkerNodeProcessingRuleSet.js

@@ -3,13 +3,11 @@ import { TaskSignal } from "../../../core/process/task/TaskSignal.js";
 import { assert } from "../../../core/assert.js";
 
 export class MarkerNodeProcessingRuleSet {
-    constructor() {
-        /**
-         *
-         * @type {MarkerProcessingRule[]}
-         */
-        this.elements = [];
-    }
+    /**
+     *
+     * @type {MarkerProcessingRule[]}
+     */
+    elements = [];
 
     /**
      *

package/src/generation/markers/actions/MarkerProcessingRule.js

@@ -1,31 +1,30 @@
 import { assert } from "../../../core/assert.js";
 
 export class MarkerProcessingRule {
-    constructor() {
-        /**
-         * @type {MarkerNodeMatcher}
-         */
-        this.matcher = null;
-
-
-        /**
-         *
-         * @type {MarkerNodeTransformer[]}
-         */
-        this.transformers = [];
-
-        /**
-         *
-         * @type {MarkerNodeAction}
-         */
-        this.action = null;
-
-        /**
-         * If this rule is applied, no other rules may be applied to the same node
-         * @type {boolean}
-         */
-        this.consume = true;
-    }
+
+    /**
+     * @type {MarkerNodeMatcher}
+     */
+    matcher = null;
+
+
+    /**
+     *
+     * @type {MarkerNodeTransformer[]}
+     */
+    transformers = [];
+
+    /**
+     *
+     * @type {MarkerNodeAction}
+     */
+    action = null;
+
+    /**
+     * If this rule is applied, no other rules may be applied to the same node
+     * @type {boolean}
+     */
+    consume = true;
 
     /**
      *
@@ -81,6 +80,6 @@ export class MarkerProcessingRule {
             transformer.initialize(grid, seed);
         }
 
-        this.action.initialize(grid,ecd, seed);
+        this.action.initialize(grid, ecd, seed);
     }
 }

package/src/generation/markers/actions/placement/MarkerNodeEntityProcessorClingToTerrain.js

@@ -6,21 +6,18 @@ import { obtainTerrain } from "../../../../engine/ecs/terrain/util/obtainTerrain
 const p = new SurfacePoint3();
 
 export class MarkerNodeEntityProcessorClingToTerrain extends MarkerNodeEntityProcessor {
-    constructor() {
-        super();
-
-        /**
-         * @private
-         * @type {Terrain}
-         */
-        this.terrain = null;
-
-        /**
-         *
-         * @type {boolean}
-         */
-        this.normalAlign = false;
-    }
+
+    /**
+     * @private
+     * @type {Terrain}
+     */
+    terrain = null;
+
+    /**
+     *
+     * @type {boolean}
+     */
+    normalAlign = false;
 
     /**
      *

package/src/generation/markers/actions/placement/MarkerNodeEntityProcessorRandomRotation.js

@@ -3,12 +3,9 @@ import { seededRandom } from "../../../../core/math/random/seededRandom.js";
 import { Transform } from "../../../../engine/ecs/transform/Transform.js";
 
 export class MarkerNodeEntityProcessorRandomRotation extends MarkerNodeEntityProcessor {
-    constructor() {
-        super();
 
-        this.__seed = 0;
-        this.__random = seededRandom(0);
-    }
+    __seed = 0;
+    __random = seededRandom(0);
 
     static from() {
         return new MarkerNodeEntityProcessorRandomRotation();

package/src/generation/markers/actions/placement/MarkerNodeEntityProcessorSequence.js

@@ -2,15 +2,12 @@ import { MarkerNodeEntityProcessor } from "./MarkerNodeEntityProcessor.js";
 import { assert } from "../../../../core/assert.js";
 
 export class MarkerNodeEntityProcessorSequence extends MarkerNodeEntityProcessor {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {MarkerNodeEntityProcessor[]}
-         */
-        this.elements = [];
-    }
+
+    /**
+     *
+     * @type {MarkerNodeEntityProcessor[]}
+     */
+    elements = [];
 
     /**
      *

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

@@ -1,8 +1,8 @@
 import { seededRandom } from "../../../../core/math/random/seededRandom.js";
 import { MarkerNodeAction } from "../MarkerNodeAction.js";
 import { assert } from "../../../../core/assert.js";
-import { compareNumbersAscending } from "../../../../core/function/Functions.js";
 import { binarySearchHighIndex } from "../../../../core/collection/array/binarySearchHighIndex.js";
+import { number_compare_ascending } from "../../../../core/primitives/numbers/number_compare_ascending.js";
 
 /**
  *
@@ -11,17 +11,14 @@ import { binarySearchHighIndex } from "../../../../core/collection/array/binaryS
 const evaluatedWeights = [];
 
 export class MarkerNodeActionSelectWeighted extends MarkerNodeAction {
-    constructor() {
-        super();
 
-        /**
-         *
-         * @type {MarkerNodeActionWeightedElement[]}
-         */
-        this.elements = [];
+    /**
+     *
+     * @type {MarkerNodeActionWeightedElement[]}
+     */
+    elements = [];
 
-        this.__random = seededRandom(0);
-    }
+    __random = seededRandom(0);
 
     /**
      *
@@ -97,7 +94,7 @@ export class MarkerNodeActionSelectWeighted extends MarkerNodeAction {
 
         const targetWeight = this.__random() * totalWeight;
 
-        const index = binarySearchHighIndex(evaluatedWeights, targetWeight, compareNumbersAscending, 0, n - 1);
+        const index = binarySearchHighIndex(evaluatedWeights, targetWeight, number_compare_ascending, 0, n - 1);
 
         const targetElement = elements[index];