@woosh/meep-engine 2.84.8 → 2.84.10

package/src/core/geom/3d/SurfacePoint3.js

@@ -1,6 +1,5 @@
-import Vector3 from "../Vector3.js";
-import { v3_length } from "../vec3/v3_length.js";
 import { assert } from "../../assert.js";
+import Vector3 from "../Vector3.js";
 
 /**
  * Used for representing points on a 3D surface. Used for raycasting contacts
@@ -58,44 +57,8 @@ export class SurfacePoint3 {
         assert.defined(m, 'matrix');
         assert.notNull(m, 'matrix');
 
-        // transform position
-        const p = this.position;
-
-        const p_x = p.x;
-        const p_y = p.y;
-        const p_z = p.z;
-
-        // compute perspective projection
-        const w = 1 / (m[3] * p_x + m[7] * p_y + m[11] * p_z + m[15]);
-
-        const result_p_x = (m[0] * p_x + m[4] * p_y + m[8] * p_z + m[12]) * w;
-        const result_p_y = (m[1] * p_x + m[5] * p_y + m[9] * p_z + m[13]) * w;
-        const result_p_z = (m[2] * p_x + m[6] * p_y + m[10] * p_z + m[14]) * w;
-
-        p.set(
-            result_p_x,
-            result_p_y,
-            result_p_z
-        );
-
-        // transform normal
-        const n = this.normal;
-
-        const n_x = n.x;
-        const n_y = n.y;
-        const n_z = n.z;
-
-        const result_n_x = m[0] * n_x + m[4] * n_y + m[8] * n_z;
-        const result_n_y = m[1] * n_x + m[5] * n_y + m[9] * n_z;
-        const result_n_z = m[2] * n_x + m[6] * n_y + m[10] * n_z;
-
-        const normal_multiplier = 1 / v3_length(result_n_x, result_n_y, result_n_z);
-
-        n.set(
-            result_n_x * normal_multiplier,
-            result_n_y * normal_multiplier,
-            result_n_z * normal_multiplier,
-        );
+        this.position.applyMatrix4(m);
+        this.normal.applyDirectionMatrix4(m);
     }
 
     /**

package/src/core/geom/3d/plane/plane3_compute_ray_intersection.js

@@ -30,6 +30,7 @@ export function plane3_compute_ray_intersection(
         const t = -p / denom;
 
         if (t < 0) {
+            // ray starts and points behind the plane
             return false;
         }
 
@@ -42,9 +43,10 @@ export function plane3_compute_ray_intersection(
         return true;
 
     } else {
+        // ray direction is perpendicular to the plane normal. In other words ray runs parallel to the plane
 
         if (p === 0) {
-
+            // ray origin lies on the plane
             out.set(originX, originY, originZ);
 
             return true;

package/src/core/geom/3d/topology/simplify/prototypeMeshSimplification.js

@@ -20,23 +20,23 @@ import {
     VSMShadowMap,
     WebGLRenderer
 } from "three";
-import { mergeVertices } from "three/examples/jsm/utils/BufferGeometryUtils.js";
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
 import Stats from "three/examples/jsm/libs/stats.module.js";
 import { PLYLoader } from "three/examples/jsm/loaders/PLYLoader.js";
-import { topo_mesh_to_three_buffer_geometry } from "../topo_mesh_to_three_buffer_geometry.js";
-import { TopoMesh } from "../struct/TopoMesh.js";
+import { mergeVertices } from "three/examples/jsm/utils/BufferGeometryUtils.js";
 import {
     deinterleaveBufferGeometry
 } from "../../../../../engine/graphics/geometry/buffered/deinterleaveBufferGeometry.js";
-import Vector3 from "../../../Vector3.js";
-import { simplifyTopoMesh2 } from "./simplifyTopoMesh2.js";
 import { scaleGeometryToBox } from "../../../../../engine/graphics/geometry/scaleGeometryToBox.js";
-import { computeTopoMeshBoundiningBox } from "../bounds/computeTopoMeshBoundiningBox.js";
-import { AABB3 } from "../../../../bvh2/aabb3/AABB3.js";
 import { Color } from "../../../../color/Color.js";
 import { clamp } from "../../../../math/clamp.js";
+import Vector3 from "../../../Vector3.js";
+import { AABB3 } from "../../aabb/AABB3.js";
+import { computeTopoMeshBoundiningBox } from "../bounds/computeTopoMeshBoundiningBox.js";
+import { TopoMesh } from "../struct/TopoMesh.js";
 import { three_buffer_geometry_to_topo_mesh } from "../three_buffer_geometry_to_topo_mesh.js";
+import { topo_mesh_to_three_buffer_geometry } from "../topo_mesh_to_three_buffer_geometry.js";
+import { simplifyTopoMesh2 } from "./simplifyTopoMesh2.js";
 
 
 /**

package/src/core/geom/Vector3.js

@@ -555,35 +555,32 @@ class Vector3 {
 
     /**
      *
-     * @param {ArrayList<number>|number[]|Float32Array} m4
+     * @param {ArrayLike<number>|number[]|Float32Array} m4
      */
     applyMatrix4(m4) {
         const x = this.x;
         const y = this.y;
         const z = this.z;
 
-        const _x = m4[0] * x + m4[4] * y + m4[8] * z + m4[12];
-        const _y = m4[1] * x + m4[5] * y + m4[9] * z + m4[13];
-        const _z = m4[2] * x + m4[6] * y + m4[10] * z + m4[14];
+        const w = 1 / (m4[3] * x + m4[7] * y + m4[11] * z + m4[15]);
+
+        const _x = (m4[0] * x + m4[4] * y + m4[8] * z + m4[12])* w;
+        const _y = (m4[1] * x + m4[5] * y + m4[9] * z + m4[13])* w;
+        const _z = (m4[2] * x + m4[6] * y + m4[10] * z + m4[14])* w;
 
         this.set(_x, _y, _z);
     }
 
     /**
      * Assume current vector holds a direction, transform using a matrix to produce a new directional unit vector
-     * @param {THREE.Matrix4} m
+     * @param {ArrayLike<number>|number[]|Float32Array} m4
      */
