@woosh/meep-engine 2.48.16 → 2.48.18

package/src/engine/ecs/guid/GUID.spec.js

@@ -1,19 +1,15 @@
 import { GUID } from "./GUID.js";
 
 test("uniqueness out of 2", () => {
-    const a = new GUID();
-    const b = new GUID();
+    const a = GUID.v1();
+    const b = GUID.v1();
 
     expect(a.equals(b)).toBe(false);
 });
 
-
 test("equality", () => {
-    const a = new GUID();
-    const b = new GUID();
-
-    a.parse("a88bb73a-c89f-11ed-afa1-0242ac120002");
-    b.parse("a88bb73a-c89f-11ed-afa1-0242ac120002");
+    const a = GUID.parse("a88bb73a-c89f-11ed-afa1-0242ac120002");
+    const b = GUID.parse("a88bb73a-c89f-11ed-afa1-0242ac120002");
 
     expect(a.equals(b)).toBe(true);
 
@@ -28,10 +24,24 @@ test("hash stability", () => {
     expect(guid.hash()).toBe(guid.hash());
 });
 
+test("copy", () => {
+    const a = GUID.parse("a88bb73a-c89f-11ed-afa1-0242ac120002");
+    const a_string = a.toString();
+
+    const b = GUID.parse("bb75b300-c89f-11ed-afa1-0242ac120002");
+
+    expect(a.equals(b)).toBe(false);
+
+    b.copy(a);
+
+    expect(a.equals(b)).toBe(true);
+
+    // make sure that "a" is not changed
+    expect(a.toString()).toEqual(a_string);
+});
 
 test("to/from JSON consistency", () => {
-    const a = new GUID();
-    a.parse("bb75b300-c89f-11ed-afa1-0242ac120002");
+    const a = GUID.parse("bb75b300-c89f-11ed-afa1-0242ac120002");
 
     const b = new GUID();
 
@@ -39,3 +49,39 @@ test("to/from JSON consistency", () => {
 
     expect(b.equals(a)).toBe(true)
 });
+
+test(".data setter performs a copy instead of assignment", () => {
+    const id = new GUID();
+
+    const data = new Uint8Array(16);
+
+    id.data = data;
+
+    expect(id.data).not.toBe(data);
+});
+
+test(".data set/get", () => {
+    const a = new GUID();
+
+    const sample_0 = [
+        0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF,
+        0xFF, 0xFF, 0xFF, 0xFF,
+    ];
+
+    a.data = sample_0;
+
+    expect(Array.from(a.data)).toEqual(sample_0);
+
+    const sample_1 = [
+        0x00, 0x01, 0x02, 0x03,
+        0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0A, 0x0B,
+        0x0C, 0x0D, 0x0E, 0x0F,
+    ];
+
+    a.data = sample_1;
+
+    expect(Array.from(a.data)).toEqual(sample_1);
+});

package/src/engine/ecs/speaker/VoiceSystem.js

@@ -1,6 +1,6 @@
 import { max2 } from "../../../core/math/max2.js";
 import { Voice } from "./Voice.js";
-import EntityBuilder, { EntityBuilderFlags } from "../EntityBuilder.js";
+import EntityBuilder from "../EntityBuilder.js";
 import GUIElement from "../gui/GUIElement.js";
 import { SerializationMetadata } from "../components/SerializationMetadata.js";
 import HeadsUpDisplay from "../gui/hud/HeadsUpDisplay.js";
@@ -32,6 +32,7 @@ import { globalMetrics } from "../../metrics/GlobalMetrics.js";
 import { MetricsCategory } from "../../metrics/MetricsCategory.js";
 import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessSpecification.js";
 import { ResourceAccessKind } from "../../../core/model/ResourceAccessKind.js";
+import { EntityBuilderFlags } from "../EntityBuilderFlags.js";
 
 /**
  * Delay before the user notices the text and begins to read

package/src/engine/ecs/transform/Transform.d.ts

@@ -6,7 +6,7 @@ export class Transform {
     public readonly rotation: Quaternion
     public readonly scale: Vector3
 
-    public readonly matrix:ArrayLike<number>
+    public readonly matrix: ArrayLike<number>
 
     public lookAt(target: Vector3): void
 
@@ -22,6 +22,8 @@ export class Transform {
         rotation?: { x: number, y: number, z: number, w: number },
     }): void
 
+    toJSON(): any
+
     copy(other: Transform): void
 
     clone(): Transform
@@ -37,4 +39,12 @@ export class Transform {
     multiplyTransforms(a: Transform, b: Transform): void
 
     makeIdentity(): void
+
+    setFlag(flag: number): void
+
+    getFlag(flag: number): boolean
+
+    clearFlag(flag: number): void
+
+    writeFlag(flag: number, value: boolean): void
 }

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

@@ -10,6 +10,7 @@ import { TransformFlags } from "./TransformFlags.js";
 import { allocate_transform_m4 } from "../../graphics/ecs/mesh-v2/allocate_transform_m4.js";
 import { assert } from "../../../core/assert.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";
 
 /**
  *
@@ -315,9 +316,11 @@ export class Transform {
      *      - scale:    [1,1,1]
      */
     makeIdentity() {
-        this.position.copy(Vector3.zero);
-        this.rotation.copy(Quaternion.identity);
-        this.scale.copy(Vector3.one);
+        this.fromMatrix4(MATRIX_4_IDENTITY);
+    }
+
+    toString() {
+        return `{ position: ${this.position}, rotation: ${this.rotation}, scale: ${this.scale} }`;
     }
 }
 

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

@@ -2,6 +2,7 @@ import { Transform } from "./Transform.js";
 import Vector3 from "../../../core/geom/Vector3.js";
 import Quaternion from "../../../core/geom/Quaternion.js";
 import { MATRIX_4_IDENTITY } from "../../../core/geom/3d/matrix/MATRIX_4_IDENTITY.js";
+import { TransformFlags } from "./TransformFlags.js";
 
 test("constructor does not throw", () => {
 
@@ -18,5 +19,70 @@ test("new transform has identity transform", () => {
     expect(t.rotation.equals(Quaternion.identity)).toBe(true);
     expect(t.scale.equals(Vector3.one)).toBe(true);
 
-    expect(t.matrix).toEqual(MATRIX_4_IDENTITY);
+    expect(Array.from(t.matrix)).toEqual(MATRIX_4_IDENTITY);
+});
+
+test("makeIdentity", () => {
+
+    const t = new Transform();
+
+    t.position.set(1, 2, 3);
+
+    t.makeIdentity();
+
+    expect(t.position.toJSON()).toEqual({ x: 0, y: 0, z: 0 })
+
+});
+
+test("position changes propagate to matrix", () => {
+    const t = new Transform();
+
+    t.setFlag(TransformFlags.AutomaticChangeDetection);
+
+    t.position.set(-1, 3, -7);
+
+    expect(t.matrix[12]).toBe(-1);
+    expect(t.matrix[13]).toBe(3);
+    expect(t.matrix[14]).toBe(-7);
+});
+
+/**
+ *
+ * @return {Transform}
+ */
+function sample_a() {
+    const a = new Transform();
+
+    a.position.set(1, 2, 3);
+    a.rotation.set(5, -7, 11, -13);
+    a.scale.set(17, -23, 29);
+
+    return a;
+}
+
+test("to/fromJSON consistency", () => {
+    const a = sample_a();
+
+    const b = new Transform();
+
+    b.fromJSON(a.toJSON());
+
+    expect(a.equals(b)).toBe(true);
+})
+
+test("equality", () => {
+    const a = sample_a();
+    const b = sample_a();
+
+    expect(a.equals(b)).toBe(true);
+
+    b.position._add(1, 0, 0);
+
+    expect(a.equals(b)).toBe(false);
+});
+
+test("toString produces a valid string", () => {
+    const t = new Transform();
+
+    expect(typeof t.toString()).toBe("string");
 });

package/src/engine/graphics/ecs/decal/v2/prototypeDecalSystem.js

@@ -1,6 +1,6 @@
 import { EngineHarness } from "../../../../EngineHarness.js";
 import { FPDecalSystem } from "./FPDecalSystem.js";
-import EntityBuilder, { EntityBuilderFlags } from "../../../../ecs/EntityBuilder.js";
+import EntityBuilder from "../../../../ecs/EntityBuilder.js";
 import { Decal } from "./Decal.js";
 import { Transform } from "../../../../ecs/transform/Transform.js";
 import { randomFloatBetween } from "../../../../../core/math/random/randomFloatBetween.js";
@@ -31,6 +31,7 @@ import { GizmoRenderingPlugin } from "../../../render/gizmo/GizmoRenderingPlugin
 import { Gizmo } from "../../../render/gizmo/Gizmo.js";
 import { ForwardPlusRenderingPlugin } from "../../../render/forward_plus/plugin/ForwardPlusRenderingPlugin.js";
 import { TaskLoadingScreen } from "../../../../../view/task/TaskLoadingScreen.js";
+import { EntityBuilderFlags } from "../../../../ecs/EntityBuilderFlags.js";
 
 const decal_urls = `data/textures/icons/FantasyIconsMegaPack/MagicItems/MagicItems_png/transparent/x64/staff_13_t.png
 data/textures/icons/FantasyIconsMegaPack/MagicItems/MagicItems_png/transparent/x64/artifact_01_t.png

package/src/engine/physics/fluid/Fluid.js

@@ -1,3 +1,6 @@
+
+// see https://github.com/matthias-research/pages/blob/d62033fec407a6e0dec408f85c371c231612a3b6/tenMinutePhysics/17-fluidSim.html#L92
+
 export class Fluid {
     constructor(density, numX, numY, h) {
         this.density = density;

package/src/engine/graphics/ecs/mesh/setThreeObjectRotation.js

@@ -1,11 +0,0 @@
-/**
- *
- * @param {Object3D|THREE.Object3D} m
- * @param {Quaternion} rotation
- */
-export function setThreeObjectRotation(m, rotation) {
-
-    rotation.__setThreeEuler(m.rotation);
-    m.quaternion.set(rotation.x, rotation.y, rotation.z, rotation.w);
-
-}