@woosh/meep-engine 2.55.0 → 2.56.0

package/src/engine/graphics/ecs/mesh-v2/render/adapters/SGCacheKey.js

@@ -1,7 +1,15 @@
 import { DrawMode } from "../../DrawMode.js";
 
 export class SGCacheKey {
+    /**
+     * ID of geometry
+     * @type {number}
+     */
     geometry = -1;
+    /**
+     * ID of material
+     * @type {number}
+     */
     material = -1;
     /**
      *
@@ -9,9 +17,13 @@ export class SGCacheKey {
      */
     mode = DrawMode.Triangles;
 
+    /**
+     *
+     * @type {number}
+     */
     flags = 0;
 
-    hash(){
+    hash() {
         return this.geometry ^ this.material;
     }
 
@@ -20,29 +32,29 @@ export class SGCacheKey {
      * @param {SGCacheKey} other
      * @returns {boolean}
      */
-    equals(other){
+    equals(other) {
         return this.geometry === other.geometry
-        && this.material === other.material
-        && this.mode === other.mode
-        && this.flags === other.flags;
+            && this.material === other.material
+            && this.mode === other.mode
+            && this.flags === other.flags;
     }
 
     /**
      *
      * @param {SGCacheKey} other
      */
-    copy(other){
+    copy(other) {
         this.geometry = other.geometry;
         this.material = other.material;
         this.mode = other.mode;
         this.flags = other.flags;
     }
 
-    clone(){
+    clone() {
         const r = new SGCacheKey();
 
         r.copy(this);
-        
+
         return r;
     }
 
@@ -50,7 +62,7 @@ export class SGCacheKey {
      *
      * @param {ShadedGeometry} sg
      */
-    fromSG(sg){
+    fromSG(sg) {
         this.geometry = sg.geometry.id;
         this.material = sg.material.id;
         this.mode = sg.mode;

package/src/engine/graphics/ecs/mesh-v2/render/adapters/SGCacheKey.spec.js

@@ -0,0 +1,79 @@
+import { SGCacheKey } from "./SGCacheKey.js";
+import { DrawMode } from "../../DrawMode.js";
+
+test("constructor does not throw", () => {
+    new SGCacheKey()
+});
+
+test("equals", () => {
+    const a = new SGCacheKey();
+
+    a.geometry = 3;
+    a.material = 7;
+    a.mode = DrawMode.Triangles;
+    a.flags = 0xBEEF;
+
+    const b = new SGCacheKey();
+
+    b.geometry = 3;
+    b.material = 7;
+    b.mode = DrawMode.Triangles;
+    b.flags = 0xBEEF;
+
+    expect(a.equals(b)).toBe(true);
+
+    const c = new SGCacheKey();
+
+    c.geometry = 5;
+    c.material = 7;
+    c.mode = DrawMode.Triangles;
+    c.flags = 0xBEEF;
+
+    expect(a.equals(c)).toBe(false);
+
+    const d = new SGCacheKey();
+
+    d.geometry = 3;
+    d.material = 11;
+    d.mode = DrawMode.Triangles;
+    d.flags = 0xBEEF;
+
+    expect(a.equals(d)).toBe(false);
+
+    const e = new SGCacheKey();
+
+    e.geometry = 3;
+    e.material = 7;
+    e.mode = DrawMode.Points;
+    e.flags = 0xBEEF;
+
+    expect(a.equals(e)).toBe(false);
+
+    const f = new SGCacheKey();
+
+    f.geometry = 3;
+    f.material = 7;
+    f.mode = DrawMode.Triangles;
+    f.flags = 0xCAFE;
+
+    expect(a.equals(f)).toBe(false);
+
+});
+
+test("copy", () => {
+    const a = new SGCacheKey();
+
+    a.geometry = 3;
+    a.material = 7;
+    a.mode = DrawMode.Triangles;
+    a.flags = 0xBEEF;
+
+    const b = new SGCacheKey();
+
+    b.copy(a);
+
+    expect(b.geometry).toEqual(3);
+    expect(b.material).toEqual(7);
+    expect(b.mode).toEqual(DrawMode.Triangles);
+    expect(b.flags).toEqual(0xBEEF);
+});

package/src/engine/graphics/render/visibility/IncrementalDeltaSet.spec.js

@@ -1,8 +1,9 @@
 import { IncrementalDeltaSet } from "./IncrementalDeltaSet.js";
-import { compareNumbersAscending } from "../../../../core/function/Functions.js";
+
+import { number_compare_ascending } from "../../../../core/primitives/numbers/number_compare_ascending.js";
 
 test('set is sorted after insert, push 1,2', () => {
-    const set = new IncrementalDeltaSet(compareNumbersAscending);
+    const set = new IncrementalDeltaSet(number_compare_ascending);
 
     set.initializeUpdate();
 
@@ -16,7 +17,7 @@ test('set is sorted after insert, push 1,2', () => {
 });
 
 test('set is sorted after insert, push 2,1', () => {
-    const set = new IncrementalDeltaSet(compareNumbersAscending);
+    const set = new IncrementalDeltaSet(number_compare_ascending);
 
     set.initializeUpdate();
 
@@ -30,7 +31,7 @@ test('set is sorted after insert, push 2,1', () => {
 });
 
 test('set is sorted after insert, push 1,2,3', () => {
-    const set = new IncrementalDeltaSet(compareNumbersAscending);
+    const set = new IncrementalDeltaSet(number_compare_ascending);
 
     set.initializeUpdate();
 
@@ -46,7 +47,7 @@ test('set is sorted after insert, push 1,2,3', () => {
 });
 
 test('set is sorted after insert, push 3,2,1', () => {
-    const set = new IncrementalDeltaSet(compareNumbersAscending);
+    const set = new IncrementalDeltaSet(number_compare_ascending);
 
     set.initializeUpdate();
 
@@ -63,7 +64,7 @@ test('set is sorted after insert, push 3,2,1', () => {
 
 
 test('add/remove callbacks', () => {
-    const set = new IncrementalDeltaSet(compareNumbersAscending);
+    const set = new IncrementalDeltaSet(number_compare_ascending);
 
     const add_listener = jest.fn();
     const remove_listener = jest.fn();

package/src/engine/simulation/Ticker.js

@@ -6,32 +6,29 @@ import { SignalHandler } from "../../core/events/signal/SignalHandler.js";
 import { assert } from "../../core/assert.js";
 
 class Ticker {
+    /**
+     * @readonly
+     * @type {Clock}
+     */
+    clock = new Clock();
+    /**
+     * @private
+     * @type {boolean}
+     */
+    isRunning = false;
+
+    /**
+     *
+     * @type {SignalHandler[]}
+     */
+    callbacks = [];
+
     /**
      *
      * @constructor
      */
     constructor() {
-
-        /**
-         * @readonly
-         * @type {Clock}
-         */
-        this.clock = new Clock();
-
-
         this.clock.pause();
-
-        /**
-         * @private
-         * @type {boolean}
-         */
-        this.isRunning = false;
-
-        /**
-         *
-         * @type {SignalHandler[]}
-         */
-        this.callbacks = [];
     }
 
     /**

package/src/generation/GridTaskGroup.js

@@ -2,16 +2,12 @@ import TaskGroup from "../core/process/task/TaskGroup.js";
 import { GridTaskGenerator } from "./grid/GridTaskGenerator.js";
 
 export class GridTaskGroup extends GridTaskGenerator {
-    constructor() {
-        super();
 
-        /**
-         *
-         * @type {GridTaskGenerator[]}
-         */
-        this.children = [];
-
-    }
+    /**
+     *
+     * @type {GridTaskGenerator[]}
+     */
+    children = [];
 
 
     /**

package/src/generation/filtering/numeric/CellFilterCache.js

@@ -4,22 +4,18 @@ import { assert } from "../../../core/assert.js";
 
 export class CellFilterCache extends CellFilterUnaryOperation {
 
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {Sampler2D}
-         * @private
-         */
-        this.__cache = Sampler2D.float32(1, 1, 1);
-
-        /**
-         *
-         * @type {number}
-         */
-        this.scale = 1;
-    }
+    /**
+     *
+     * @type {Sampler2D}
+     * @private
+     */
+    __cache = Sampler2D.float32(1, 1, 1);
+
+    /**
+     *
+     * @type {number}
+     */
+    scale = 1;
 
     /**
      *

package/src/generation/filtering/numeric/complex/CellFilterFXAA.js

@@ -7,38 +7,37 @@ import { CellFilter } from "../../CellFilter.js";
  * Based on FXAA algorithm by NVidia
  */
 export class CellFilterFXAA extends CellFilter {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {CellFilter}
-         */
-        this.source = null;
-
-        /**
-         * 0.125 leaves less aliasing, but is softer (default!!!)
-         * 0.25 leaves more aliasing, and is sharper
-         * @type {number}
-         */
-        this.edge_threshold = 0.25;
-
-        /**
-         *  0.06 - faster but more aliasing in darks
-         *  0.05 - default
-         *  0.04 - slower and less aliasing in darks
-         * @type {number}
-         */
-        this.console_edge_threshold_min = 0.05;
-
-        /**
-         *  8.0 is sharper (default!!!)
-         *  4.0 is softer
-         *  2.0 is really soft (good only for vector renderer inputs)
-         * @type {number}
-         */
-        this.console_edge_sharpness = 2;
-    }
+
+
+    /**
+     *
+     * @type {CellFilter}
+     */
+    source = null;
+
+    /**
+     * 0.125 leaves less aliasing, but is softer (default!!!)
+     * 0.25 leaves more aliasing, and is sharper
+     * @type {number}
+     */
+    edge_threshold = 0.25;
+
+    /**
+     *  0.06 - faster but more aliasing in darks
+     *  0.05 - default
+     *  0.04 - slower and less aliasing in darks
+     * @type {number}
+     */
+    console_edge_threshold_min = 0.05;
+
+    /**
+     *  8.0 is sharper (default!!!)
+     *  4.0 is softer
+     *  2.0 is really soft (good only for vector renderer inputs)
+     * @type {number}
+     */
+    console_edge_sharpness = 2;
+
 
     /**
      *

package/src/generation/filtering/numeric/complex/CellFilterLookupTable.js

@@ -5,15 +5,12 @@ import { assert } from "../../../../core/assert.js";
 const sample = [];
 
 export class CellFilterLookupTable extends CellFilterUnaryOperation {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {ParameterLookupTable}
-         */
-        this.lut = null;
-    }
+
+    /**
+     *
+     * @type {ParameterLookupTable}
+     */
+    lut = null;
 
     /**
      *

package/src/generation/filtering/numeric/complex/CellFilterSimplexNoise.js

@@ -7,34 +7,31 @@ import { CellFilterDivide } from "../math/algebra/CellFilterDivide.js";
 import { create_simplex_noise_2d } from "../../../../core/math/noise/create_simplex_noise_2d.js";
 
 export class CellFilterSimplexNoise extends CellFilter {
-    constructor() {
-        super();
 
         /**
          * @private
          * @type {function(x:number,y:number):number}
          */
-        this.noise = null;
+        noise = null;
 
         /**
          * @private
          * @type {function}
          */
-        this.random = seededRandom(0);
+        random = seededRandom(0);
 
-        this.scale_x = 1;
-        this.scale_y = 1;
+        scale_x = 1;
+        scale_y = 1;
 
-        this.inv_scale_x = 1;
-        this.inv_scale_y = 1;
+        inv_scale_x = 1;
+        inv_scale_y = 1;
 
         /**
          * RNG Seed offset
          * @type {number}
          * @private
          */
-        this.__seed = 0;
-    }
+        __seed = 0;
 
     /**
      * Build a fractal noise filter with a given number of octaves

package/src/generation/filtering/numeric/complex/CellFilterSobel.js

@@ -5,15 +5,12 @@ import { assert } from "../../../../core/assert.js";
  * Sobel edge-detection filter
  */
 export class CellFilterSobel extends CellFilter {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {CellFilter}
-         */
-        this.source = null;
-    }
+
+    /**
+     *
+     * @type {CellFilter}
+     */
+    source = null;
 
     initialize(grid, seed) {
         super.initialize(grid, seed);

package/src/generation/filtering/numeric/math/CellFilterMembershipGeneralizedBell.js

@@ -8,27 +8,24 @@ import { bell_membership_function } from "../../../../core/math/bell_membership_
  * @see https://researchhubs.com/post/maths/fundamentals/bell-shaped-function.html
  */
 export class CellFilterMembershipGeneralizedBell extends CellFilterUnaryOperation {
-    constructor() {
-        super();
-
-
-        /**
-         * Controls window, larger value = larger window. Function will return exactly 0.5 at this distance away from center
-         * @type {number}
-         */
-        this.a = 0;
-
-        /**
-         * Slope, larger slope makes function's tails sharper, meaning that values fall off faster away from center
-         * @type {number}
-         */
-        this.b = 0;
-        /**
-         * Controls center of the bell
-         * @type {number}
-         */
-        this.c = 0;
-    }
+
+    /**
+     * Controls window, larger value = larger window. Function will return exactly 0.5 at this distance away from center
+     * @type {number}
+     */
+    a = 1;
+
+    /**
+     * Slope, larger slope makes function's tails sharper, meaning that values fall off faster away from center
+     * @type {number}
+     */
+    b = 1;
+
+    /**
+     * Controls center of the bell
+     * @type {number}
+     */
+    c = 0;
 
     static from(source, a = 1, b = 1, c = 0) {
         assert.equal(source.isCellFilter, true, 'source.isCellFilter !== true');

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

@@ -1,31 +1,30 @@
 import { CellFilter } from "../../CellFilter.js";
 
 export class AbstractCellFilterSampleGridLayer extends CellFilter {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {string}
-         */
-        this.layerId = null;
-
-        /**
-         *
-         * @type {GridDataLayer}
-         * @private
-         */
-        this.__layer = null;
-
-        this.__u_scale = 0;
-        this.__v_scale = 0;
-        /**
-         *
-         * @type {Sampler2D}
-         * @private
-         */
-        this.__sampler = null;
-    }
+
+
+    /**
+     *
+     * @type {string}
+     */
+    layerId = null;
+
+    /**
+     *
+     * @type {GridDataLayer}
+     * @private
+     */
+    __layer = null;
+
+    __u_scale = 0;
+    __v_scale = 0;
+    /**
+     *
+     * @type {Sampler2D}
+     * @private
+     */
+    __sampler = null;
+
 
     initialize(grid, seed) {
         super.initialize(grid, seed);

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

@@ -9,7 +9,7 @@ export class CellFilterSampleLayerLinear extends AbstractCellFilterSampleGridLay
      * @returns {CellFilterSampleLayerLinear}
      */
     static from(layer) {
-        assert.typeOf(layer, 'string', 'layer');
+        assert.isString(layer, 'layer');
 
         const r = new CellFilterSampleLayerLinear();
 

package/src/generation/grid/GridData.js

@@ -11,28 +11,29 @@ import { qt_collect_by_circle } from "../../core/geom/2d/quad-tree/qt_collect_by
 const marker_collection = [];
 
 export class GridData {
-    constructor() {
-        this.width = 0;
-        this.height = 0;
-
-        /**
-         *
-         * @type {OffsetScaleTransform2D}
-         */
-        this.transform = new OffsetScaleTransform2D();
-
-        /**
-         *
-         * @type {QuadTreeNode<MarkerNode>}
-         */
-        this.markers = new QuadTreeNode();
-
-        /**
-         * Discrete data layers
-         * @type {GridDataLayer[]}
-         */
-        this.layers = [];
-    }
+
+    width = 0;
+    height = 0;
+
+    /**
+     * @readonly
+     * @type {OffsetScaleTransform2D}
+     */
+    transform = new OffsetScaleTransform2D();
+
+    /**
+     * @readonly
+     * @type {QuadTreeNode<MarkerNode>}
+     */
+    markers = new QuadTreeNode();
+
+    /**
+     * Discrete data layers
+     * @readonly
+     * @type {GridDataLayer[]}
+     */
+    layers = [];
+
 
     /**
      *

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);
+});