@woosh/meep-engine 2.88.5 → 2.89.0

package/build/meep.module.js

@@ -63677,13 +63677,13 @@ function makeTerrainWorkerProxy() {
 }
 
 class OffsetScaleTransform2D {
-    constructor() {
-        this.offset_x = 0;
-        this.offset_y = 0;
 
-        this.scale_x = 1;
-        this.scale_y = 1;
-    }
+    offset_x = 0;
+    offset_y = 0;
+
+    scale_x = 1;
+    scale_y = 1;
+
 }
 
 /**

package/package.json

@@ -5,7 +5,7 @@
   "description": "Fully featured ECS game engine written in JavaScript",
   "type": "module",
   "author": "Alexander Goldring",
-  "version": "2.88.5",
+  "version": "2.89.0",
   "main": "build/meep.module.js",
   "module": "build/meep.module.js",
   "exports": {

package/src/engine/animation/curve/prototypeGLTF.js

@@ -6,10 +6,7 @@ import Entity from "../../ecs/Entity.js";
 import { Transform } from "../../ecs/transform/Transform.js";
 import { EngineHarness } from "../../EngineHarness.js";
 import { SGMesh } from "../../graphics/ecs/mesh-v2/aggregate/SGMesh.js";
-import {
-    AnimationPlayback,
-    SGMeshAnimationController
-} from "../../graphics/ecs/mesh-v2/aggregate/SGMeshAnimationController.js";
+import { SGMeshAnimationController } from "../../graphics/ecs/mesh-v2/aggregate/SGMeshAnimationController.js";
 import {
     SGMeshAnimationControllerSystem
 } from "../../graphics/ecs/mesh-v2/aggregate/SGMeshAnimationControllerSystem.js";
@@ -55,11 +52,7 @@ async function main(engine) {
         'Linear Translation'
     ].forEach(name => {
 
-        const playback = new AnimationPlayback();
-        playback.clip_name = name;
-        playback.loop = true;
-
-        controller.active.push(playback)
+        controller.start(name,true);
 
     })
 

package/src/engine/ecs/terrain/ecs/OffsetScaleTransform2D.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OffsetScaleTransform2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/ecs/OffsetScaleTransform2D.js"],"names":[],"mappings":"AAAA;IAEQ,iBAAiB;IACjB,iBAAiB;IAEjB,gBAAgB;IAChB,gBAAgB;CAEvB"}
+{"version":3,"file":"OffsetScaleTransform2D.d.ts","sourceRoot":"","sources":["../../../../../../src/engine/ecs/terrain/ecs/OffsetScaleTransform2D.js"],"names":[],"mappings":"AAAA;IAEI,iBAAa;IACb,iBAAa;IAEb,gBAAY;IACZ,gBAAY;CAEf"}

package/src/engine/ecs/terrain/ecs/OffsetScaleTransform2D.js

@@ -1,9 +1,9 @@
 export class OffsetScaleTransform2D {
-    constructor() {
-        this.offset_x = 0;
-        this.offset_y = 0;
 
-        this.scale_x = 1;
-        this.scale_y = 1;
-    }
+    offset_x = 0;
+    offset_y = 0;
+
+    scale_x = 1;
+    scale_y = 1;
+
 }

package/src/engine/graphics/ecs/mesh-v2/aggregate/SGMeshAnimationController.d.ts

@@ -9,7 +9,32 @@ export class SGMeshAnimationController {
      * @type {EntityNodeAnimationClip[]}
      */
     bound: EntityNodeAnimationClip[];
