@woosh/meep-engine 2.55.0 → 2.56.1

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/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/dynamic_actions/DynamicActorSystem.js

@@ -3,7 +3,7 @@ import { AbstractContextSystem } from "../system/AbstractContextSystem.js";
 import { SystemEntityContext } from "../system/SystemEntityContext.js";
 import { DataScope } from "../../../../../model/game/unit/actions/data/DataScope.js";
 import { Blackboard } from "../../intelligence/blackboard/Blackboard.js";
-import { compareNumbersDescending, returnTrue } from "../../../core/function/Functions.js";
+import { returnTrue } from "../../../core/function/Functions.js";
 import { EntityProxyScope } from "../binding/EntityProxyScope.js";
 import EntityBuilder from "../EntityBuilder.js";
 import { BehaviorComponent } from "../../intelligence/behavior/ecs/BehaviorComponent.js";
@@ -23,6 +23,7 @@ import { randomMultipleFromArray } from "../../../core/collection/array/randomMu
 import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessSpecification.js";
 import { ResourceAccessKind } from "../../../core/model/ResourceAccessKind.js";
 import { EntityBuilderFlags } from "../EntityBuilderFlags.js";
+import { number_compare_descending } from "../../../core/primitives/numbers/number_compare_descending.js";
 
 /**
  * In seconds
@@ -503,7 +504,7 @@ export class DynamicActorSystem extends AbstractContextSystem {
 
         }
 
-        scores.sort(compareNumbersDescending);
+        scores.sort(number_compare_descending);
 
         for (let i = 0; i < scores.length && result.length < count; i++) {
             const score = scores[i];

package/src/engine/ecs/fow/FogOfWarRevealer.js

@@ -1,9 +1,8 @@
 import Vector1 from "../../../core/geom/Vector1.js";
 
 export class FogOfWarRevealer {
-    constructor() {
-        this.radius = new Vector1(1);
-    }
+
+    radius = new Vector1(1);
 
     toJSON() {
         return {

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

@@ -9,7 +9,12 @@
  * @param {number} directionY
  * @param {number} directionZ
  */
