@woosh/meep-engine 2.53.0 → 2.55.0

package/src/engine/asset/loaders/GLTFAssetLoader.js

@@ -20,7 +20,7 @@ import { CrossOriginKind } from "../CORS/CrossOriginKind.js";
 import { computeObjectBoundingSphere } from "./gltf/computeObjectBoundingSphere.js";
 import { isMesh } from "./gltf/isMesh.js";
 import { DRACOLoader } from "three/examples/jsm/loaders/DRACOLoader.js";
-import { HashSet } from "../../../core/collection/HashSet.js";
+import { HashSet } from "../../../core/collection/set/HashSet.js";
 import { computeGeometryHash } from "../../graphics/geometry/buffered/computeGeometryHash.js";
 import { computeGeometryEquality } from "../../graphics/geometry/buffered/computeGeometryEquality.js";
 import { traverseThreeObject } from "../../graphics/ecs/highlight/renderer/traverseThreeObject.js";

package/src/engine/ecs/EntityBlueprint.js

@@ -3,7 +3,7 @@ import EntityBuilder from "./EntityBuilder.js";
 /**
  *
  * @param {Object} template
- * @param {Object} seed
+ * @param {Object} [seed]
  */
 function populateJsonTemplate(template, seed) {
     if (seed === undefined) {
@@ -41,9 +41,7 @@ function populateJsonTemplate(template, seed) {
                 for (const propertyName in template) {
                     const templateValue = template[propertyName];
 
-                    const seededValue = populateJsonTemplate(templateValue, seed);
-
-                    result[propertyName] = seededValue;
+                    result[propertyName] = populateJsonTemplate(templateValue, seed);
                 }
 
                 return result;
@@ -61,13 +59,11 @@ function populateJsonTemplate(template, seed) {
  * @class
  */
 export class EntityBlueprint {
-    constructor() {
-        /**
-         *
-         * @type {Map<Class, Object>}
-         */
-        this.componentnts = new Map();
-    }
+    /**
+     * @private
+     * @type {Map<Class, Object>}
+     */
+    #components = new Map();
 
     /**
      *
@@ -97,7 +93,7 @@ export class EntityBlueprint {
     }
 
     clear() {
-        this.componentnts.clear();
+        this.#components.clear();
     }
 
     /**
@@ -106,7 +102,7 @@ export class EntityBlueprint {
      * @param {Object} json
      */
     addJSON(klass, json) {
-        this.componentnts.set(klass, json);
+        this.#components.set(klass, json);
     }
 
     /**
@@ -150,7 +146,7 @@ export class EntityBlueprint {
     build(templateSeed) {
         const eb = new EntityBuilder();
 
-        this.componentnts.forEach((template, ComponentClass) => {
+        this.#components.forEach((template, ComponentClass) => {
             const component = new ComponentClass();
 
             const json = populateJsonTemplate(template, templateSeed);

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

@@ -442,6 +442,30 @@ test('getComponent with 1 entity and 1 component', () => {
     expect(visitor_1).not.toHaveBeenCalled();
 });
 
+test("getComponent on unregistered component class", () => {
+
+    const ecd = new EntityComponentDataset();
+
+    const entity = ecd.createEntity();
+
+    expect(ecd.getComponent(entity, DummyComponentA)).toBe(undefined);
+});
+
+test("getComponentSafe", () => {
+
+    const ecd = new EntityComponentDataset();
+    ecd.registerComponentType(DummyComponentA);
+
+    const entity = ecd.createEntity();
+
+    expect(() => ecd.getComponentSafe(entity, DummyComponentA)).toThrow();
+
+    const component = new DummyComponentA();
+
+    ecd.addComponentToEntity(entity, component);
+
+    expect(ecd.getComponentSafe(entity, DummyComponentA)).toBe(component);
+});
 
 test('isComponentTypeRegistered', () => {
     const ecd = new EntityComponentDataset();
@@ -594,6 +618,59 @@ test('entityHasComponents', () => {
     expect(ecd.entityHasComponents(a)).toBe(true);
 });
 
+test("getAnyComponent", () => {
+
+    const ecd = new EntityComponentDataset();
+
+    ecd.registerManyComponentTypes([
+        DummyComponentA,
+        DummyComponentB
+    ]);
+
+    const a = ecd.createEntity();
+
+    expect(ecd.getAnyComponent(DummyComponentA)).toEqual({
+        entity: -1,
+        component: null
+    });
+
+    const component_a = new DummyComponentA();
+    ecd.addComponentToEntity(a, component_a);
+    ecd.addComponentToEntity(a, new DummyComponentB());
+
+    expect(ecd.getAnyComponent(DummyComponentA)).toEqual({
+        entity: a,
+        component: component_a
+    });
+
+});
+
+test("hasComponent", () => {
+
+
+    const ecd = new EntityComponentDataset();
+
+    ecd.registerManyComponentTypes([
+        DummyComponentA,
+        DummyComponentB
+    ]);
+
+    const a = ecd.createEntity();
+
+    expect(ecd.hasComponent(a, DummyComponentA)).toBe(false);
+    expect(ecd.hasComponent(a, DummyComponentB)).toBe(false);
+
+    ecd.addComponentToEntity(a, new DummyComponentA());
+
+    expect(ecd.hasComponent(a, DummyComponentA)).toBe(true);
+    expect(ecd.hasComponent(a, DummyComponentB)).toBe(false);
+
+    ecd.addComponentToEntity(a, new DummyComponentB());
+
+    expect(ecd.hasComponent(a, DummyComponentA)).toBe(true);
+    expect(ecd.hasComponent(a, DummyComponentB)).toBe(true);
+});
+
 describe('event management', () => {
 
     test("shouldn't be able to add event listener to non-existent entity", () => {

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/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);
+    }
+}

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

@@ -3,32 +3,18 @@
  */
 
 
-import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
-import { BinaryClassUpgrader } from "../storage/binary/BinaryClassUpgrader.js";
 import { computeStringHash } from "../../../core/primitives/strings/computeStringHash.js";
 import { assert } from "../../../core/assert.js";
 
+/**
+ * Stores textual tags, useful for marking entities
+ */
 export class Tag {
     /**
-     *
-     * @param {string} [name]
-     * @constructor
+     * @private
+     * @type {String[]}
      */
-    constructor(name) {
-
-        /**
-         * @private
-         * @type {String[]}
-         */
-        this.values = [];
-
-
-        if (name !== undefined) {
-            this.add(name);
-
-            console.warn('constructor arguments are deprecated');
-        }
-    }
+    values = [];
 
     /**
      *
@@ -49,27 +35,6 @@ export class Tag {
         return this.values[i];
     }
 
-    /**
-     *
-     * @param {String} v
-     */
-    set name(v) {
-        console.warn('name property is deprecated');
-
-        this.clear();
-        this.add(v);
-    }
-
-    /**
-     *
-     * @returns {String}
-     */
-    get name() {
-        console.warn('name property is deprecated');
-
-        return this.getFirst();
-    }
-
     clear() {
         this.values.splice(0, this.values.length);
     }
@@ -327,65 +292,4 @@ Tag.typeName = "Tag";
 
 export default Tag;
 
-export class TagSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
-
-        this.klass = Tag;
-        this.version = 1;
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {Tag} value
-     */
-    serialize(buffer, value) {
-        const values = value.getValues();
-
-        const n = values.length;
-
-        buffer.writeUintVar(n);
-
-        for (let i = 0; i < n; i++) {
-            const v = values[i];
-
-            buffer.writeUTF8String(v);
-        }
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {Tag} value
-     */
-    deserialize(buffer, value) {
-        value.clear();
-
-        const tagCount = buffer.readUintVar();
-
-        for (let i = 0; i < tagCount; i++) {
-            const v = buffer.readUTF8String();
-
-            value.add(v);
-        }
-    }
-}
-
-
-export class TagSerializationUpgrader_0_1 extends BinaryClassUpgrader {
-    constructor() {
-        super();
-
-        this.__startVersion = 0;
-        this.__targetVersion = 1;
-    }
 
-    upgrade(source, target) {
-        const tag = source.readUTF8String();
-
-        //write tag count
-        target.writeUintVar(1);
-        target.writeUTF8String(tag);
-    }
-}

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

@@ -0,0 +1,44 @@
+import { BinaryClassSerializationAdapter } from "../storage/binary/BinaryClassSerializationAdapter.js";
+import Tag from "./Tag.js";
+
+export class TagSerializationAdapter extends BinaryClassSerializationAdapter {
+
+    klass = Tag;
+    version = 1;
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Tag} value
+     */
+    serialize(buffer, value) {
+        const values = value.getValues();
+
+        const n = values.length;
+
+        buffer.writeUintVar(n);
+
+        for (let i = 0; i < n; i++) {
+            const v = values[i];
+
+            buffer.writeUTF8String(v);
+        }
+    }
+
+    /**
+     *
+     * @param {BinaryBuffer} buffer
+     * @param {Tag} value
+     */
+    deserialize(buffer, value) {
+        value.clear();
+
+        const tagCount = buffer.readUintVar();
+
+        for (let i = 0; i < tagCount; i++) {
+            const v = buffer.readUTF8String();
+
+            value.add(v);
+        }
+    }
+}

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

@@ -0,0 +1,18 @@
+import { BinaryClassUpgrader } from "../storage/binary/BinaryClassUpgrader.js";
+
+export class TagSerializationUpgrader_0_1 extends BinaryClassUpgrader {
+    constructor() {
+        super();
+
+        this.__startVersion = 0;
+        this.__targetVersion = 1;
+    }
+
+    upgrade(source, target) {
+        const tag = source.readUTF8String();
+
+        //write tag count
+        target.writeUintVar(1);
+        target.writeUTF8String(tag);
+    }
+}

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

@@ -6,7 +6,7 @@
 
 
 /**
- * @deprecated entirely superseded by the {@link BehaviorSystem}, prefer using a timer behavior instead
+ * @deprecated entirely superseded by the {@link BehaviorSystem}, prefer using a {@link DelayBehavior} instead
  */
 class Timer {
     /**

package/src/engine/ecs/dynamic_actions/DynamicActorSystem.js

@@ -12,7 +12,7 @@ import { DieBehavior } from "../../intelligence/behavior/ecs/DieBehavior.js";
 import { SerializationMetadata } from "../components/SerializationMetadata.js";
 import Tag from "../components/Tag.js";
 import { OverrideContextBehavior } from "../../../../../model/game/util/behavior/OverrideContextBehavior.js";
-import { HashMap } from "../../../core/collection/HashMap.js";
+import { HashMap } from "../../../core/collection/map/HashMap.js";
 import { assert } from "../../../core/assert.js";
 import { RuleExecution } from "./RuleExecution.js";
 import { computeContextualDynamicRuleDebugString } from "./rules/computeContextualDynamicRuleDebugString.js";