@woosh/meep-engine 2.78.1 → 2.80.0

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

@@ -1,16 +1,17 @@
-import {assert} from "../../../assert.js";
-import {isArrayEqual} from "../../../collection/array/isArrayEqual.js";
+import { assert } from "../../../assert.js";
+import { isArrayEqual } from "../../../collection/array/isArrayEqual.js";
 import Signal from "../../../events/signal/Signal.js";
-import {invokeObjectToJSON} from "../../object/invokeObjectToJSON.js";
-import {NodeParameterDataType} from "./parameter/NodeParameterDataType.js";
-import {NodeParameterDescription} from "./parameter/NodeParameterDescription.js";
-import {Port} from "./Port.js";
-import {PortDirection} from "./PortDirection.js";
+import { invokeObjectToJSON } from "../../object/invokeObjectToJSON.js";
+import { NodeParameterDataType } from "./parameter/NodeParameterDataType.js";
+import { NodeParameterDescription } from "./parameter/NodeParameterDescription.js";
+import { Port } from "./Port.js";
+import { PortDirection } from "./PortDirection.js";
 
 
 /**
+ * @template T
  * @private
- * @param {{id:number}[]} things
+ * @param {T[]} things
  * @returns {number}
  */
 function pickNewSetId(things) {
@@ -181,7 +182,7 @@ export class NodeDescription {
 
     /**
      *
-     * @param {BinaryDataType} type
+     * @param {DataType} type
      * @param {String} name
      * @param {PortDirection} direction
      */
@@ -338,6 +339,7 @@ export class NodeDescription {
             }
         }
 
+        // port not found
         return undefined;
     }
 
