@woosh/meep-engine 2.54.0 → 2.56.0

package/src/engine/ecs/EntityManager.spec.js

@@ -2,6 +2,7 @@ import { EntityManager } from "./EntityManager.js";
 import { System, SystemState } from "./System.js";
 import { jest } from '@jest/globals';
 import { IllegalStateException } from "../../core/fsm/exceptions/IllegalStateException.js";
+import { EntityComponentDataset } from "./EntityComponentDataset.js";
 
 /**
  *
@@ -21,15 +22,11 @@ function makeEm(systems = []) {
     });
 }
 
-function DummyComponent() {
+class DummyComponent {
 }
 
 class DummySystem extends System {
-    constructor() {
-        super();
-
-        this.dependencies = [DummyComponent];
-    }
+    dependencies = [DummyComponent];
 }
 
 test("constructor doesn't throw", () => {
@@ -143,6 +140,19 @@ test("addSystem", async () => {
     expect(() => em.addSystem(new DummySystem())).toThrow(IllegalStateException);
 });
 
+test("add system to running manager", async () => {
+
+    const em = new EntityManager();
+
+    await new Promise((resolve, reject) => em.startup(resolve, reject));
+
+    const system = new DummySystem();
+
+    await em.addSystem(system);
+
+    expect(em.hasSystem(DummySystem)).toBe(true);
+});
+
 test("removeSystem", async () => {
 
     const system = new DummySystem();
@@ -158,3 +168,43 @@ test("removeSystem", async () => {
     // Try again, this time we expect nothing to happen
     expect(await em.removeSystem(system)).toEqual(false);
 });
+
+test("attempt to detach dataset when none is attached", () => {
+    const manager = new EntityManager();
+
+    expect(() => manager.detachDataSet()).not.toThrow();
+
+    // do it second time, in case something changes in the above call
+    expect(() => manager.detachDataSet()).not.toThrow();
+});
+
+test("getComponentTypeMap with 1 system", async () => {
+
+    const em = await makeEm([
+        new DummySystem()
+    ]);
+
+    expect(em.getComponentTypeMap()).toEqual([DummyComponent]);
+});
+
+test("attempting to attach another dataset before detaching previous one should throw", () => {
+
+    const em = new EntityManager();
+
+    em.attachDataSet(new EntityComponentDataset());
+
+    expect(() => em.attachDataSet(new EntityComponentDataset())).toThrow();
+
+});
+
+test("attaching same dataset should succeed", () => {
+
+    const em = new EntityManager();
+
+    const ecd = new EntityComponentDataset();
+    em.attachDataSet(ecd);
+
+    em.attachDataSet(ecd); // second time
+
+    expect(em.dataset).toBe(ecd);
+});

package/src/engine/ecs/animation/Animation.spec.js

@@ -0,0 +1,22 @@
+import { Animation } from "./Animation.js";
+import { AnimationClip } from "./AnimationClip.js";
+
+test("constructor does not throw", () => {
+    new Animation()
+});
+
+test("equality", () => {
+
+    const a = new Animation();
+    const b = new Animation();
+
+    expect(a.equals(b)).toBe(true);
+
+    a.clips.add(new AnimationClip());
+
+    expect(a.equals(b)).toBe(false);
+
+    b.clips.add(new AnimationClip());
+
+    expect(a.equals(b)).toBe(true);
+});

package/src/engine/ecs/animation/AnimationSerializationAdapter.js

@@ -3,12 +3,9 @@ import { AnimationClip } from "./AnimationClip.js";
 import { Animation } from "./Animation.js";
 
 export class AnimationSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
 
-        this.klass = Animation;
-        this.version = 0;
-    }
+    klass = Animation;
+    version = 0;
 
     /**
      *

package/src/engine/ecs/attachment/Attachment.js

@@ -1,31 +1,30 @@
 import { Transform } from "../transform/Transform.js";
 
 export class Attachment {
-    constructor() {
-        /**
-         * Parent entity to which attachment is made
-         * @type {number}
-         */
-        this.parent = -1;
-
-        /**
-         * Socket on the parent entity to which attachment is made
-         * @type {String}
-         */
-        this.socket = null;
-
-        /**
-         *
-         * @type {Transform}
-         */
-        this.transform = new Transform();
-
-        /**
-         *
-         * @type {boolean}
-         */
-        this.immediate = false;
-    }
+
+    /**
+     * Parent entity to which attachment is made
+     * @type {number}
+     */
+    parent = -1;
+
+    /**
+     * Socket on the parent entity to which attachment is made
+     * @type {String}
+     */
+    socket = null;
+
+    /**
+     *
+     * @type {Transform}
+     */
+    transform = new Transform();
+
+    /**
+     *
+     * @type {boolean}
+     */
+    immediate = false;
 
     fromJSON({ parent, socket, transform, immediate = false }) {
         this.parent = parent;

package/src/engine/ecs/attachment/AttachmentBinding.js

@@ -1,34 +1,31 @@
 export class AttachmentBinding {
-    constructor() {
-        this.attachedEntity = -1;
-
-        /**
-         *
-         * @type {Transform}
-         */
-        this.attachedTransform = null;
-
-
-        this.parentEntity = -1;
-
-        /**
-         *
-         * @type {Transform}
-         */
-        this.parentTransform = null;
-
-        /**
-         *
-         * @type {AttachmentSocket}
-         */
-        this.socket = null;
-
-        /**
-         *
-         * @type {Attachment}
-         */
-        this.attachment = null;
-    }
+    attachedEntity = -1;
+
+    /**
+     *
+     * @type {Transform}
+     */
+    attachedTransform = null;
+
+    parentEntity = -1;
+
+    /**
+     *
+     * @type {Transform}
+     */
+    parentTransform = null;
+
+    /**
+     *
+     * @type {AttachmentSocket}
+     */
+    socket = null;
+
+    /**
+     *
+     * @type {Attachment}
+     */
+    attachment = null;
 
     link() {
 

package/src/engine/ecs/attachment/AttachmentSystem.js

@@ -10,35 +10,32 @@ import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessS
 import { ResourceAccessKind } from "../../../core/model/ResourceAccessKind.js";
 
 export class AttachmentSystem extends System {
-    constructor() {
-        super();
 
-        this.dependencies = [Attachment, Transform];
+    dependencies = [Attachment, Transform];
 
-        this.components_used = [
-            ResourceAccessSpecification.from(AttachmentSockets, ResourceAccessKind.Read),
-            ResourceAccessSpecification.from(Mesh, ResourceAccessKind.Read),
-            ResourceAccessSpecification.from(Transform, ResourceAccessKind.Write)
-        ];
+    components_used = [
+        ResourceAccessSpecification.from(AttachmentSockets, ResourceAccessKind.Read),
+        ResourceAccessSpecification.from(Mesh, ResourceAccessKind.Read),
+        ResourceAccessSpecification.from(Transform, ResourceAccessKind.Write)
+    ];
 
-        /**
-         *
-         * @type {number[]}
-         */
-        this.waiting = [];
+    /**
+     *
+     * @type {number[]}
+     */
+    waiting = [];
 
-        /**
-         *
-         * @type {Map<number,AttachmentBinding>}
-         */
-        this.bindings = new Map();
+    /**
+     *
+     * @type {Map<number,AttachmentBinding>}
+     */
+    bindings = new Map();
 
-        /**
-         *
-         * @type {Map<number, AttachmentBinding[]>}
-         */
-        this.parentBindingIndex = new Map();
-    }
+    /**
+     *
+     * @type {Map<number, AttachmentBinding[]>}
+     */
+    parentBindingIndex = new Map();
 
 
     /**

package/src/engine/ecs/attachment/BoneAttachmentBinding.js

@@ -12,15 +12,12 @@ const pPosition = new Vector3();
 const attachmentM4 = new Matrix4();
 
 export class BoneAttachmentBinding extends AttachmentBinding {
-    constructor() {
-        super();
-
-        /**
-         *
-         * @type {Bone}
-         */
-        this.bone = null;
-    }
+
+    /**
+     *
+     * @type {Bone}
+     */
+    bone = null;
 
     update() {
         const socketTransform = this.socket.transform;

package/src/engine/ecs/attachment/TransformAttachmentBinding.js

@@ -6,9 +6,6 @@ const scratch_m4_1 = new Float32Array(16);
 const scratch_m4_2 = new Float32Array(16);
 
 export class TransformAttachmentBinding extends AttachmentBinding {
-    constructor() {
-        super();
-    }
 
     /**
      * TODO make use of Transform.multiplyTransforms for better readability and performance

package/src/engine/ecs/components/CharacterController.js

@@ -1,25 +1,31 @@
 /**
- * User: Alex Goldring
- * Date: 7/4/2014
- * Time: 09:04
+ * FPS-style character controller
+ * @author Alex Goldring
+ * @copyright Alex Goldring 7/4/2014
  */
-
-
-function CharacterController(options) {
-    this.height = 4;
-    this.onSolidSurface = false;
-    this.lockedTimeout = 0;
+class CharacterController {
+    height = 4;
+    onSolidSurface = false;
+    lockedTimeout = 0;
     //
-    this.forward = false;
-    this.back = false;
-    this.left = false;
-    this.right = false;
-    this.sprinting = false;
-    this.attacking = false;
-    this.aim = null;
+    forward = false;
+    back = false;
+    left = false;
+    right = false;
+    sprinting = false;
+    attacking = false;
+    aim = null;
     //
-    this.movementSpeed = options.movementSpeed || 0;
-    this.sprintingMultiplier = options.sprintingMultiplier || 1;
+    movementSpeed = 1;
+    sprintingMultiplier = 1;
+
+    constructor({
+                    movementSpeed = 1,
+                    sprintingMultiplier = 1.2
+                } = {}) {
+        this.movementSpeed = movementSpeed;
+        this.sprintingMultiplier = sprintingMultiplier;
+    }
 }
 
 export default CharacterController;

package/src/engine/ecs/components/Motion.js

@@ -4,7 +4,6 @@
  * Time: 20:41
  */
 import Vector3 from '../../../core/geom/Vector3.js';
-import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
 
 
 class Motion {
@@ -33,29 +32,3 @@ Motion.typeName = "Motion";
 export default Motion;
 
 
-export class MotionSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
-
-        this.klass = Motion;
-        this.version = 0;
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {Motion} value
-     */
-    serialize(buffer, value) {
-        value.velocity.toBinaryBufferFloat32(buffer);
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {Motion} value
-     */
-    deserialize(buffer, value) {
-        value.velocity.fromBinaryBufferFloat32(buffer);
-    }
-}

package/src/engine/ecs/components/MotionSerializationAdapter.js

@@ -0,0 +1,26 @@
+import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
+import Motion from "./Motion.js";
+
+export class MotionSerializationAdapter extends BinaryClassSerializationAdapter {
+
+    klass = Motion;
+    version = 0;
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Motion} value
+     */
+    serialize(buffer, value) {
+        value.velocity.toBinaryBufferFloat32(buffer);
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Motion} value
+     */
+    deserialize(buffer, value) {
+        value.velocity.fromBinaryBufferFloat32(buffer);
+    }
+}

package/src/engine/ecs/components/PropertySet.js

@@ -4,7 +4,6 @@
 
 
 import { resolvePath } from "../../../core/json/resolvePath.js";
-import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
 
 function PropertySet(options) {
     this.data = {};
@@ -110,31 +109,3 @@ PropertySet.prototype.fromBinaryBuffer = function (buffer) {
 
 export default PropertySet;
 
-export class PropertySetSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
-
-        this.klass = PropertySet;
-        this.version = 0;
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {PropertySet} value
-     */
-    serialize(buffer, value) {
-        buffer.writeUTF8String(JSON.stringify(value.data));
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {PropertySet} value
-     */
-    deserialize(buffer, value) {
-        const string = buffer.readUTF8String();
-
-        value.data = JSON.parse(string);
-    }
-}

package/src/engine/ecs/components/PropertySetSerializationAdapter.js

@@ -0,0 +1,29 @@
+import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
+import PropertySet from "./PropertySet.js";
+
+export class PropertySetSerializationAdapter extends BinaryClassSerializationAdapter {
+
+
+    klass = PropertySet;
+    version = 0;
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {PropertySet} value
+     */
+    serialize(buffer, value) {
+        buffer.writeUTF8String(JSON.stringify(value.data));
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {PropertySet} value
+     */
+    deserialize(buffer, value) {
+        const string = buffer.readUTF8String();
+
+        value.data = JSON.parse(string);
+    }
+}

package/src/engine/ecs/components/SerializationMetadata.js

@@ -1,5 +1,3 @@
-import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
-
 export const SerializationFlags = {
     Transient: 1
 };
@@ -69,29 +67,3 @@ SerializationMetadata.Transient = Object.freeze(transient);
 SerializationMetadata.typeName = "SerializationMetadata";
 
 
-export class SerializationMetadataSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
-
-        this.klass = SerializationMetadata;
-        this.version = 0;
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {SerializationMetadata} value
-     */
-    serialize(buffer, value) {
-        buffer.writeUint8(value.flags);
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {SerializationMetadata} value
-     */
-    deserialize(buffer, value) {
-        value.flags = buffer.readUint8();
-    }
-}

package/src/engine/ecs/components/SerializationMetadataSerializationAdapter.js

@@ -0,0 +1,26 @@
+import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
+import { SerializationMetadata } from "./SerializationMetadata.js";
+
+export class SerializationMetadataSerializationAdapter extends BinaryClassSerializationAdapter {
+
+    klass = SerializationMetadata;
+    version = 0;
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {SerializationMetadata} value
+     */
+    serialize(buffer, value) {
+        buffer.writeUint8(value.flags);
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {SerializationMetadata} value
+     */
+    deserialize(buffer, value) {
+        value.flags = buffer.readUint8();
+    }
+}

package/src/engine/ecs/components/Steering.js

@@ -6,7 +6,6 @@
 
 
 import Vector3 from '../../../core/geom/Vector3.js';
-import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
 
 /**
  * @readonly
@@ -110,37 +109,3 @@ Steering.typeName = "Steering";
 
 export default Steering;
 
-export class SteeringSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
-
-        this.klass = Steering;
-        this.version = 0;
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {Steering} value
-     */
-    serialize(buffer, value) {
-        buffer.writeFloat32(value.maxSpeed);
-        buffer.writeFloat32(value.rotationSpeed);
-
-        value.destination.toBinaryBufferFloat32(buffer);
-        value.targetMargin.toBinaryBufferFloat32_EqualityEncoded(buffer);
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {Steering} value
-     */
-    deserialize(buffer, value) {
-        value.maxSpeed = buffer.readFloat32();
-        value.rotationSpeed = buffer.readFloat32();
-
-        value.destination.fromBinaryBufferFloat32(buffer);
-        value.targetMargin.fromBinaryBufferFloat32_EqualityEncoded(buffer);
-    }
-}

package/src/engine/ecs/components/SteeringSerializationAdapter.js

@@ -0,0 +1,34 @@
+import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
+import Steering from "./Steering.js";
+
+export class SteeringSerializationAdapter extends BinaryClassSerializationAdapter {
+
+    klass = Steering;
+    version = 0;
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Steering} value
+     */
+    serialize(buffer, value) {
+        buffer.writeFloat32(value.maxSpeed);
+        buffer.writeFloat32(value.rotationSpeed);
+
+        value.destination.toBinaryBufferFloat32(buffer);
+        value.targetMargin.toBinaryBufferFloat32_EqualityEncoded(buffer);
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Steering} value
+     */
+    deserialize(buffer, value) {
+        value.maxSpeed = buffer.readFloat32();
+        value.rotationSpeed = buffer.readFloat32();
+
+        value.destination.fromBinaryBufferFloat32(buffer);
+        value.targetMargin.fromBinaryBufferFloat32_EqualityEncoded(buffer);
+    }
+}