-export function v3_computeOffsetVector(result, distance, sourceX, sourceY, sourceZ, directionX, directionY, directionZ) {
+export function v3_computeOffsetVector(
+    result,
+    distance,
+    sourceX, sourceY, sourceZ,
+    directionX, directionY, directionZ
+) {
     if (distance === 0) {
         result.set(sourceX, sourceY, sourceZ);
         return;

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

@@ -2,23 +2,23 @@ import { ObjectPoolFactory } from "../../../core/model/object/ObjectPoolFactory.
 import { noop } from "../../../core/function/Functions.js";
 
 export class IKProblem {
-    constructor() {
-        /**
-         *
-         * @type {IKConstraint}
-         */
-        this.constraint = null;
-        /**
-         *
-         * @type {Skeleton}
-         */
-        this.skeleton = null;
-        /**
-         *
-         * @type {Terrain}
-         */
-        this.terrain = null;
-    }
+
+    /**
+     *
+     * @type {IKConstraint}
+     */
+    constraint = null;
+    /**
+     *
+     * @type {Skeleton}
+     */
+    skeleton = null;
+    /**
+     *
+     * @type {Terrain}
+     */
+    terrain = null;
+
 }
 
 /**

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

@@ -2,13 +2,12 @@ import { IKConstraint } from "./IKConstraint.js";
 
 
 export class InverseKinematics {
-    constructor() {
-        /**
-         *
-         * @type {IKConstraint[]}
-         */
-        this.constraints = [];
-    }
+
+    /**
+     * @readonly
+     * @type {IKConstraint[]}
+     */
+    constraints = [];
 
     /**
      *

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

@@ -11,32 +11,30 @@ import { ResourceAccessKind } from "../../../core/model/ResourceAccessKind.js";
 
 
 export class InverseKinematicsSystem extends System {
-    constructor() {
-        super();
-
-        this.dependencies = [InverseKinematics, Mesh];
-
-        this.components_used = [
-            ResourceAccessSpecification.from(Mesh,ResourceAccessKind.Read|ResourceAccessSpecification.Write)
-        ];
-
-        /**
-         *
-         * @type {{"2BIK": TwoBoneInverseKinematicsSolver}}
-         */
-        this.solvers = {
-            "2BIK": new TwoBoneInverseKinematicsSolver(),
-            "1BSA": new OneBoneSurfaceAlignmentSolver()
-        };
-
-        this.problems = {};
-
-        /**
-         *
-         * @type {Terrain}
-         */
-        this.__terrain = null;
-    }
+
+    dependencies = [InverseKinematics, Mesh];
+
+    components_used = [
+        ResourceAccessSpecification.from(Mesh, ResourceAccessKind.Read | ResourceAccessSpecification.Write)
+    ];
+
+    /**
+     *
+     * @type {{"2BIK": TwoBoneInverseKinematicsSolver}}
+     */
+    solvers = {
+        "2BIK": new TwoBoneInverseKinematicsSolver(),
+        "1BSA": new OneBoneSurfaceAlignmentSolver()
+    };
+
+    problems = {};
+
+    /**
+     *
+     * @type {Terrain}
+     */
+    __terrain = null;
+
 
     get componentClass() {
         return InverseKinematics;

package/src/engine/ecs/storage/BinaryBufferSerializer.js

@@ -2,9 +2,9 @@ import { SerializationFlags, SerializationMetadata } from "../components/Seriali
 import { assert } from "../../../core/assert.js";
 import { BinaryCollectionSerializer } from "./binary/collection/BinaryCollectionSerializer.js";
 import { COMPONENT_SERIALIZATION_TRANSIENT_FIELD } from "./COMPONENT_SERIALIZATION_TRANSIENT_FIELD.js";
-import { currentTimeInSeconds } from "../../Clock.js";
 import { BinaryObjectSerializationAdapter } from "./binary/object/BinaryObjectSerializationAdapter.js";
 import { logger } from "../../logging/GlobalLogger.js";
+import { current_time_in_seconds } from "../../../core/time/current_time_in_seconds.js";
 
 /**
  * @template T
@@ -136,7 +136,7 @@ class BinaryBufferSerializer {
                 continue;
             }
 
-            const __start_time = currentTimeInSeconds();
+            const __start_time = current_time_in_seconds();
 
             let lastEntity = 0;
 
@@ -158,7 +158,7 @@ class BinaryBufferSerializer {
 
             const numComponentsWritten = collectionSerializer.getElementCount();
 
-            const __end_time = currentTimeInSeconds();
+            const __end_time = current_time_in_seconds();
 
             collectionSerializer.finalize();
 

package/src/engine/ecs/systems/TagSystem.js

@@ -6,13 +6,8 @@ import Tag from '../components/Tag.js';
 
 
 class TagSystem extends System {
-    constructor() {
-        super();
 
-        this.dependencies = [Tag];
-
-        this.entityManager = null;
-    }
+    dependencies = [Tag];
 
     /**
      *

package/src/engine/ecs/terrain/ecs/layers/TerrainLayer.js

@@ -2,10 +2,10 @@ import Vector2 from "../../../../../core/geom/Vector2.js";
 import { GameAssetType } from "../../../../asset/GameAssetType.js";
 import { Sampler2D } from "../../../../graphics/texture/sampler/Sampler2D.js";
 import { Cache } from "../../../../../core/cache/Cache.js";
-import { computeUTF8StringByteSize } from "../../../../../core/primitives/strings/StringUtils.js";
 import Signal from "../../../../../core/events/signal/Signal.js";
 import { computeStringHash } from "../../../../../core/primitives/strings/computeStringHash.js";
 import { copy_Sampler2D_channel_data } from "../../../../graphics/texture/sampler/copy_Sampler2D_channel_data.js";
+import { string_compute_byte_size } from "../../../../../core/primitives/strings/string_compute_byte_size.js";
 
 /**
  *
@@ -14,7 +14,7 @@ import { copy_Sampler2D_channel_data } from "../../../../graphics/texture/sample
 const cache = new Cache({
     maxWeight: 304857600,
     keyHashFunction: computeStringHash,
-    keyWeigher: computeUTF8StringByteSize,
+    keyWeigher: string_compute_byte_size,
     /**
      *
      * @param {Sampler2D} sampler

package/src/engine/graphics/ecs/mesh/skeleton/BoneMapping.js

@@ -1,7 +1,7 @@
-import { computeCommonPrefix } from "../../../../../core/primitives/strings/StringUtils.js";
 import { HumanoidBoneType } from "./HumanoidBoneType.js";
 import { distance as levenshtein_distance } from "fastest-levenshtein";
 import { assert } from "../../../../../core/assert.js";
+import { string_compute_common_prefix } from "../../../../../core/primitives/strings/string_compute_common_prefix.js";
 
 
 /**
@@ -25,7 +25,7 @@ export class BoneMapping {
      */
     build(names) {
         //strip common prefix
-        const commonPrefix = computeCommonPrefix(names);
+        const commonPrefix = string_compute_common_prefix(names);
         const commonPrefixLength = commonPrefix.length;
 
         const conditionedNames = names.map(function (name) {

package/src/engine/graphics/ecs/mesh-v2/ShadedGeometry.spec.js

@@ -1,5 +1,19 @@
 import { ShadedGeometry } from "./ShadedGeometry.js";
+import { BufferGeometry, MeshBasicMaterial } from "three";
 
 test("constructor does not throw", () => {
     expect(() => new ShadedGeometry()).not.toThrow()
 });
+
+test("hash", () => {
+    const mesh = new ShadedGeometry();
+
+    mesh.geometry = new BufferGeometry();
+    mesh.material = new MeshBasicMaterial();
+
+    const hash = mesh.hash();
+
+    expect(typeof hash).toBe("number")
+    expect(Number.isInteger(hash)).toBe(true);
+    expect(mesh.hash()).toEqual(hash);
+});