-    transformDirection_three(m) {
-
-        // input: THREE.Matrix4 affine matrix
-        // vector interpreted as a direction
-
+    applyDirectionMatrix4(m4){
         const x = this.x, y = this.y, z = this.z;
-        const e = m.elements;
 
-        const _x = e[0] * x + e[4] * y + e[8] * z;
-        const _y = e[1] * x + e[5] * y + e[9] * z;
-        const _z = e[2] * x + e[6] * y + e[10] * z;
+        const _x = m4[0] * x + m4[4] * y + m4[8] * z;
+        const _y = m4[1] * x + m4[5] * y + m4[9] * z;
+        const _z = m4[2] * x + m4[6] * y + m4[10] * z;
 
         // normalize the result
         const _l = 1 / v3_length(_x, _y, _z);
@@ -595,6 +592,20 @@ class Vector3 {
         );
     }
 
+    /**
+     * @deprecated use non-three.js version instead
+     * @param {THREE.Matrix4} m
+     */
+    transformDirection_three(m) {
+
+        // input: THREE.Matrix4 affine matrix
+        // vector interpreted as a direction
+
+        const e = m.elements;
+
+        this.applyDirectionMatrix4(e);
+    }
+
     /**
      *
      * @param {THREE.Matrix3} m

package/src/core/model/stat/LinearModifier.spec.js

@@ -1,4 +1,3 @@
-import { CombatUnitBonusSourceType } from "../../../../../model/game/logic/combat/CombatUnitBonusSourceType.js";
 import LinearModifier from "./LinearModifier.js";
 
 test("constructor doesn't throw", () => {
@@ -14,19 +13,19 @@ test("constructor parameter propagation", () => {
 
 test("equals method", () => {
     const a = new LinearModifier(3, -7);
-    a.source = CombatUnitBonusSourceType.Unknown;
+    a.source = 0;
 
     const b = new LinearModifier(3, -7);
-    b.source = CombatUnitBonusSourceType.Affliction;
+    b.source = 1;
 
     const c = new LinearModifier(3, 11);
-    c.source = CombatUnitBonusSourceType.Unknown;
+    c.source = 0;
 
     const d = new LinearModifier(13, -7);
-    d.source = CombatUnitBonusSourceType.Unknown;
+    d.source = 0;
 
     const e = new LinearModifier(3, -7);
-    e.source = CombatUnitBonusSourceType.Unknown;
+    e.source = 0;
 
     expect(a.equals(e)).toBe(true);
     expect(a.equals(b)).toBe(false);

package/src/core/process/PromiseWatcher.spec.js

@@ -24,42 +24,46 @@ function trigger() {
     };
 }
 
-test('constructor', () => {
-    const w = new PromiseWatcher();
+// TODO broken tests, skipped for now
+describe.skip("suite", () => {
 
-    expect(w.unresolvedCount.getValue()).toBe(0);
-    expect(w.unresolved.isEmpty()).toBe(true);
-});
+    test('constructor', () => {
+        const w = new PromiseWatcher();
+
+        expect(w.unresolvedCount.getValue()).toBe(0);
+        expect(w.unresolved.isEmpty()).toBe(true);
+    });
 
 
-test('add one and resolve', async () => {
-    const w = new PromiseWatcher();
+    test('add one and resolve', async () => {
+        const w = new PromiseWatcher();
 
-    const t0 = trigger();
+        const t0 = trigger();
 
-    w.add(t0.promise);
+        w.add(t0.promise);
 
-    expect(w.unresolvedCount.getValue()).toBe(1);
+        expect(w.unresolvedCount.getValue()).toBe(1);
 
-    t0.resolve();
+        t0.resolve();
 
-    await t0.promise;
+        await t0.promise;
 
-    expect(w.unresolvedCount.getValue()).toBe(0);
-});
+        expect(w.unresolvedCount.getValue()).toBe(0);
+    });
 
-test('add one and reject', async () => {
-    const w = new PromiseWatcher();
+    test('add one and reject', async () => {
+        const w = new PromiseWatcher();
 
-    const t0 = trigger();
+        const t0 = trigger();
 
-    w.add(t0.promise);
+        w.add(t0.promise);
 
-    expect(w.unresolvedCount.getValue()).toBe(1);
+        expect(w.unresolvedCount.getValue()).toBe(1);
 
-    t0.reject("Apple Sauce");
+        t0.reject("Apple Sauce");
 
-    await t0.promise.catch(noop);
+        await t0.promise.catch(noop);
 
-    expect(w.unresolvedCount.getValue()).toBe(0);
-});
+        expect(w.unresolvedCount.getValue()).toBe(0);
+    });
+})

package/src/engine/animation/behavior/animateProperty.js

@@ -1,13 +1,13 @@
 import {
     TransitionPropertyVectorXBehavior
 } from "../../../../../model/game/story/behaviors/generic/TransitionPropertyVectorXBehavior.js";
+import { assert } from "../../../core/assert.js";
+import { SerializationMetadata } from "../../ecs/components/SerializationMetadata.js";
 import Entity from "../../ecs/Entity.js";
-import { BehaviorComponent } from "../../intelligence/behavior/ecs/BehaviorComponent.js";
 import { SequenceBehavior } from "../../intelligence/behavior/composite/SequenceBehavior.js";
+import { BehaviorComponent } from "../../intelligence/behavior/ecs/BehaviorComponent.js";
 import { DieBehavior } from "../../intelligence/behavior/ecs/DieBehavior.js";
-import { SendEventBehavior } from "../../../../../model/game/util/behavior/SendEventBehavior.js";
-import { SerializationMetadata } from "../../ecs/components/SerializationMetadata.js";
-import { assert } from "../../../core/assert.js";
+import { SendEventBehavior } from "../../intelligence/behavior/ecs/SendEventBehavior.js";
 
 /**
  *

package/src/engine/animation/curve/ecd_bind_animation_curve.js

@@ -0,0 +1,9 @@
+/**
+ * Given a root node, bind animation curve to it
+ * @param {EntityNode} node
+ * @param {string} path
+ * @param {AnimationCurve} curve
+ */
+export function entity_node_bind_animation_curve(node, path, curve) {
+
+}

package/src/engine/ecs/EntityReference.js

@@ -0,0 +1,12 @@
+export class EntityReference {
+    /**
+     * Entity ID
+     * @type {number}
+     */
+    id = -1
+    /**
+     * Entity generation number. This uniquely identifies an entity in combination with the ID
+     * @type {number}
+     */
+    generation = -1
+}

package/src/engine/ecs/dynamic_actions/actions/definition/SpeakLineActionDescription.js

@@ -1,9 +1,9 @@
-import { SendEventBehavior } from "../../../../../../../model/game/util/behavior/SendEventBehavior.js";
 import { assert } from "../../../../../core/assert.js";
 import {
     ParallelBehavior,
     ParallelBehaviorPolicy
 } from "../../../../intelligence/behavior/composite/ParallelBehavior.js";
+import { SendEventBehavior } from "../../../../intelligence/behavior/ecs/SendEventBehavior.js";
 import { WaitForEventBehavior } from "../../../../intelligence/behavior/ecs/WaitForEventBehavior.js";
 import { VoiceEvents } from "../../../speaker/VoiceEvents.js";
 import { AbstractActionDescription } from "./AbstractActionDescription.js";

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

@@ -82,7 +82,7 @@ export class Transform {
     get forward() {
         const result = Vector3.forward.clone();
 
-        result.applyMatrix4(this.matrix);
+        result.applyDirectionMatrix4(this.matrix);
 
         return result;
     }

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

@@ -225,3 +225,47 @@ test("lookAt", () => {
 
     expect(direction.roughlyEquals(expected_direction)).toBe(true);
 });
+
+test("forward vector", () => {
+
+    const t = new Transform();
+
+    expect(t.forward.roughlyEquals(Vector3.forward)).toBe(true);
+
+    // scale transform
+
+    t.scale.set(3, 7, 11);
+
+    // scale should not affect direction vector
+    expect(t.forward.roughlyEquals(Vector3.forward)).toBe(true);
+
+    // translate
+    t.position.set(-13, 17, -23);
+
+    // position should not affect direction
+    expect(t.forward.roughlyEquals(Vector3.forward)).toBe(true);
+});
+
+test("forward vs looktAt consistency", () => {
+
+    const t = new Transform();
+
+    t.lookAt(new Vector3(0, 0, -1));
+    expect(t.forward.roughlyEquals(new Vector3(0, 0, -1))).toBe(true);
+
+    t.lookAt(new Vector3(0, 0, 1));
+    expect(t.forward.roughlyEquals(new Vector3(0, 0, 1))).toBe(true);
+
+    t.lookAt(new Vector3(0, -1, 0));
+    expect(t.forward.roughlyEquals(new Vector3(0, -1, 0), 0.01)).toBe(true);
+
+    t.lookAt(new Vector3(0, 1, 0));
+    expect(t.forward.roughlyEquals(new Vector3(0, 1, 0), 0.01)).toBe(true);
+
+    t.lookAt(new Vector3(-1, 0, 0));
+    expect(t.forward.roughlyEquals(new Vector3(-1, 0, 0))).toBe(true);
+
+    t.lookAt(new Vector3(1, 0, 0));
+    expect(t.forward.roughlyEquals(new Vector3(1, 0, 0))).toBe(true);
+
+});

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometryFlags.js

@@ -16,5 +16,12 @@ export const ShadedGeometryFlags = {
     /**
      * If set to false will not render
      */
-    Visible:16
+    Visible: 16,
+
+    /**
+     * Bounds are updated whenever transforms change, we can defer this until next frame render request
+     * This lets us back updated and do less work overall
+     * TODO implement, currently it's ignored
+     */
+    DeferredBoundsUpdate: 32,
 };

package/src/engine/graphics/ecs/mesh-v2/aggregate/prototypeSGMesh.js

@@ -1,27 +1,29 @@
-import { EngineHarness } from "../../../../EngineHarness.js";
-import { ShadedGeometrySystem } from "../ShadedGeometrySystem.js";
-import { SGMeshSystem } from "./SGMeshSystem.js";
-import Entity from "../../../../ecs/Entity.js";
-import { Transform } from "../../../../ecs/transform/Transform.js";
-import { SGMesh } from "./SGMesh.js";
+import { initializeEditor } from "../../../../../../../model/game/initializeEditor.js";
+import { OrbitingBehavior } from "../../../../../../../model/game/util/behavior/OrbitingBehavior.js";
+import { enableEditor } from "../../../../../../editor/enableEditor.js";
+import { AABB3 } from "../../../../../core/geom/3d/aabb/AABB3.js";
+import Quaternion from "../../../../../core/geom/Quaternion.js";
+import Vector2 from "../../../../../core/geom/Vector2.js";
+import Vector3 from "../../../../../core/geom/Vector3.js";
+import { randomFloatBetween } from "../../../../../core/math/random/randomFloatBetween.js";
+import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
 import { GameAssetType } from "../../../../asset/GameAssetType.js";
 import { GLTFAssetLoader } from "../../../../asset/loaders/GLTFAssetLoader.js";
-import Vector3 from "../../../../../core/geom/Vector3.js";
-import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
+import Entity from "../../../../ecs/Entity.js";
 import { TransformAttachmentSystem } from "../../../../ecs/transform-attachment/TransformAttachmentSystem.js";
-import { SGMeshEvents } from "./SGMeshEvents.js";
-import { ShadedGeometry } from "../ShadedGeometry.js";
-import { MeshSystem } from "../../mesh/MeshSystem.js";
-import { SGMeshHighlightSystem } from "./SGMeshHighlightSystem.js";
+import { Transform } from "../../../../ecs/transform/Transform.js";
+import { EngineHarness } from "../../../../EngineHarness.js";
+import { BehaviorComponent } from "../../../../intelligence/behavior/ecs/BehaviorComponent.js";
+import { BehaviorSystem } from "../../../../intelligence/behavior/ecs/BehaviorSystem.js";
 import Highlight from "../../highlight/Highlight.js";
 import { ShadedGeometryHighlightSystem } from "../../highlight/system/ShadedGeometryHighlightSystem.js";
-import Quaternion from "../../../../../core/geom/Quaternion.js";
-import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
-import { BehaviorComponent } from "../../../../intelligence/behavior/ecs/BehaviorComponent.js";
-import { OrbitingBehavior } from "../../../../../../../model/game/util/behavior/OrbitingBehavior.js";
-import Vector2 from "../../../../../core/geom/Vector2.js";
-import { AABB3 } from "../../../../../core/bvh2/aabb3/AABB3.js";
-import { randomFloatBetween } from "../../../../../core/math/random/randomFloatBetween.js";
+import { MeshSystem } from "../../mesh/MeshSystem.js";
+import { ShadedGeometry } from "../ShadedGeometry.js";
+import { ShadedGeometrySystem } from "../ShadedGeometrySystem.js";
+import { SGMesh } from "./SGMesh.js";
+import { SGMeshEvents } from "./SGMeshEvents.js";
+import { SGMeshHighlightSystem } from "./SGMeshHighlightSystem.js";
+import { SGMeshSystem } from "./SGMeshSystem.js";
 
 new EngineHarness().initialize({
     configuration(config, engine) {
@@ -137,6 +139,8 @@ function main(engine) {
         terrainSize: new Vector2(100, 100)
     });
 
+    enableEditor(engine, initializeEditor);
+
     const ecd = engine.entityManager.dataset;
 
     // const mesh = SGMesh.fromURL("data/models/RTS_Buildings_Humans/18/Building_R_18_out/Building_R_18.gltf");

package/src/engine/graphics/ecs/mesh-v2/sg_hierarchy_compute_bounding_box_via_parent_entity.js

@@ -1,6 +1,6 @@
-import { ShadedGeometry } from "./ShadedGeometry.js";
-import { AABB3 } from "../../../../core/bvh2/aabb3/AABB3.js";
+import { AABB3 } from "../../../../core/geom/3d/aabb/AABB3.js";
 import { ParentEntitySystem } from "../../../ecs/parent/ParentEntitySystem.js";
+import { ShadedGeometry } from "./ShadedGeometry.js";
 
 const scratch_aabb3 = new AABB3();
 

package/src/engine/graphics/ecs/mesh-v2/three_object_to_entity_composition.js

@@ -1,7 +1,8 @@
+import Name from "../../../../../../model/game/ecs/component/Name.js";
 import { EntityNode } from "../../../ecs/parent/EntityNode.js";
+import { copy_three_transform } from "../../../ecs/transform/copy_three_transform.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
 import { ShadedGeometry } from "./ShadedGeometry.js";
-import { copy_three_transform } from "../../../ecs/transform/copy_three_transform.js";
 
 /**
  *
@@ -23,6 +24,7 @@ export function three_object_to_entity_composition(root) {
     transform.fromMatrix4(root.matrixWorld.elements);
 
     entity.add(transform);
+    entity.add(new Name(root.name));
 
     if (root.isMesh) {
         if (root.isSkinnedMesh) {

package/src/engine/graphics/particles/particular/engine/parameter/ParameterLookupTable.js

@@ -1,12 +1,12 @@
-import { inverseLerp } from "../../../../../../core/math/inverseLerp.js";
 import { assert } from "../../../../../../core/assert.js";
+import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
+import { isArrayEqualStrict } from "../../../../../../core/collection/array/isArrayEqualStrict.js";
+import { computeHashFloatArray } from "../../../../../../core/math/hash/computeHashFloatArray.js";
+import { inverseLerp } from "../../../../../../core/math/inverseLerp.js";
 import { max2 } from "../../../../../../core/math/max2.js";
 import { min2 } from "../../../../../../core/math/min2.js";
-import { ParameterLookupTableFlags } from "./ParameterLookupTableFlags.js";
 import { ParameterLookupTableSerializationAdapter } from "../emitter/serde/ParameterLookupTableSerializationAdapter.js";
-import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
-import { computeHashFloatArray } from "../../../../../../core/math/hash/computeHashFloatArray.js";
-import { isArrayEqualStrict } from "../../../../../../core/collection/array/isArrayEqualStrict.js";
+import { ParameterLookupTableFlags } from "./ParameterLookupTableFlags.js";
 
 
 export class ParameterLookupTable {
@@ -174,7 +174,7 @@ export class ParameterLookupTable {
             const lowValue = data[low_offset + i];
             const highValue = data[high_offset + i];
 
-            // inlined for speed: mix(low, high, fraction)
+            // inlined for speed: lerp(low, high, fraction)
             const value = lowValue * (1 - fraction) + highValue * fraction;
 
             result[i] = value;

package/src/engine/intelligence/behavior/ecs/SendEventBehavior.js

@@ -0,0 +1,43 @@
+import { assert } from "../../../../core/assert.js";
+import { BehaviorStatus } from "../BehaviorStatus.js";
+import { EntityBehavior } from "./EntityBehavior.js";
+
+export class SendEventBehavior extends EntityBehavior {
+    constructor() {
+        super();
+
+        this.event = "";
+        this.data = {};
+        this.target = -1;
+    }
+
+    fromJSON({ event, data = {}, target = -1 }) {
+        assert.typeOf(event, 'string', 'event');
+
+        this.event = event;
+        this.data = data;
+        this.target = target;
+    }
+
+    static fromJSON(j) {
+        const r = new SendEventBehavior();
+
+        r.fromJSON(j);
+
+        return r;
+    }
+
+    toString() {
+        return `SendEventBehavior{ event: ${this.event}, data:${this.data}, target:${this.target} }`;
+    }
+
+    tick(timeDelta) {
+        // console.log(`-> ${this}`);
+
+        const target = this.target !== -1 ? this.target : this.entity;
+
+        this.ecd.sendEvent(target, this.event, this.data);
+
+        return BehaviorStatus.Succeeded;
+    }
+}