@@ -380,7 +382,7 @@ export class NodeDescription {
      * @param name
      * @param {NodeRegistry} registry
      */
-    fromJSON({ports, id, name}, registry) {
+    fromJSON({ ports, id, name }, registry) {
         this.id = id;
         this.name = name;
         this.ports = ports.map(p => Port.fromJSON(p, registry));

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,16 @@ 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");
+});

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/ik/OneBoneSurfaceAlignmentSolver.js

@@ -1,6 +1,6 @@
 import { SurfacePoint3 } from "../../../core/geom/3d/SurfacePoint3.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
-import { v3_computeOffsetVector } from "../../../core/geom/vec3/v3_computeOffsetVector.js";
+import { v3_displace_in_direction } from "../../../core/geom/vec3/v3_displace_in_direction.js";
 import { v3_dot } from "../../../core/geom/vec3/v3_dot.js";
 import { v3_length } from "../../../core/geom/vec3/v3_length.js";
 import Vector3 from "../../../core/geom/Vector3.js";
@@ -116,7 +116,7 @@ export class OneBoneSurfaceAlignmentSolver extends IKSolver {
 
         const targetOffsetDistance = constraint.offset * bone_scale;
 
-        v3_computeOffsetVector(
+        v3_displace_in_direction(
             targetPosition,
             targetOffsetDistance,
             contactPosition.x, contactPosition.y, contactPosition.z,

package/src/engine/ecs/ik/TwoBoneInverseKinematicsSolver.js

@@ -1,7 +1,7 @@
 import { assert } from "../../../core/assert.js";
 import { SurfacePoint3 } from "../../../core/geom/3d/SurfacePoint3.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
-import { v3_computeOffsetVector } from "../../../core/geom/vec3/v3_computeOffsetVector.js";
+import { v3_displace_in_direction } from "../../../core/geom/vec3/v3_displace_in_direction.js";
 import { v3_dot } from "../../../core/geom/vec3/v3_dot.js";
 import { v3_length } from "../../../core/geom/vec3/v3_length.js";
 import Vector3 from "../../../core/geom/Vector3.js";
@@ -255,7 +255,7 @@ export class TwoBoneInverseKinematicsSolver extends IKSolver {
 
         const targetOffsetDistance = constraint.offset * limbLength;
 
-        v3_computeOffsetVector(
+        v3_displace_in_direction(
             targetPosition,
             targetOffsetDistance,
             contactPosition.x, contactPosition.y, contactPosition.z,

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/ecs/transform-attachment/TransformAttachment.js

@@ -1,5 +1,5 @@
-import { Transform } from "../transform/Transform.js";
 import { assert } from "../../../core/assert.js";
+import { Transform } from "../transform/Transform.js";
 
 export const TransformAttachmentFlags = {
     /**
@@ -15,6 +15,7 @@ export class TransformAttachment {
 
     /**
      * transform relative to the attachment target
+     * Think of it as "local transform"
      * @type {Transform}
      */
     transform = new Transform();

package/src/engine/ecs/transform-attachment/TransformAttachmentSystem.js

@@ -1,7 +1,9 @@
+import { min2 } from "../../../core/math/min2.js";
+import { ResourceAccessKind } from "../../../core/model/ResourceAccessKind.js";
+import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessSpecification.js";
 import { System } from "../System.js";
-import { TransformAttachment, TransformAttachmentFlags } from "./TransformAttachment.js";
 import { Transform } from "../transform/Transform.js";
-import { min2 } from "../../../core/math/min2.js";
+import { TransformAttachment, TransformAttachmentFlags } from "./TransformAttachment.js";
 
 /**
  * @readonly
@@ -47,7 +49,10 @@ class UpdateContext {
     }
 
     update() {
-        this.transform.multiplyTransforms(this.parent_transform, this.attachment.transform);
+        this.transform.multiplyTransforms(
+            this.parent_transform,
+            this.attachment.transform
+        );
     }
 
     /**
@@ -70,51 +75,51 @@ class UpdateContext {
     link() {
         const t_parent = this.parent_transform;
 
-        t_parent.position.onChanged.add(this.update, this);
-        t_parent.rotation.onChanged.add(this.update, this);
-        t_parent.scale.onChanged.add(this.update, this);
+        t_parent.subscribe(this.update, this);
 
         const t_attachment = this.attachment.transform;
-        t_attachment.position.onChanged.add(this.update,this);
-        t_attachment.rotation.onChanged.add(this.update,this);
-        t_attachment.scale.onChanged.add(this.update,this);
+
+        t_attachment.subscribe(this.update, this);
     }
 
     unlink() {
         const transform = this.parent_transform;
 
-        transform.position.onChanged.remove(this.update, this);
-        transform.rotation.onChanged.remove(this.update, this);
-        transform.scale.onChanged.remove(this.update, this);
+        transform.unsubscribe(this.update, this);
 
         const t_attachment = this.attachment.transform;
-        t_attachment.position.onChanged.remove(this.update,this);
-        t_attachment.rotation.onChanged.remove(this.update,this);
-        t_attachment.scale.onChanged.remove(this.update,this);
+
+        t_attachment.unsubscribe(this.update, this);
     }
 }
 
 export class TransformAttachmentSystem extends System {
+
+    /**
+     *
+     * @type {UpdateContext[]}
+     * @private
+     */
+    __contexts = [];
+
+    /**
+     *
+     * @type {UpdateContext[]}
+     * @private
+     */
+    __queue = [];
+    __queue_size = 0;
+    __queue_cursor = 0;
+
     constructor() {
         super();
 
         this.dependencies = [TransformAttachment, Transform];
 
-        /**
-         *
-         * @type {UpdateContext[]}
-         * @private
-         */
-        this.__contexts = [];
-
-        /**
-         *
-         * @type {UpdateContext[]}
-         * @private
-         */
-        this.__queue = [];
-        this.__queue_size = 0;
-        this.__queue_cursor = 0;
+        this.components_used = [
+            ResourceAccessSpecification.from(TransformAttachment, ResourceAccessKind.Read),
+            ResourceAccessSpecification.from(Transform, ResourceAccessKind.Read | ResourceAccessKind.Write),
+        ];
     }
 
     /**
@@ -142,6 +147,12 @@ export class TransformAttachmentSystem extends System {
         this.__queue[this.__queue_size++] = ctx;
     }
 
+    /**
+     *
+     * @param {number} entity
+     * @returns {boolean}
+     * @private
+     */
     __dequeue_entity(entity) {
         for (let i = 0; i < this.__queue_size; i++) {
             const ctx = this.__queue[i];
@@ -170,9 +181,7 @@ export class TransformAttachmentSystem extends System {
         ctx.entity = entity;
 
 
-        const ecd = this.entityManager.dataset;
-
-        ctx.ecd = ecd;
+        ctx.ecd = this.entityManager.dataset;
 
         if (ctx.bind_parent()) {
             this.__finalize_link(ctx);
@@ -207,12 +216,14 @@ export class TransformAttachmentSystem extends System {
 
     update(timeDelta) {
         const step_count = min2(this.__queue_size, QUEUE_ITERATION_COUNT);
+
         for (let i = 0; i < step_count; i++) {
             const index = this.__queue_cursor % this.__queue_size;
 
             const ctx = this.__queue[index];
 
             if (ctx.bind_parent()) {
+                // parent obtained
                 this.__finalize_link(ctx);
 
                 this.__queue.splice(index, 1);
@@ -222,5 +233,6 @@ export class TransformAttachmentSystem extends System {
                 this.__queue_cursor++;
             }
         }
+
     }
 }

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