@woosh/meep-engine 2.119.81 → 2.119.83

package/src/engine/ecs/Entity.js

@@ -3,6 +3,7 @@ import Signal from "../../core/events/signal/Signal.js";
 import { isDefined } from "../../core/process/matcher/isDefined.js";
 import { EntityFlags } from "./EntityFlags.js";
 import { EventType } from "./EntityManager.js";
+import { EntityReference } from "./EntityReference.js";
 
 /**
  * Set of default flags
@@ -20,17 +21,44 @@ const DEFAULT_FLAGS =
 class Entity {
 
     /**
-     * When entity is live - this is the entity ID inside associated `EntityComponentDataset`, when the entity is not live - it's set to -1
-     * @type {number}
+     * @readonly
+     * @type {EntityReference}
+     */
+    reference = new EntityReference();
+
+
+    /**
+     * @deprecated use {@link reference} instead
+     * @returns {number}
      */
-    id = -1;
+    get id() {
+        return this.reference.id;
+    }
 
     /**
-     * Generation is a unique identifier coming from the dataset
-     * Generation of an existing entity must match for it to be considered "the same"
-     * @type {number}
+     * @deprecated use {@link reference} instead
+     * @param {number} v
      */
-    generation = -1;
+    set id(v) {
+        this.reference.id = v;
+    }
+
+    /**
+     * @deprecated use {@link reference} instead
+     * @returns {number}
+     */
+    get generation() {
+        return this.reference.generation;
+    }
+
+
+    /**
+     * @deprecated use {@link reference} instead
+     * @param {number} v
+     */
+    set generation(v) {
+        this.reference.generation = v;
+    }
 
     /**
      * Components associated with the entity
@@ -220,7 +248,7 @@ class Entity {
                 //see if entity is built
                 if (this.getFlag(EntityFlags.Built)) {
 
-                    this.dataset.removeComponentFromEntity(this.id, klass);
+                    this.dataset.removeComponentFromEntity(this.reference.id, klass);
 
                 }
 
@@ -325,7 +353,7 @@ class Entity {
         if (this.getFlag(EntityFlags.Built)) {
 
             const dataset = this.dataset;
-            const entity = this.id;
+            const entity = this.reference.id;
 
             //check that the entity is the same as what we have built
             //assert.ok(checkExistingComponents(entity, this.element, dataset), `Signature of Entity does not match existing entity(id=${entity})`);
@@ -334,8 +362,8 @@ class Entity {
 
             dataset.removeEntity(entity);
 
-            this.id = -1;
-            this.generation = -1;
+            // clear reference
+            this.reference.copy(EntityReference.NULL);
 
             this.clearFlag(EntityFlags.Built);
 
@@ -362,8 +390,9 @@ class Entity {
             return this.id;
         }
 
-        const entity = this.id = dataset.createEntity();
-        this.generation = dataset.getEntityGeneration(entity);
+        const entity = dataset.createEntity();
+        this.reference.bind(dataset, entity);
+
         this.dataset = dataset;
 
         let i;
@@ -419,9 +448,10 @@ class Entity {
             .forEach(r.add, r);
 
         r.setFlag(EntityFlags.Built);
-        r.id = entity;
+
         r.dataset = dataset;
-        r.generation = dataset.getEntityGeneration(entity);
+
+        r.reference.bind(dataset,entity);
 
         return r;
     }

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

@@ -1,3 +1,7 @@
+/**
+ * Uniquely identifies an entity by both its ID and generation.
+ * Lets us distinguish between two entities with the same ID that were created at different times
+ */
 export class EntityReference {
     /**
      *
@@ -8,14 +12,26 @@ export class EntityReference {
     static from(id: number, generation: number): EntityReference;
     /**
      * Entity ID
+     * When entity is live - this is the entity ID inside associated `EntityComponentDataset`, when the entity is not live - it's set to -1
      * @type {number}
      */
     id: number;
     /**
      * Entity generation number. This uniquely identifies an entity in combination with the ID
+     * Generation of an existing entity must match for it to be considered "the same"
      * @type {number}
      */
     generation: number;
+    /**
+     *
+     * @param {EntityReference} other
+     */
+    copy(other: EntityReference): void;
+    /**
+     *
+     * @returns {EntityReference}
+     */
+    clone(): EntityReference;
     /**
      *
      * @return {number}
@@ -39,6 +55,23 @@ export class EntityReference {
      * @returns {boolean}
      */
     destroy(ecd: EntityComponentDataset): boolean;
+    /**
+     * Bind reference to a specific entity
+     * @param {EntityComponentDataset} ecd
+     * @param {number} entity
+     */
+    bind(ecd: EntityComponentDataset, entity: number): void;
+    /**
+     *
+     * @param {number} id
+     * @param {number} generation
+     */
+    from(id: number, generation: number): void;
+    /**
+     * @readonly
+     * @type {boolean}
+     */
+    readonly isEntityReference: boolean;
 }
 export namespace EntityReference {
     let NULL: EntityReference;

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

@@ -1 +1 @@
-{"version":3,"file":"EntityReference.d.ts","sourceRoot":"","sources":["../../../../src/engine/ecs/EntityReference.js"],"names":[],"mappings":"AAEA;IA4DI;;;;;OAKG;IACH,gBAJW,MAAM,cACN,MAAM,GACL,eAAe,CAa1B;IA3ED;;;OAGG;IACH,IAFU,MAAM,CAET;IAEP;;;OAGG;IACH,YAFU,MAAM,CAED;IAEf;;;OAGG;IACH,QAFY,MAAM,CAIjB;IAED;;;;OAIG;IACH,cAHW,eAAe,GACd,OAAO,CAMlB;IAED;;;;OAIG;IACH,qCAFa,OAAO,CAQnB;IAED;;;;OAIG;IACH,sCAFa,OAAO,CASnB;CAoBJ;;cAIS,eAAe"}
+{"version":3,"file":"EntityReference.d.ts","sourceRoot":"","sources":["../../../../src/engine/ecs/EntityReference.js"],"names":[],"mappings":"AAEA;;;GAGG;AACH;IA6GI;;;;;OAKG;IACH,gBAJW,MAAM,cACN,MAAM,GACL,eAAe,CAQ1B;IAvHD;;;;OAIG;IACH,IAFU,MAAM,CAET;IAEP;;;;OAIG;IACH,YAFU,MAAM,CAED;IAEf;;;OAGG;IACH,YAFW,eAAe,QAKzB;IAED;;;OAGG;IACH,SAFa,eAAe,CAQ3B;IAED;;;OAGG;IACH,QAFY,MAAM,CAIjB;IAED;;;;OAIG;IACH,cAHW,eAAe,GACd,OAAO,CAMlB;IAED;;;;OAIG;IACH,qCAFa,OAAO,CAQnB;IAED;;;;OAIG;IACH,sCAFa,OAAO,CASnB;IAED;;;;OAIG;IACH,0CAFW,MAAM,QAMhB;IAED;;;;OAIG;IACH,SAHW,MAAM,cACN,MAAM,QAUhB;IAiBL;;;OAGG;IACH,4BAFU,OAAO,CAE0B;CAN1C;;cAWS,eAAe"}

package/src/engine/ecs/EntityReference.js

@@ -1,19 +1,46 @@
 import { assert } from "../../core/assert.js";
 
+/**
+ * Uniquely identifies an entity by both its ID and generation.
+ * Lets us distinguish between two entities with the same ID that were created at different times
+ */
 export class EntityReference {
 
     /**
      * Entity ID
+     * When entity is live - this is the entity ID inside associated `EntityComponentDataset`, when the entity is not live - it's set to -1
      * @type {number}
      */
     id = -1
 
     /**
      * Entity generation number. This uniquely identifies an entity in combination with the ID
+     * Generation of an existing entity must match for it to be considered "the same"
      * @type {number}
      */
     generation = -1
 
+    /**
+     *
+     * @param {EntityReference} other
+     */
+    copy(other){
+        this.id = other.id;
+        this.generation = other.generation;
+    }
+
+    /**
+     *
+     * @returns {EntityReference}
+     */
+    clone(){
+        const r = new EntityReference();
+
+        r.copy(this);
+
+        return r;
+    }
+
     /**
      *
      * @return {number}
@@ -60,27 +87,55 @@ export class EntityReference {
         }
     }
 
+    /**
+     * Bind reference to a specific entity
+     * @param {EntityComponentDataset} ecd
+     * @param {number} entity
+     */
+    bind(ecd, entity){
+        const generation = ecd.getEntityGeneration(entity);
+
+        this.from(entity, generation);
+    }
+
     /**
      *
      * @param {number} id
      * @param {number} generation
-     * @return {EntityReference}
      */
-    static from(id, generation) {
+    from(id, generation){
 
         assert.isNonNegativeInteger(id, 'id');
         assert.isNonNegativeInteger(generation, 'generation');
 
+        this.id = id;
+        this.generation = generation;
+
+    }
+
+    /**
+     *
+     * @param {number} id
+     * @param {number} generation
+     * @return {EntityReference}
+     */
+    static from(id, generation) {
         const r = new EntityReference();
 
-        r.id = id;
-        r.generation = generation;
+        r.from(id, generation);
 
         return r;
     }
 }
 
 /**
+ * @readonly
+ * @type {boolean}
+ */
+EntityReference.prototype.isEntityReference = true;
+
+/**
+ * Special singleton to describe an invalid reference
  * @readonly
  * @type {EntityReference}
  */

package/src/engine/ecs/fow/FogOfWarRevealerSystem.d.ts

@@ -4,7 +4,7 @@ export class FogOfWarRevealerSystem extends System<any, any, any, any, any> {
      * @param {number} team
      */
     constructor(team: number);
-    dependencies: (typeof Transform | typeof Team | typeof FogOfWarRevealer)[];
+    dependencies: (typeof Transform | typeof FogOfWarRevealer | typeof Team)[];
     components_used: ResourceAccessSpecification<typeof FogOfWar>[];
     data: any[];
     /**
@@ -25,8 +25,8 @@ export class FogOfWarRevealerSystem extends System<any, any, any, any, any> {
 }
 import { System } from "../System.js";
 import { Transform } from "../transform/Transform.js";
-import Team from "../team/Team.js";
 import { FogOfWarRevealer } from "./FogOfWarRevealer.js";
+import Team from "../team/Team.js";
 import { FogOfWar } from "./FogOfWar.js";
 import { ResourceAccessSpecification } from "../../../core/model/ResourceAccessSpecification.js";
 //# sourceMappingURL=FogOfWarRevealerSystem.d.ts.map

package/src/engine/ecs/fow/FogOfWarRevealerSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FogOfWarRevealerSystem.d.ts","sourceRoot":"","sources":["../../../../../src/engine/ecs/fow/FogOfWarRevealerSystem.js"],"names":[],"mappings":"AAaA;IACI;;;OAGG;IACH,kBAFW,MAAM,EAkBhB;IAbG,2EAAuD;IAEvD,gEAEC;IAED,YAAc;IAEd;;;OAGG;IACH,MAFU,MAAM,CAEA;IAGpB;;;;;;OAMG;IACH,eALW,gBAAgB,aAChB,SAAS,QACT,IAAI,qBA2Dd;IAED,oBAmCC;IAED,mEAMC;CACJ;uBAjJsB,cAAc;0BAKX,2BAA2B;iBADpC,iBAAiB;iCAHD,uBAAuB;yBAE/B,eAAe;4CAKI,oDAAoD"}
+{"version":3,"file":"FogOfWarRevealerSystem.d.ts","sourceRoot":"","sources":["../../../../../src/engine/ecs/fow/FogOfWarRevealerSystem.js"],"names":[],"mappings":"AAaA;IACI;;;OAGG;IACH,kBAFW,MAAM,EAkBhB;IAbG,2EAAuD;IAEvD,gEAEC;IAED,YAAc;IAEd;;;OAGG;IACH,MAFU,MAAM,CAEA;IAGpB;;;;;;OAMG;IACH,eALW,gBAAgB,aAChB,SAAS,QACT,IAAI,qBA2Dd;IAED,oBAmCC;IAED,mEAMC;CACJ;uBAjJsB,cAAc;0BAKX,2BAA2B;iCAJpB,uBAAuB;iBAGvC,iBAAiB;yBADT,eAAe;4CAKI,oDAAoD"}

package/src/engine/graphics/ecs/light/Light.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Light.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/light/Light.js"],"names":[],"mappings":"AASA;IA+DI;;;;OAIG;IACH,yBAFa,KAAK,CAQjB;IApEG;;;OAGG;IACH,wBAA4D;IAE5D;;;OAGG;IACH,OAFU,KAAK,CAEgB;IAE/B;;;OAGG;IACH,WAFU,OAAO,CAEc;IAE/B;;;OAGG;IACH,OAFU,OAAO,CAEoB;IAErC;;;OAGG;IACH,UAFU,OAAO,CAEe;IAEhC;;;OAGG;IACH,UAFU,OAAO,CAE4B;IAE7C;;;OAGG;IACH,YAFU,eAAe,CAEmB;IAE5C;;;;OAIG;IACH,sBAAyB;IAEzB;;;;OAIG;IACH,mBAAsB;IAgB1B,0BAgDC;IAED;;;;;MAqBC;CACJ;;;;;yBA1JwB,wCAAwC;sBAH3C,iCAAiC;oBACnC,kCAAkC;4BAC1B,2CAA2C;0BAE7C,gBAAgB"}
+{"version":3,"file":"Light.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/light/Light.js"],"names":[],"mappings":"AASA;IA+DI;;;;OAIG;IACH,yBAFa,KAAK,CAQjB;IApEG;;;OAGG;IACH,wBAA4D;IAE5D;;;OAGG;IACH,OAFU,KAAK,CAEgB;IAE/B;;;OAGG;IACH,WAFU,OAAO,CAEc;IAE/B;;;OAGG;IACH,OAFU,OAAO,CAEoB;IAErC;;;OAGG;IACH,UAFU,OAAO,CAEe;IAEhC;;;OAGG;IACH,UAFU,OAAO,CAE4B;IAE7C;;;OAGG;IACH,YAFU,eAAe,CAEmB;IAE5C;;;;OAIG;IACH,sBAAyB;IAEzB;;;;OAIG;IACH,mBAAsB;IAgB1B,0BAqDC;IAED;;;;;MAqBC;CACJ;;;;;yBA/JwB,wCAAwC;sBAH3C,iCAAiC;oBACnC,kCAAkC;4BAC1B,2CAA2C;0BAE7C,gBAAgB"}

package/src/engine/graphics/ecs/light/Light.js

@@ -88,11 +88,16 @@ export class Light {
             this.type.fromJSON(json.type);
         }
 
-        if (json.color !== undefined) {
-            if (typeof json.color === "string") {
-                this.color.parse(json.color);
+        const j_color = json.color;
+
+        if (j_color !== undefined) {
+            const type = typeof j_color;
+            if (type === "string") {
+                this.color.parse(j_color);
+            } else if (type === "object") {
+                this.color.fromJSON(j_color);
             } else {
-                this.color.fromUint(json.color);
+                this.color.fromUint(j_color);
             }
         } else {
             // default

package/src/engine/graphics/ecs/path/PathDisplaySystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PathDisplaySystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/path/PathDisplaySystem.js"],"names":[],"mappings":"AAoPA;IACI;;;OAGG;IACH,4BAwCC;IAnCG,mDAGC;IAED,2KAIC;IAED;;;OAGG;IACH,eAAoB;IAEpB;;;OAGG;IACH,iCAAkB;IAElB;;;;OAIG;IACH,wBAAkC;IAElC;;;OAGG;IACH,YAFU,MAAM,CAEc;IAGlC;;;;OAIG;IACH,8BAFW,MAAM,QAQhB;IAED;;;;OAIG;IACH,6BAFW,MAAM,QAIhB;IAED,mFAKC;IAED,2EAKC;IAED,8BA+BC;CACJ;sCAtWqC,8CAA8C;iBAMnE,4CAA4C;4BAJjC,kBAAkB;0BAepB,qCAAqC;4CAHnB,uDAAuD;+BAEpE,8BAA8B;6BAjBhC,qCAAqC;8BAQpC,gCAAgC;mBAM3C,0CAA0C"}
+{"version":3,"file":"PathDisplaySystem.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/graphics/ecs/path/PathDisplaySystem.js"],"names":[],"mappings":"AAoPA;IACI;;;OAGG;IACH,4BAwCC;IAnCG,mDAGC;IAED,2KAIC;IAED;;;OAGG;IACH,eAAoB;IAEpB;;;OAGG;IACH,iCAAkB;IAElB;;;;OAIG;IACH,wBAAkC;IAElC;;;OAGG;IACH,YAFU,MAAM,CAEc;IAGlC;;;;OAIG;IACH,8BAFW,MAAM,QAQhB;IAED;;;;OAIG;IACH,6BAFW,MAAM,QAIhB;IAED,mFAKC;IAED,2EAKC;IAED,8BA+BC;CACJ;sCAtWqC,8CAA8C;4BAExD,kBAAkB;iBAI7B,4CAA4C;0BAWnC,qCAAqC;4CAHnB,uDAAuD;+BAEpE,8BAA8B;6BAjBhC,qCAAqC;8BAQpC,gCAAgC;mBAM3C,0CAA0C"}

package/src/engine/sound/ecs/emitter/SoundTrack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SoundTrack.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/sound/ecs/emitter/SoundTrack.js"],"names":[],"mappings":"AAYA;IAkcI,uCAMC;IAhcD;;;OAGG;IACH,KAFU,SAAO,IAAI,CAEV;IAEX;;;OAGG;IACH,MAFU,MAAM,CAEP;IAET;;;OAGG;IACH,SAFU,SAAO,IAAI,CAER;IAEb;;;OAGG;IACH,iBAAa;IAEb;;;;OAIG;IACH,UAFU,MAAM,CAEF;IAGd;;;OAGG;IACH,OAFU,MAAM,GAAC,eAAe,CAEV;IAEtB;QACI;;WAEG;eADO,OAAO,IAAI,CAAC;MAGxB;IAQF;;;OAGG;IACH,6BAEC;IAED;;;OAGG;IACH,yBAFW,YAAY,QAItB;IAED;;;OAGG;IACH,6BAMC;IAED,0BAEC;IAUD,gCAiDC;IAED,gBASC;IAED;;;;OAIG;IACH,eAHW,UAAU,UAmCpB;IAED;;;;OAIG;IACH,cAHW,MAAM,oBAAkB,GACtB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,oBAAkB,GACtB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,oBAAkB,SACxB,OAAO,QAQjB;IAED;;;;OAIG;IACH,cAHW,MAAM,oBAAkB,GACtB,OAAO,CAInB;IAED;;;;;;;;;OASG;IACH,0BAJW,MAAM,YACN,MAAM,eACN,MAAM,QAuChB;IAED;;;OAGG;IACH,wBAMC;IAED;;;OAGG;IACH,qBAEC;IAUD;;;OAGG;IACH,uBAEC;IAdD;;;OAGG;IACH,oBAEC;IAkBD;;;OAGG;IACH,0BAEC;IAdD;;;OAGG;IACH,uBAEC;IAkBD;;;OAGG;IACH,iCAEC;IAdD;;;OAGG;IACH,8BAEC;IAUD;;;OAGG;IACH,YAFW,UAAU,QAOpB;IAED;;;;OAIG;IACH,cAHW,UAAU,GACR,OAAO,CAQnB;IAED;;;OAGG;IACH,QAFY,MAAM,CASjB;IAED;;;OAGG;IACH,SAFY,UAAU,CAQrB;IAED;;;;;;;;;MAWC;IAED;;;;;;;;;aA6BC;;CAUJ;gCA/c+B,sBAAsB;mBALnC,0CAA0C;gCAM7B,sBAAsB"}
+{"version":3,"file":"SoundTrack.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/sound/ecs/emitter/SoundTrack.js"],"names":[],"mappings":"AAYA;IAscI,uCAMC;IApcD;;;OAGG;IACH,KAFU,SAAO,IAAI,CAEV;IAEX;;;OAGG;IACH,MAFU,MAAM,CAEP;IAET;;;OAGG;IACH,SAFU,SAAO,IAAI,CAER;IAEb;;;OAGG;IACH,iBAAa;IAEb;;;;OAIG;IACH,UAFU,MAAM,CAEF;IAGd;;;OAGG;IACH,OAFU,MAAM,GAAC,eAAe,CAEV;IAEtB;QACI;;WAEG;eADO,OAAO,IAAI,CAAC;MAGxB;IAQF;;;OAGG;IACH,6BAEC;IAED;;;OAGG;IACH,yBAFW,YAAY,QAItB;IAED;;;OAGG;IACH,6BAMC;IAED,0BAEC;IAUD,gCAiDC;IAED,gBAaC;IAED;;;;OAIG;IACH,eAHW,UAAU,UAmCpB;IAED;;;;OAIG;IACH,cAHW,MAAM,oBAAkB,GACtB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,oBAAkB,GACtB,IAAI,CAIhB;IAED;;;;OAIG;IACH,gBAHW,MAAM,oBAAkB,SACxB,OAAO,QAQjB;IAED;;;;OAIG;IACH,cAHW,MAAM,oBAAkB,GACtB,OAAO,CAInB;IAED;;;;;;;;;OASG;IACH,0BAJW,MAAM,YACN,MAAM,eACN,MAAM,QAuChB;IAED;;;OAGG;IACH,wBAMC;IAED;;;OAGG;IACH,qBAEC;IAUD;;;OAGG;IACH,uBAEC;IAdD;;;OAGG;IACH,oBAEC;IAkBD;;;OAGG;IACH,0BAEC;IAdD;;;OAGG;IACH,uBAEC;IAkBD;;;OAGG;IACH,iCAEC;IAdD;;;OAGG;IACH,8BAEC;IAUD;;;OAGG;IACH,YAFW,UAAU,QAOpB;IAED;;;;OAIG;IACH,cAHW,UAAU,GACR,OAAO,CAQnB;IAED;;;OAGG;IACH,QAFY,MAAM,CASjB;IAED;;;OAGG;IACH,SAFY,UAAU,CAQrB;IAED;;;;;;;;;MAWC;IAED;;;;;;;;;aA6BC;;CAUJ;gCAnd+B,sBAAsB;mBALnC,0CAA0C;gCAM7B,sBAAsB"}

package/src/engine/sound/ecs/emitter/SoundTrack.js

@@ -161,12 +161,16 @@ export class SoundTrack {
     }
 
     suspend() {
-        const nodes = this.nodes;
+        const nodes = this.#nodes;
+
+        if(nodes.source !== null) {
 
-        nodes.source.stop();
-        nodes.source.disconnect();
+            nodes.source.stop();
+            nodes.source.disconnect();
 
-        nodes.source = null;
+            nodes.source = null;
+
+        }
 
         this.setFlag(SoundTrackFlags.Suspended);
     }