@woosh/meep-engine 2.79.0 → 2.80.1

package/src/core/model/node-graph/node/NodeDescription.spec.js

@@ -1,5 +1,5 @@
-import { NodeDescription } from "./NodeDescription.js";
 import { DataType } from "../DataType.js";
+import { NodeDescription } from "./NodeDescription.js";
 import { PortDirection } from "./PortDirection.js";
 
 const DUMMY_TYPE = DataType.from(0, 'dummy');
@@ -12,3 +12,54 @@ test('ports are assigned unique IDs', () => {
 
     expect(id_a).not.toEqual(id_b);
 });
+
+test("get port by ID", () => {
+    const node = new NodeDescription();
+
+    expect(node.getPortById(1)).toBeNull();
+
+    const id = node.createPort(DUMMY_TYPE, "a", PortDirection.In);
+
+    const port = node.getPortById(id);
+
+    expect(port).not.toBeNull();
+    expect(port.name).toBe("a");
+});
+
+test("get ports by name", () => {
+
+    const node = new NodeDescription();
+
+    expect(node.getPortsByName("a")).toEqual([]);
+
+    node.createPort(DUMMY_TYPE, "a", PortDirection.In);
+
+    const result_0 = node.getPortsByName("a");
+    expect(result_0.length).toBe(1);
+    expect(result_0[0].name).toBe("a");
+
+    node.createPort(DUMMY_TYPE, "b", PortDirection.In);
+
+    const result_1 = node.getPortsByName("a");
+    expect(result_1.length).toBe(1);
+    expect(result_1[0].name).toBe("a");
+});
+
+test("delete port", () => {
+    const node = new NodeDescription();
+
+    expect(node.deletePort(1)).toBe(false);
+
+    const id = node.createPort(DUMMY_TYPE, "a", PortDirection.In);
+
+    expect(node.deletePort(id)).toBe(true);
+
+    expect(node.getPorts()).toEqual([]);
+});
+
+test("toString", () => {
+    const node = new NodeDescription();
+
+    expect(typeof node.toString()).toBe("string");
+    expect(node.toString().length).toBeGreaterThan(0);
+});

package/src/core/model/node-graph/node/NodeInstancePortReference.spec.js

@@ -0,0 +1,66 @@
+import { DataType } from "../DataType.js";
+import { NodeGraph } from "../NodeGraph.js";
+import { NodeDescription } from "./NodeDescription.js";
+import { NodeInstancePortReference } from "./NodeInstancePortReference.js";
+import { PortDirection } from "./PortDirection.js";
+
+const DUMMY_TYPE = DataType.from(0, 'dummy');
+test("constructor does not throw", () => {
+    new NodeInstancePortReference()
+});
+
+test("outgoing connections", () => {
+    const nd = new NodeDescription();
+    const port_a_id = nd.createPort(DUMMY_TYPE, "a", PortDirection.Out);
+    const port_b_id = nd.createPort(DUMMY_TYPE, "b", PortDirection.In);
+
+
+    const graph = new NodeGraph();
+    const node_instance_id = graph.createNode(nd);
+
+    const port_a_ref = graph.getConnectionEndpoint(node_instance_id, port_a_id);
+
+    expect(port_a_ref.outConnections).toEqual([]);
+
+    const connection_id = graph.createConnection(node_instance_id, port_a_id, node_instance_id, port_b_id);
+
+    const connection = graph.getConnection(connection_id);
+
+    expect(port_a_ref.outConnections).toEqual([connection]);
+});
+
+test("incoming connections", () => {
+    const nd = new NodeDescription();
+    const port_a_id = nd.createPort(DUMMY_TYPE, "a", PortDirection.Out);
+    const port_b_id = nd.createPort(DUMMY_TYPE, "b", PortDirection.In);
+
+
+    const graph = new NodeGraph();
+    const node_instance_id = graph.createNode(nd);
+
+    const port_b_ref = graph.getConnectionEndpoint(node_instance_id, port_b_id);
+
+    expect(port_b_ref.inConnections).toEqual([]);
+
+    const connection_id = graph.createConnection(node_instance_id, port_a_id, node_instance_id, port_b_id);
+
+    const connection = graph.getConnection(connection_id);
+
+    expect(port_b_ref.inConnections).toEqual([connection]);
+});
+
+test("hash", () => {
+
+    const nd = new NodeDescription();
+    const port_a_id = nd.createPort(DUMMY_TYPE, "a", PortDirection.Out);
+
+
+    const graph = new NodeGraph();
+    const node_instance_id = graph.createNode(nd);
+
+    const port_a_ref = graph.getConnectionEndpoint(node_instance_id, port_a_id);
+
+    expect(port_a_ref.hash()).toEqual(port_a_ref.hash());
+    expect(typeof port_a_ref.hash()).toBe("number");
+    expect(Number.isInteger(port_a_ref.hash())).toBe(true);
+});