-    getBoundByName(name: any): EntityNodeAnimationClip;
+    /**
+     *
+     * @param {string} name
+     * @return {EntityNodeAnimationClip|undefined}
+     */
+    getBoundByName(name: string): EntityNodeAnimationClip | undefined;
+    /**
+     *
+     * @param {string} name
+     * @return {AnimationPlayback|undefined}
+     */
+    getActiveByName(name: string): AnimationPlayback | undefined;
+    /**
+     *
+     * @param {string} name
+     * @param {boolean} loop
+     * @param {number} time_offset
+     * @returns {AnimationPlayback}
+     */
+    start(name: string, loop?: boolean, time_offset?: number): AnimationPlayback;
+    /**
+     *
+     * @param {AnimationPlayback} playback
+     * @return {boolean}
+     */
+    stop(playback: AnimationPlayback): boolean;
 }
 export class AnimationPlayback {
     clip_name: string;

package/src/engine/graphics/ecs/mesh-v2/aggregate/SGMeshAnimationController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SGMeshAnimationController.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/ecs/mesh-v2/aggregate/SGMeshAnimationController.js"],"names":[],"mappings":"AAAA;IACI;;;OAGG;IACH,QAFU,iBAAiB,EAAE,CAElB;IAEX;;;OAGG;IACH,OAFU,yBAAyB,CAEzB;IAEV,mDAEC;CACJ;AAED;IACI,kBAAc;IACd,aAAQ;IACR,cAAY;CACf"}
+{"version":3,"file":"SGMeshAnimationController.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/ecs/mesh-v2/aggregate/SGMeshAnimationController.js"],"names":[],"mappings":"AAGA;IACI;;;OAGG;IACH,QAFU,iBAAiB,EAAE,CAElB;IAEX;;;OAGG;IACH,OAFU,yBAAyB,CAEzB;IAEV;;;;OAIG;IACH,qBAHW,MAAM,GACL,0BAAwB,SAAS,CAM5C;IAED;;;;OAIG;IACH,sBAHW,MAAM,GACL,iBAAiB,GAAC,SAAS,CAMtC;IAGD;;;;;;OAMG;IACH,YALW,MAAM,SACN,OAAO,gBACP,MAAM,GACJ,iBAAiB,CAgB7B;IAED;;;;OAIG;IACH,eAHW,iBAAiB,GAChB,OAAO,CAQlB;CACJ;AAED;IACI,kBAAc;IACd,aAAQ;IACR,cAAY;CACf"}

package/src/engine/graphics/ecs/mesh-v2/aggregate/SGMeshAnimationController.js

