@woosh/meep-engine 2.124.11 → 2.124.13

package/src/engine/ecs/EntityComponentDataset.js

@@ -359,6 +359,11 @@ export class EntityComponentDataset {
      * @returns {boolean}
      */
     removeObserver(observer, immediate) {
+        if (observer.dataset !== this) {
+            // not connected to this dataset
+            return false;
+        }
+
         let i;
         let foundFlag = false;
 
@@ -1028,9 +1033,9 @@ export class EntityComponentDataset {
     }
 
     /**
-     *
+     * Internally every component class is mapped to an index, this method is used to retrieve such mapping.
      * @param {Function|Class} klass
-     * @returns {number}
+     * @returns {number} integer index, -1 if not found
      */
     computeComponentTypeIndex(klass) {
         assert.defined(klass, "klass");
@@ -1061,6 +1066,9 @@ export class EntityComponentDataset {
     }
 
     /**
+     * Retrieves any instance of a given component.
+     * If no component instances exist - component will be `null` and entity will be `-1`.
+     * Useful for singleton components such as a camera or an audio listener.
      * @template T
      * @param {Class<T>} component_type
      * @returns {{entity:number, component:T}}
@@ -1069,12 +1077,22 @@ export class EntityComponentDataset {
         let entity = -1;
         let component = null;
 
-        this.traverseComponents(component_type, (c, i) => {
-            entity = i;
-            component = c;
+        const index = this.computeComponentTypeIndex(component_type);
 
-            return false;
-        });
+        if (index !== -1) {
+
+            const components = this.components[index];
+            for (const entity_key in components) {
+                const c = components[entity_key];
+
+                if (c !== undefined) {
+                    entity = Number(entity_key);
+                    component = c;
+                    break;
+                }
+
+            }
+        }
 
         return {
             entity,

package/src/engine/ecs/EntityManager.d.ts

@@ -26,7 +26,7 @@ export class EntityManager {
     /**
      * @readonly
      * @private
-     * @type {EntityObserver[]}
+     * @type {Map<System,EntityObserver>}
      */
     private readonly systemObservers;
     /**

package/src/engine/ecs/EntityManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityManager.d.ts","sourceRoot":"","sources":["../../../../src/engine/ecs/EntityManager.js"],"names":[],"mappings":"iCAeU,MAAM;;;;;;;;;AAWhB;;;GAGG;AACH;IAEI;;;OAGG;IACH,kBAFU,iCAAQ,CAEL;IAEb;;;;OAIG;IACH,uCAA2B;IAE3B;;;;OAIG;IACH,iCAAqB;IAErB;;OAEG;IACH;;;QAGI;;WAEG;qBADO,MAAM,iCAAQ;;MAI1B;IAEF;;;OAGG;IACH,OAFU,kBAAkB,CAEO;IAEnC;;;;;;OAMG;IACH,gDAA2C;IAE3C;;;;;;;;;OASG;IACH,qBAFU,MAAM,CAEqB;IAErC;;;;;OAKG;IACH,wCAFU,MAAM,CAE4B;IAE5C;;;;OAIG;IACH,SAFU,sBAAsB,CAEjB;IAEf;;;;;OAKG;IACH,uCAAsC;IAEtC;;;OAGG;IACH,6BA8EC;IAED,sBAcC;IAED;;;OAGG;IACH,uBAFa,KAAK,EAAE,CAuBnB;IAED;;;;;OAKG;IACH,uBAJW,sBAAsB,QA0BhC;IAED;;;;OAIG;IACH,UAJa,CAAC,eACH,KAAK,CAAC,CAAC,CAAC,GACN,OAAO,CAInB;IAED;;;;OAIG;IACH,UAJa,CAAC,eACH,KAAK,CAAC,CAAC,CAAC,GACN,CAAC,GAAC,IAAI,CAgBlB;IAED;;;;;OAKG;IACH,wBAJa,CAAC,aACH,MAAM,GACJ,IAAI,GAAC,KAAK,CAAC,CAAC,CAAC,CAezB;IAGD;;;OAGG;IACH,oBAFW,MAAM,QAoEhB;IAED;;;;;OAKG;IACH,iEA0EC;IAED;;;;OAIG;IACH,uDAFa,OAAO,CAAC,OAAO,CAAC,CAyC5B;IAED;;;;;OAKG;IACH,mBA6BC;IAED;;;;;OAKG;IACH,oBAwCC;IAED;;;;;OAKG;IACH,kEAwEC;IAED;;;;OAIG;IACH,2BAHW,KAAK,GACH,OAAO,iCAAS,CA0B5B;IAED;;;;;OAKG;IACH,kCAJW,KAAK,SACL,WAAW,GACT,OAAO,iCAAS,CAsB5B;IAED;;;;;OAKG;IACH,mEAsEC;CACJ;uBAhzBmC,aAAa;mBAP9B,oCAAoC"}
+{"version":3,"file":"EntityManager.d.ts","sourceRoot":"","sources":["../../../../src/engine/ecs/EntityManager.js"],"names":[],"mappings":"iCAeU,MAAM;;;;;;;;;AAWhB;;;GAGG;AACH;IAEI;;;OAGG;IACH,kBAFU,iCAAQ,CAEL;IAEb;;;;OAIG;IACH,uCAA2B;IAE3B;;;;OAIG;IACH,iCAA4B;IAE5B;;OAEG;IACH;;;QAGI;;WAEG;qBADO,MAAM,iCAAQ;;MAI1B;IAEF;;;OAGG;IACH,OAFU,kBAAkB,CAEO;IAEnC;;;;;;OAMG;IACH,gDAA2C;IAE3C;;;;;;;;;OASG;IACH,qBAFU,MAAM,CAEqB;IAErC;;;;;OAKG;IACH,wCAFU,MAAM,CAE4B;IAE5C;;;;OAIG;IACH,SAFU,sBAAsB,CAEjB;IAEf;;;;;OAKG;IACH,uCAAsC;IAEtC;;;OAGG;IACH,6BAmFC;IAED,sBAkBC;IAED;;;OAGG;IACH,uBAFa,KAAK,EAAE,CAuBnB;IAED;;;;;OAKG;IACH,uBAJW,sBAAsB,QA+BhC;IAED;;;;OAIG;IACH,UAJa,CAAC,eACH,KAAK,CAAC,CAAC,CAAC,GACN,OAAO,CAInB;IAED;;;;OAIG;IACH,UAJa,CAAC,eACH,KAAK,CAAC,CAAC,CAAC,GACN,CAAC,GAAC,IAAI,CAkBlB;IAED;;;;;OAKG;IACH,wBAJa,CAAC,aACH,MAAM,GACJ,IAAI,GAAC,KAAK,CAAC,CAAC,CAAC,CAiBzB;IAGD;;;OAGG;IACH,oBAFW,MAAM,QAoEhB;IAED;;;;;OAKG;IACH,iEAoEC;IAED;;;;OAIG;IACH,uDAFa,OAAO,CAAC,OAAO,CAAC,CAyC5B;IAED;;;;;OAKG;IACH,mBA6BC;IAED;;;;;OAKG;IACH,oBAsDC;IAED;;;;;OAKG;IACH,kEAwEC;IAED;;;;OAIG;IACH,2BAHW,KAAK,GACH,OAAO,iCAAS,CA0B5B;IAED;;;;;OAKG;IACH,kCAJW,KAAK,SACL,WAAW,GACT,OAAO,iCAAS,CAsB5B;IAED;;;;;OAKG;IACH,mEAsEC;CACJ;uBA10BmC,aAAa;mBAP9B,oCAAoC"}

package/src/engine/ecs/EntityManager.js

@@ -46,9 +46,9 @@ export class EntityManager {
     /**
      * @readonly
      * @private
-     * @type {EntityObserver[]}
+     * @type {Map<System,EntityObserver>}
      */
-    systemObservers = [];
+    systemObservers = new Map();
 
     /**
      * @readonly
@@ -132,6 +132,11 @@ export class EntityManager {
         for (let i = 0; i < system_count; i++) {
             const system = systems[i];
 
+            if (system.state.get() !== SystemState.RUNNING) {
+                // exclude systems that are not running
+                continue;
+            }
+
             if (system.update === noop && system.fixedUpdate === noop) {
                 // not a simulation system
                 continue;
@@ -206,9 +211,13 @@ export class EntityManager {
         }
 
         //remove system observers
-        this.systemObservers.forEach(function (observer) {
+        for (const [_, observer] of this.systemObservers) {
+            if (!observer.isConnected) {
+                continue;
+            }
+
             dataset.removeObserver(observer, true);
-        });
+        }
 
         this.dataset = null;
     }
@@ -255,7 +264,7 @@ export class EntityManager {
                 return;
             }
 
-            throw new Error("Illegal status, another dataset is currently attached");
+            throw new Error("Illegal status, another dataset is currently attached, you must detach it first");
         }
 
         const localComponentTypeMap = this.getComponentTypeMap();
@@ -265,9 +274,14 @@ export class EntityManager {
 
         this.dataset = dataset;
 
-        this.systemObservers.forEach(function (observer) {
+        for (const [s, observer] of this.systemObservers) {
+            if (s.state.get() !== SystemState.RUNNING) {
+                continue;
+            }
+
             dataset.addObserver(observer, true);
-        });
+        }
+
     }
 
     /**
@@ -285,6 +299,8 @@ export class EntityManager {
      * @returns {T|null}
      */
     getSystem(systemClass) {
+        assert.isFunction(systemClass, 'systemClass');
+
         const systems = this.systems;
         const numSystems = systems.length;
 
@@ -307,6 +323,8 @@ export class EntityManager {
      * @returns {null|Class<T>}
      */
     getComponentClassByName(className) {
+        assert.isString(className, 'className');
+
         const componentTypes = this.getComponentTypeMap();
 
         let i = 0;
@@ -330,18 +348,17 @@ export class EntityManager {
         assert.isNumber(timeDelta, 'timeDelta');
         assert.notNaN(timeDelta, 'timeDelta');
         assert.greaterThanOrEqual(timeDelta, 0, 'timeDelta must be >= 0');
-        assert.isFiniteNumber(timeDelta, 'timeDelta');
+        assert.isFinite(timeDelta, 'timeDelta');
 
         if (this.__execution_order_needs_update) {
             this.updateExecutionOrder();
         }
 
-
         /**
          *
          * @type {System[]}
          */
-        const systems = this.systems;
+        const systems = this.systemsExecutionOrder;
 
         const system_count = systems.length;
 
@@ -360,6 +377,7 @@ export class EntityManager {
                 let accumulated_time = accumulatedTime.get(system) + timeDelta;
 
                 const t0 = performance.now();
+
                 while (accumulated_time >= fixed_step) {
 
                     try {
@@ -437,12 +455,10 @@ export class EntityManager {
 
         systems[systemIndex] = system;
 
-        // request exec order update
-        this.__execution_order_needs_update = true;
 
         //build observer
-        const linkObserver = new EntityObserver(system.dependencies, system.link, system.unlink, system);
-        this.systemObservers[systemIndex] = linkObserver;
+        const entityObserver = new EntityObserver(system.dependencies, system.link, system.unlink, system);
+        this.systemObservers.set(system, entityObserver);
 
         let startup_promise;
         if (this.state === EntityManagerState.Running) {
@@ -461,18 +477,14 @@ export class EntityManager {
             throw new Error(`System is bound to another EntityManager`);
         }
 
-        if (this.dataset !== null) {
-
-            // link dependency components
-            this.dataset.registerManyComponentTypes(system.referenced_components);
-
-            this.dataset.addObserver(linkObserver);
-        }
+        // link dependency components
+        this.dataset?.registerManyComponentTypes(system.referenced_components);
 
         this.systemAccumulatedFixedStepTime.set(system, 0);
 
         this.on.systemAdded.send1(system);
 
+
         return startup_promise;
     }
 
@@ -493,8 +505,8 @@ export class EntityManager {
         }
 
         //unlink system observer
-        const systemObserver = this.systemObservers[systemIndex];
-        this.systemObservers.splice(systemIndex, 1);
+        const systemObserver = this.systemObservers.get(system);
+        this.systemObservers.delete(system);
 
         assert.notEqual(systemObserver, undefined, "System observer is undefined, it was possibly removed illegally or was not created");
 
@@ -592,6 +604,20 @@ export class EntityManager {
 
             self.on.systemStarted.dispatch(system);
 
+            const i = self.systems.indexOf(system);
+
+            assert.notEqual(i, -1, "System was not found in the system list");
+
+            const observer = self.systemObservers.get(system);
+
+            if (observer !== undefined) {
+                // only link the observer once startup has succeeded
+                self.dataset?.addObserver(observer, true);
+            }
+
+            // request exec order update
+            self.__execution_order_needs_update = true;
+
             successCallback(system);
         }
 

package/src/engine/ecs/EntityObserver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EntityObserver.d.ts","sourceRoot":"","sources":["../../../../src/engine/ecs/EntityObserver.js"],"names":[],"mappings":"AAGA;IAoBI;;;;;;;OAOG;IACH,0FAHW,GAAC,EA+CX;IAvED;;;OAGG;IACH,eAFU,MAAM,CAEa;IAE7B;;;;OAIG;IACH,uBAFU,MAAM,EAAE,CAES;IAE3B;;;OAGG;IACH,SAFU,sBAAsB,GAAC,IAAI,CAEtB;IA0BX;;OAEG;IACH,oBAFU,MAAM,CAE2B;IAE3C;;;OAGG;IACH,kBAFU,CAAS,IAAK,eAAC,CAEgB;IAEzC;;;OAGG;IACH,gBAFU,CAAS,IAAK,eAAC,CAEW;IAEpC;;;OAGG;IACH,sBAAoC;IAEpC;;;OAGG;IACH,SAFU,GAAC,CAEW;IAG1B;;;OAGG;IACH,qCAqBC;IAED;;;OAGG;IACH,iBAFW,sBAAsB,QAIhC;IAED,mBAGC;CACJ;uBAnHsB,6BAA6B"}
+{"version":3,"file":"EntityObserver.d.ts","sourceRoot":"","sources":["../../../../src/engine/ecs/EntityObserver.js"],"names":[],"mappings":"AAGA;IAoBI;;;;;;;OAOG;IACH,0FAHW,GAAC,EA+CX;IAvED;;;OAGG;IACH,eAFU,MAAM,CAEa;IAE7B;;;;OAIG;IACH,uBAFU,MAAM,EAAE,CAES;IAE3B;;;OAGG;IACH,SAFU,sBAAsB,GAAC,IAAI,CAEtB;IA0BX;;OAEG;IACH,oBAFU,MAAM,CAE2B;IAE3C;;;OAGG;IACH,kBAFU,CAAS,IAAK,eAAC,CAEgB;IAEzC;;;OAGG;IACH,gBAFU,CAAS,IAAK,eAAC,CAEW;IAEpC;;;OAGG;IACH,sBAAoC;IAEpC;;;OAGG;IACH,SAFU,GAAC,CAEW;IAG1B;;;OAGG;IACH,qCAqBC;IAED;;;OAGG;IACH,iBAFW,sBAAsB,QAIhC;IAED;;;OAGG;IACH,mBAFY,OAAO,CAIlB;IAED,mBAIC;CACJ;uBA5HsB,6BAA6B"}

package/src/engine/ecs/EntityObserver.js

@@ -110,8 +110,17 @@ export class EntityObserver {
         dataset.addObserver(this, true);
     }
 
+    /**
+     *
+     * @return {boolean}
+     */
+    get isConnected() {
+        return this.dataset === null;
+    }
+
     disconnect() {
         //de-register updates
         this.dataset.removeObserver(this);
+        this.dataset = null;
     }
 }

package/src/engine/ecs/util/EntityBuilderUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EntityBuilderUtils.d.ts","sourceRoot":"","sources":["../../../../../src/engine/ecs/util/EntityBuilderUtils.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,mDAHW,MAAM,EAAE,gBAKlB;AAED;;;;GAIG;AACH,6CAHW,MAAM,gBAOhB"}

package/src/engine/ecs/{EntityBuilderUtils.js → util/EntityBuilderUtils.js}

@@ -1,4 +1,4 @@
-import { EventType } from "./EventType.js";
+import { EventType } from "../EventType.js";
 
 /**
  *

package/src/engine/ecs/EntityBuilderUtils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"EntityBuilderUtils.d.ts","sourceRoot":"","sources":["../../../../src/engine/ecs/EntityBuilderUtils.js"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,mDAHW,MAAM,EAAE,gBAKlB;AAED;;;;GAIG;AACH,6CAHW,MAAM,gBAOhB"}