package/src/core/model/node-graph/util/graph_clone_by_node_subset.js

@@ -1,16 +1,13 @@
-import { NodeGraph } from "../NodeGraph.js";
 import { assert } from "../../../assert.js";
+import { NodeGraph } from "../NodeGraph.js";
 import { graph_collect_connections_amongst_nodes } from "./graph_collect_connections_amongst_nodes.js";
 
 /**
  * Clone portion of a graph as a new graph, retaining connections amongst those nodes
- * @param {NodeGraph} graph
  * @param {NodeInstance[]} nodes
+ * @returns {NodeGraph}
  */
-export function graph_clone_by_node_subset({ graph, nodes }) {
-
-    assert.defined(graph, 'graph');
-    assert.notNull(graph, 'graph');
+export function graph_clone_by_node_subset({ nodes }) {
 
     assert.defined(nodes, 'nodes');
     assert.notNull(nodes, 'nodes');
@@ -18,7 +15,7 @@ export function graph_clone_by_node_subset({ graph, nodes }) {
 
     const result = new NodeGraph();
 
-    const connections = graph_collect_connections_amongst_nodes({ graph, nodes });
+    const connections = graph_collect_connections_amongst_nodes({ nodes });
 
     result.mergeFragment({
         nodes,

package/src/core/model/node-graph/util/graph_collect_connections_amongst_nodes.js

@@ -1,11 +1,9 @@
 /**
  * Given a graph and a set of nodes, get all connections that connect these nodes amongst themselves
- * @param {NodeGraph} graph
  * @param {NodeInstance[]} nodes
  * @returns {Connection[]}
  */
 export function graph_collect_connections_amongst_nodes({
-                                                            graph,
                                                             nodes
                                                         }) {
 

package/src/core/model/object/objectKeyByValue.js

@@ -1,8 +1,9 @@
 /**
- *
+ * Given an object and a value, find the first property with matching value and returns name of that property
+ * Useful for working with ENUM-like objects
  * @param {Object<T>} object
  * @param {T} value
- * @returns {string|undefined}
+ * @returns {string|undefined} name of the property, or undefined if property not found
  */
 export function objectKeyByValue(object, value) {
     for (let i in object) {

package/src/engine/ecs/renderable/Renderable.js

@@ -5,7 +5,7 @@
 
 import { BvhClient } from "../../../core/bvh2/bvh3/BvhClient.js";
 import { AABB3 } from "../../../core/geom/3d/aabb/AABB3.js";
-import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
+import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/mat4/MATRIX_4_IDENTITY.js";
 import {
     expand_aabb_by_transformed_three_object
 } from "../../graphics/three/expand_aabb_by_transformed_three_object.js";

package/src/engine/ecs/terrain/ecs/TerrainSystem.js

@@ -5,7 +5,7 @@ import {
 } from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_frustum.js";
 import { noop } from "../../../../core/function/Functions.js";
 import { read_three_planes_to_array } from "../../../../core/geom/3d/frustum/read_three_planes_to_array.js";
-import { MATRIX_4_IDENTITY } from "../../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
+import { MATRIX_4_IDENTITY } from "../../../../core/geom/3d/mat4/MATRIX_4_IDENTITY.js";
 import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
 import { CameraSystem } from '../../../graphics/ecs/camera/CameraSystem.js';
 import { System } from '../../System.js';

package/src/engine/ecs/terrain/tiles/TerrainTile.spec.js

@@ -1,5 +1,5 @@
+import { MATRIX_4_IDENTITY } from "../../../../core/geom/3d/mat4/MATRIX_4_IDENTITY.js";
 import TerrainTile from "./TerrainTile.js";
-import { MATRIX_4_IDENTITY } from "../../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
 
 test("constructor does not throw", () => {
     new TerrainTile();
@@ -21,5 +21,5 @@ test("using 'dispose' method on newly created tile", () => {
     const tile = new TerrainTile();
 
     expect(() => tile.dispose()).not.toThrow();
-    
+
 });

package/src/engine/ecs/transform/Transform.js

@@ -5,9 +5,9 @@
 import { assert } from "../../../core/assert.js";
 import { compose_matrix4_array } from "../../../core/geom/3d/compose_matrix4_array.js";
 import { decompose_matrix_4_array } from "../../../core/geom/3d/decompose_matrix_4_array.js";
-import { allocate_transform_m4 } from "../../../core/geom/3d/matrix/allocate_transform_m4.js";
-import { m4_multiply } from "../../../core/geom/3d/matrix/m4_multiply.js";
-import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
+import { allocate_transform_m4 } from "../../../core/geom/3d/mat4/allocate_transform_m4.js";
+import { m4_multiply } from "../../../core/geom/3d/mat4/m4_multiply.js";
+import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/mat4/MATRIX_4_IDENTITY.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
 import Vector3 from "../../../core/geom/Vector3.js";
 import { TransformFlags } from "./TransformFlags.js";

package/src/engine/ecs/transform/Transform.spec.js

@@ -1,7 +1,7 @@
-import { Transform } from "./Transform.js";
-import Vector3 from "../../../core/geom/Vector3.js";
+import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/mat4/MATRIX_4_IDENTITY.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
-import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
+import Vector3 from "../../../core/geom/Vector3.js";
+import { Transform } from "./Transform.js";
 import { TransformFlags } from "./TransformFlags.js";
 
 test("constructor does not throw", () => {

package/src/engine/graphics/ecs/path/entity/testEntityPath.js

@@ -1,16 +1,19 @@
-import RenderSystem from "../../../../ecs/systems/RenderSystem.js";
-import { makeEngineOptionsModel } from "../../../../../../../model/game/options/makeEngineOptionsModel.js";
 import { makeMirEngineConfig } from "../../../../../../../model/game/makeMirEngineConfig.js";
-import { EngineHarness } from "../../../../EngineHarness.js";
-import { EntityPath } from "./EntityPath.js";
-import Path from "../../../../navigation/ecs/components/Path.js";
+import { makeEngineOptionsModel } from "../../../../../../../model/game/options/makeEngineOptionsModel.js";
 import Vector3 from "../../../../../core/geom/Vector3.js";
-import { EntityPathStyle } from "./EntityPathStyle.js";
-import { EntityPathMarkerDefinition } from "./EntityPathMarkerDefinition.js";
+import {
+    v3_computeCatmullRomSplineUniformDistance
+} from "../../../../../core/math/spline/v3_computeCatmullRomSplineUniformDistance.js";
+import { Animation } from "../../../../ecs/animation/Animation.js";
 import { EntityBlueprint } from "../../../../ecs/EntityBlueprint.js";
+import RenderSystem from "../../../../ecs/systems/RenderSystem.js";
 import { Transform } from "../../../../ecs/transform/Transform.js";
+import { EngineHarness } from "../../../../EngineHarness.js";
+import Path from "../../../../navigation/ecs/components/Path.js";
 import Mesh from "../../mesh/Mesh.js";
-import { Animation } from "../../../../ecs/animation/Animation.js";
+import { EntityPath } from "./EntityPath.js";
+import { EntityPathMarkerDefinition } from "./EntityPathMarkerDefinition.js";
+import { EntityPathStyle } from "./EntityPathStyle.js";
 
 const engineHarness = new EngineHarness();
 
@@ -38,12 +41,15 @@ function main(engine) {
 
     const path = new EntityPath();
     const _p = new Path();
-    _p.setPositionsFromVectorArray(Path.smoothPath([
+
+    const curve_points = v3_computeCatmullRomSplineUniformDistance([
         new Vector3(3, 0, 3),
         new Vector3(7, 0, 3),
         new Vector3(7, 0, 7),
         new Vector3(3, 0, 7)
-    ], 50));
+    ], 50);
+
+    _p.setPositionsFromVectorArray(curve_points);
 
     const style = new EntityPathStyle();
     style.spacing = 1;

package/src/engine/graphics/material/optimization/MaterialOptimizationContext.js

@@ -16,7 +16,7 @@ import { typedArrayToDataType } from "../../../../core/collection/array/typed/ty
 import { collectIteratorValueToArray } from "../../../../core/collection/collectIteratorValueToArray.js";
 import { HashMap } from "../../../../core/collection/map/HashMap.js";
 import AABB2 from "../../../../core/geom/AABB2.js";
-import { MaxRectanglesPacker } from "../../../../core/geom/packing/max-rect/MaxRectangles.js";
+import { MaxRectanglesPacker } from "../../../../core/geom/packing/max-rect/MaxRectanglesPacker.js";
 import { computeMaterialEquality } from "../../../asset/loaders/material/computeMaterialEquality.js";
 import { computeMaterialHash } from "../../../asset/loaders/material/computeMaterialHash.js";
 import { TextureAttachmentsByMaterialType } from "../../../asset/loaders/material/TextureAttachmensByMaterialType.js";

package/src/engine/graphics/texture/atlas/TextureAtlas.js

@@ -5,7 +5,7 @@ import {
     DataType2TypedArrayConstructorMapping
 } from "../../../../core/binary/type/DataType2TypedArrayConstructorMapping.js";
 import Signal from "../../../../core/events/signal/Signal.js";
-import { MaxRectanglesPacker } from "../../../../core/geom/packing/max-rect/MaxRectangles.js";
+import { MaxRectanglesPacker } from "../../../../core/geom/packing/max-rect/MaxRectanglesPacker.js";
 import Vector2 from "../../../../core/geom/Vector2.js";
 import IdPool from "../../../../core/IdPool.js";
 import { max2 } from "../../../../core/math/max2.js";

package/src/engine/graphics/texture/atlas/gpu/WebGLTextureAtlas.js

@@ -1,6 +1,3 @@
-import { AtlasPatch } from "../AtlasPatch.js";
-import IdPool from "../../../../../core/IdPool.js";
-import { MaxRectanglesPacker } from "../../../../../core/geom/packing/max-rect/MaxRectangles.js";
 import {
     ClampToEdgeWrapping,
     DataTexture,
@@ -11,7 +8,10 @@ import {
     UnsignedByteType,
     UVMapping
 } from "three";
+import { MaxRectanglesPacker } from "../../../../../core/geom/packing/max-rect/MaxRectanglesPacker.js";
+import IdPool from "../../../../../core/IdPool.js";
 import { formatToChannelCount } from "../../formatToChannelCount.js";
+import { AtlasPatch } from "../AtlasPatch.js";
 
 export class WebGLTextureAtlas {
     constructor({

package/src/engine/graphics/three/expand_aabb_by_transformed_three_object.js

@@ -1,7 +1,7 @@
 import { aabb3_array_combine } from "../../../core/geom/3d/aabb/aabb3_array_combine.js";
 import { aabb3_from_threejs_geometry } from "../../../core/geom/3d/aabb/aabb3_from_threejs_geometry.js";
 import { aabb3_matrix4_project } from "../../../core/geom/3d/aabb/aabb3_matrix4_project.js";
-import { m4_multiply } from "../../../core/geom/3d/matrix/m4_multiply.js";
+import { m4_multiply } from "../../../core/geom/3d/mat4/m4_multiply.js";
 import { ensureGeometryBoundingBox } from "../util/ensureGeometryBoundingBox.js";
 
 const scratch_aabb3_array_0 = new Float32Array(6);

package/src/engine/graphics/three/expand_aabb_by_transformed_three_object.spec.js

@@ -1,6 +1,6 @@
-import { expand_aabb_by_transformed_three_object } from "./expand_aabb_by_transformed_three_object.js";
-import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
 import { BufferAttribute, BufferGeometry, Group, Mesh } from "three";
+import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/mat4/MATRIX_4_IDENTITY.js";
+import { expand_aabb_by_transformed_three_object } from "./expand_aabb_by_transformed_three_object.js";
 
 /**
  *

package/src/engine/navigation/ecs/components/Path.js

@@ -3,7 +3,6 @@
  */
 
 
-import { CatmullRomCurve3 } from "three";
 import { assert } from "../../../../core/assert.js";
 import { BinaryDataType } from "../../../../core/binary/type/BinaryDataType.js";
 import { RowFirstTable } from "../../../../core/collection/table/RowFirstTable.js";
@@ -18,6 +17,9 @@ import { min2 } from "../../../../core/math/min2.js";
 import {
     computeNonuniformCatmullRomSplineSample
 } from "../../../../core/math/spline/computeNonuniformCatmullRomSplineSample.js";
+import {
+    v3_computeCatmullRomSplineUniformDistance
+} from "../../../../core/math/spline/v3_computeCatmullRomSplineUniformDistance.js";
 import { AttributeSpec } from "../../../graphics/geometry/AttributeSpec.js";
 import { VertexDataSpec } from "../../../graphics/geometry/VertexDataSpec.js";
 import { InterpolationType } from "./InterpolationType.js";
@@ -701,22 +703,13 @@ class Path {
     }
 
     /**
-     *
+     * @deprecated use {@link v3_computeCatmullRomSplineUniformDistance} directly instead
      * @param {Vector3[]} points
      * @param {number} samples
      * @returns {Vector3[]}
      */
     static smoothPath(points, samples) {
-
-        const curve = new CatmullRomCurve3(points);
-        const points2 = curve.getPoints(samples);
-
-        //Convert to engine vector format
-        const result = points2.map(function (p) {
-            return new Vector3(p.x, p.y, p.z);
-        });
-
-        return result;
+        throw new Error('Deprecated, use v3_computeCatmullRomSplineUniformDistance directly instead. Please note, there is already a CatmullRom interpolation type as well');
     }
 }
 

package/src/engine/simulation/Ticker.js

@@ -1,27 +1,42 @@
 /**
  * Created by Alex on 06/05/2015.
  */
-import Clock from '../Clock.js';
-import { SignalHandler } from "../../core/events/signal/SignalHandler.js";
 import { assert } from "../../core/assert.js";
+import Signal from "../../core/events/signal/Signal.js";
+import Clock from '../Clock.js';
 
+/**
+ * Simulation tick generator
+ * Dispatches "tick" every animation frame or "maxDelay" time, whichever happens to be soonest
+ * This is essentially the timing bus that all the simulation systems subscribe to for their step advancement
+ */
 class Ticker {
     /**
      * @readonly
      * @type {Clock}
      */
     clock = new Clock();
+
     /**
      * @private
      * @type {boolean}
      */
-    isRunning = false;
+    #isRunning = false;
+
 
     /**
-     *
-     * @type {SignalHandler[]}
+     * Dispatches time delta in seconds since last tick
+     * @readonly
+     * @type {Signal<number>}
      */
-    callbacks = [];
+    onTick = new Signal();
+
+    /**
+     * @deprecated
+     */
+    get callbacks() {
+        throw new Error('deprecated, use onTick signal instead');
+    }
 
     /**
      *
@@ -32,80 +47,44 @@ class Ticker {
     }
 
     /**
-     *
+     * @deprecated use onTick signal directly instead
      * @param {function} callback
      * @param {*} [thisArg]
      */
     subscribe(callback, thisArg) {
-        const handler = new SignalHandler(callback, thisArg);
-
-        this.callbacks.push(handler);
+        this.onTick.add(callback, thisArg);
     }
 
     /**
-     *
+     * @deprecated use onTick signal directly instead
      * @param {function} callback
      * @param {*} [thisArg]
      */
     unsubscribe(callback, thisArg) {
-        assert.isFunction(callback, 'callback');
-
-        const callbacks = this.callbacks;
-        const n = callbacks.length;
-        for (let i = 0; i < n; i++) {
-            const cb = callbacks[i];
-
-            if (cb.handle === callback) {
-                if (thisArg !== undefined) {
-                    if (thisArg === cb.context) {
-                        callbacks.splice(i, 1);
-                        return;
-                    }
-                } else {
-                    callbacks.splice(i, 1);
-                    return;
-                }
-            }
-        }
-
+        this.onTick.remove(callback, thisArg);
     }
 
     /**
      *
-     * @param {number} maxTimeout
+     * @param {number} [maxTimeout]
      */
     start({ maxTimeout = 100 } = {}) {
-        assert.typeOf(maxTimeout, 'number', 'maxTimeout');
+        assert.isNumber(maxTimeout, 'maxTimeout');
+        assert.greaterThan(maxTimeout, 0);
 
-
-        const self = this;
         let timeout = null;
         let animationFrame = null;
 
-        this.isRunning = true;
-
-        function update() {
-            if (self.isRunning) {
-
-                const delta = self.clock.getDelta();
+        this.#isRunning = true;
 
-                const callbacks = self.callbacks;
-
-                for (let i = 0; i < callbacks.length; i++) {
-                    const callback = callbacks[i];
-
-                    try {
-                        callback.handle.call(callback.context, delta);
-                    } catch (e) {
-                        console.error('Error in ticker subscription:', e);
-                    }
-
-                }
+        const update = () => {
+            if (!this.#isRunning) {
+                return;
             }
-        }
 
-        function cycle() {
-            update();
+            const delta = this.clock.getDelta();
+
+            this.onTick.send1(delta);
         }
 
         function timeoutCallback() {
@@ -122,22 +101,22 @@ class Ticker {
 
         function animate() {
             animationFrame = requestAnimationFrame(animationFrameCallback);
-            cycle();
+            update();
             timeout = setTimeout(timeoutCallback, maxTimeout);
         }
 
-        self.clock.getDelta(); //purge delta
-        self.clock.start();
+        this.clock.getDelta(); //purge delta
+        this.clock.start();
 
         requestAnimationFrame(animationFrameCallback);
     }
 
     pause() {
-        this.isRunning = false;
+        this.#isRunning = false;
     }
 
     resume() {
-        this.isRunning = true;
+        this.#isRunning = true;
     }
 }