@@ -1,3 +1,6 @@
+import { assert } from "../../../../../core/assert.js";
+import { array_remove_first } from "../../../../../core/collection/array/array_remove_first.js";
+
 export class SGMeshAnimationController {
     /**
      *
@@ -11,9 +14,64 @@ export class SGMeshAnimationController {
      */
     bound = []
 
+    /**
+     *
+     * @param {string} name
+     * @return {EntityNodeAnimationClip|undefined}
+     */
     getBoundByName(name) {
+        assert.isString(name, 'name');
+
         return this.bound.find(b => b.name === name);
     }
+
+    /**
+     *
+     * @param {string} name
+     * @return {AnimationPlayback|undefined}
+     */
+    getActiveByName(name) {
+        assert.isString(name, 'name');
+
+        return this.active.find(a => a.clip_name === name);
+    }
+
+
+    /**
+     *
+     * @param {string} name
+     * @param {boolean} loop
+     * @param {number} time_offset
+     * @returns {AnimationPlayback}
+     */
+    start(name, loop = false, time_offset = 0) {
+        assert.isString(name, 'name');
+        assert.isBoolean(loop, 'loop');
+        assert.isNumber(time_offset, 'time_offset');
+
+        const playback = new AnimationPlayback();
+
+        playback.clip_name = name;
+        playback.loop = loop;
+        playback.time = time_offset;
+
+        this.active.push(playback);
+
+        return playback;
+    }
+
+    /**
+     *
+     * @param {AnimationPlayback} playback
+     * @return {boolean}
+     */
+    stop(playback) {
+
+        assert.defined(playback, 'playback');
+        assert.notNull(playback, 'playback');
+
+        return array_remove_first(this.active, playback)
+    }
 }
 
 export class AnimationPlayback {

package/src/engine/graphics/ecs/mesh-v2/aggregate/SGMeshAnimationControllerSystem.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SGMeshAnimationControllerSystem.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/ecs/mesh-v2/aggregate/SGMeshAnimationControllerSystem.js"],"names":[],"mappings":"AAQA;IAII;;;OAGG;IACH,4BAeC;IAZG,eAAoB;IAEpB,mEAGC;IAED,gIAGC;IAuCL;;;;;OAKG;IACH,WAJW,yBAAyB,QACzB,MAAM,UACN,MAAM,iBAUhB;IAED,sBA8CC;;CACJ;uBAhIsB,2BAA2B;uBAE3B,aAAa;0CACM,gCAAgC;4CAL9B,0DAA0D"}
+{"version":3,"file":"SGMeshAnimationControllerSystem.d.ts","sourceRoot":"","sources":["../../../../../../../src/engine/graphics/ecs/mesh-v2/aggregate/SGMeshAnimationControllerSystem.js"],"names":[],"mappings":"AAQA;IAaI;;;OAGG;IACH,4BAeC;IAZG,eAAoB;IAEpB,mEAGC;IAED,gIAGC;IA2CL;;;;;OAKG;IACH,WAJW,yBAAyB,QACzB,MAAM,UACN,MAAM,iBAUhB;IA6CD,sBAoBC;;CACJ;uBA9JsB,2BAA2B;uBAE3B,aAAa;0CACM,gCAAgC;4CAL9B,0DAA0D"}

package/src/engine/graphics/ecs/mesh-v2/aggregate/SGMeshAnimationControllerSystem.js

@@ -7,7 +7,16 @@ import { SGMesh } from "./SGMesh.js";
 import { SGMeshAnimationController } from "./SGMeshAnimationController.js";
 
 export class SGMeshAnimationControllerSystem extends System {
+    /**
+     * Current time delta
+     * @type {number}
+     */
+    #time_delta = 0;
 
+    /**
+     * Entity queue
+     * @type {number[]}
+     */
     #queue = [];
 
     /**
@@ -62,6 +71,10 @@ export class SGMeshAnimationControllerSystem extends System {
         console.log(asset, animations);
     }
 
+    /**
+     *
+     * @param {number} entity
+     */
     #enqueue(entity) {
         this.#queue.push(entity);
     }
@@ -82,7 +95,51 @@ export class SGMeshAnimationControllerSystem extends System {
         await this.#process(entity);
     }
 
+    /**
+     *
+     * @param {SGMeshAnimationController} controller
+     */
+    #visit_entity(controller) {
+
+        const active = controller.active;
+
+        let active_count = active.length;
+
+        for (let i = 0; i < active_count; i++) {
+            const playback = active[i];
+
+            playback.time += this.#time_delta;
+
+            const clip = controller.getBoundByName(playback.clip_name);
+
+            if (clip === undefined) {
+                // clip doesn't exist
+                continue;
+            }
+
+            let t = playback.time;
+
+            if (t > clip.duration) {
+                if (playback.loop) {
+                    t = t % clip.duration;
+                } else {
+                    t = clip.duration;
+
+                    // remove active
+                    active.splice(i, 1);
+
+                    i--;
+                    active_count--;
+                }
+            }
+
+            clip.writeAt(t);
+
+        }
+    }
+
     update(td) {
+        this.#time_delta = td;
 
         for (let i = 0; i < 1000; i++) {
             if (this.#queue.length === 0) {
@@ -100,33 +157,6 @@ export class SGMeshAnimationControllerSystem extends System {
             return;
         }
 
-        ecd.traverseComponents(SGMeshAnimationController, (controller) => {
-
-            const active = controller.active;
-
-            for (let i = 0; i < active.length; i++) {
-                const playback = active[i];
-
-                playback.time += td;
-
-                const clip = controller.getBoundByName(playback.clip_name);
-
-                if (clip !== undefined) {
-                    let t=  playback.time;
-
-                    if (t > clip.duration) {
-                        if (playback.loop) {
-                            t = t%clip.duration;
-                        }else{
-                            t = clip.duration;
-                        }
-                    }
-
-                    clip.writeAt(t);
-                }
-
-            }
-
-        });
+        ecd.traverseComponents(SGMeshAnimationController, this.#visit_entity, this);
     }
 }