@woosh/meep-engine 2.39.5 → 2.39.9

package/engine/navigation/ecs/components/Path.js

@@ -7,12 +7,10 @@ import Vector3 from "../../../../core/geom/Vector3.js";
 
 import { CatmullRomCurve3 } from "three";
 import { clamp } from "../../../../core/math/clamp.js";
-import { lerp } from "../../../../core/math/lerp.js";
 import { assert } from "../../../../core/assert.js";
 import { RowFirstTableSpec } from "../../../../core/collection/table/RowFirstTableSpec.js";
 import { DataType } from "../../../../core/collection/table/DataType.js";
 import { RowFirstTable } from "../../../../core/collection/table/RowFirstTable.js";
-import { max2 } from "../../../../core/math/max2.js";
 import { min2 } from "../../../../core/math/min2.js";
 import { computeNonuniformCatmullRomSplineSample } from "./computeNonuniformCatmullRomSplineSample.js";
 import { InterpolationType } from "./InterpolationType.js";
@@ -20,6 +18,8 @@ import { v3_distance } from "../../../../core/geom/v3_distance.js";
 import {
     line3_computeSegmentPointDistance_sqr
 } from "../../../../core/geom/3d/line/line3_computeSegmentPointDistance_sqr.js";
+import { VertexDataSpec } from "../../../graphics/geometry/VertexDataSpec.js";
+import { AttributeSpec } from "../../../graphics/geometry/AttributeSpec.js";
 
 const v3_a = new Vector3();
 const v3_b = new Vector3();
@@ -53,10 +53,32 @@ const scratch_array_3 = [];
  */
 const scratch_array_4 = [];
 
-const DEFAULT_SPEC = new RowFirstTableSpec([DataType.Float32, DataType.Float32, DataType.Float32]);
+/**
+ *
+ * @type {RowFirstTableSpec}
+ */
+const DEFAULT_SPEC = Object.freeze(new RowFirstTableSpec([
+    DataType.Float32, // position X
+    DataType.Float32, // position Y
+    DataType.Float32  // position Z
+]));
 
 class Path {
     constructor() {
+        /**
+         *
+         * @type {VertexDataSpec}
+         * @private
+         */
+        this.__spec = VertexDataSpec.from(
+            AttributeSpec.fromJSON({
+                name: 'position',
+                type: DataType.Float32,
+                itemSize: 3,
+                normalized: false
+            })
+        );
+
         /**
          * @readonly
          * @type {RowFirstTable}
@@ -65,27 +87,36 @@ class Path {
         this.__data = new RowFirstTable(DEFAULT_SPEC);
 
         /**
-         *
+         * Now to get in-between values
          * @type {InterpolationType|number}
          */
         this.interpolation = InterpolationType.Linear;
 
         /**
-         *
+         * Absolute length of the path, measured as straight-line distance sum of point pairs
          * @type {number}
          * @private
          */
         this.__length = -1;
     }
 
+    /**
+     * @deprecated
+     */
     get markerOffset() {
         throw new Error('deprecated, use PathFollower instead');
     }
 
+    /**
+     * @deprecated
+     */
     get markerIndex() {
         throw new Error('deprecated, use PathFollower instead');
     }
 
+    /**
+     * @deprecated
+     */
     get markerDistanceToNext() {
         throw new Error('deprecated, use PathFollower instead');
     }
@@ -100,13 +131,10 @@ class Path {
 
     /**
      *
-     * TODO this needs to be moved to PathFollower
      * @deprecated
      */
     reset() {
-        console.warn('deprecated');
-        this.markerOffset = 0;
-        this.markerIndex = 0;
+        throw new Error('deprecated, use PathFollower instead');
     }
 
     clear() {
@@ -146,6 +174,9 @@ class Path {
 
         // force row count
         this.__data.length = v;
+
+        // reset computed length
+        this.__length = -1;
     }
 
     /**
@@ -160,6 +191,10 @@ class Path {
             return false;
         } else {
             this.__data.removeRows(index, 1);
+
+            // reset computed length
+            this.__length = -1;
+
             return true;
         }
     }
@@ -189,7 +224,7 @@ class Path {
      * @param {number} z
      */
     setPosition(index, x, y, z) {
-        assert.lessThan(index, this.count, "overflow");
+        assert.lessThanOrEqual(index, this.count, "overflow");
 
         assert.isNumber(x, "x");
         assert.isNumber(y, "y");
@@ -264,6 +299,9 @@ class Path {
         }
     }
 
+    /**
+     * Reverse order of points
+     */
     reverse() {
         this.__data.reverse_rows();
     }
@@ -275,6 +313,7 @@ class Path {
     copy(other) {
         this.__data.copy(other.__data);
         this.interpolation = other.interpolation;
+        this.__length = other.__length;
     }
 
     /**
@@ -336,101 +375,21 @@ class Path {
         return closest_index;
     }
 
-    /**
-     * TODO this needs to be moved to PathFollower
+    /*
      * @deprecated
      * @returns {number}
      */
     getCurrentOffset() {
-        console.warn('deprecated');
-        let result = 0;
-
-        const n = this.getPointCount();
-
-        if (n < 2) {
-            return 0;
-        }
-
-        let current = v3_a;
-        let previous = v3_b;
-
-        this.getPosition(0, previous);
-
-        for (let i = 1; i < n; i++) {
-            this.getPosition(i, current);
-
-            if (i > this.markerIndex) {
-                result += this.markerOffset;
-                break;
-            }
-
-            const d = previous.distanceTo(current);
-
-            result += d;
-
-            // swap
-            const t = previous;
-            previous = current;
-            current = t;
-        }
-
-        return result;
+        throw new Error('deprecated, use PathFollower instead');
     }
 
     /**
-     * TODO this needs to be moved to PathFollower
      * @param {number} distanceDelta
      * @returns {number} unused distance
      * @deprecated
      */
     move(distanceDelta) {
-        console.warn('deprecated');
-
-        if (!this.isComplete()) {
-
-            const point_count = this.getPointCount();
-            const max_index = point_count - 1;
-
-            distanceDelta += this.markerOffset;
-
-            this.markerOffset = 0;
-
-            let current = v3_a;
-            let next = v3_b;
-
-            this.getPosition(this.markerIndex, current);
-
-            while (distanceDelta > 0) {
-                this.getPosition(this.markerIndex + 1, next);
-
-                const distance = current.distanceTo(next);
-                this.markerDistanceToNext = distance;
-
-                if (distanceDelta < distance) {
-                    this.markerOffset = distanceDelta;
-                    return 0;
-                } else {
-                    this.markerIndex++;
-                    distanceDelta -= distance;
-                }
-
-                // swap points
-                const swap_t = current;
-
-                current = next;
-                next = swap_t;
-
-                if (this.markerIndex >= max_index) {
-                    //reached the end of the path
-                    this.markerOffset = 0;
-                    this.markerIndex = max_index;
-                    break;
-                }
-
-            }
-        }
-
-        return distanceDelta;
+        throw new Error('deprecated, use PathFollower instead');
     }
 
     /**
@@ -573,10 +532,7 @@ class Path {
      * @deprecated use {@link PathFollower#finished} instead
      */
     isComplete() {
-        console.warn('deprecated');
-        const lastIndex = this.getPointCount() - 1;
-
-        return this.markerIndex >= lastIndex;
+        throw new Error('deprecated, use PathFollower instead');
     }
 
 
@@ -604,167 +560,37 @@ class Path {
      * @deprecated
      */
     getCurrentPosition(result) {
-        console.warn('deprecated');
-        switch (this.interpolation) {
-            case InterpolationType.Zero:
-                return this.computePositionOrder0(result);
-            case InterpolationType.Linear:
-                return this.computePositionOrder1(result);
-            case InterpolationType.Second:
-                return this.computePositionOrder2(result);
-            default:
-                throw new Error(`Unsupported sampling type ${this.interpolation}`);
-        }
+
+        throw new Error('deprecated, use PathFollower instead');
     }
 
     /**
-     * TODO this needs to be moved to PathFollower
      * @param {Vector3} result
      * @return {boolean}
      * @deprecated
      */
     computePositionOrder0(result) {
-        console.warn('deprecated');
-        const index = this.markerIndex;
-
-        if (index >= this.getPointCount()) {
-            return false;
-        }
-
-        this.getPosition(index, result);
-
-        return true;
+        throw new Error('deprecated, use PathFollower instead');
     }
 
     /**
      *
-     * TODO this needs to be moved to PathFollower
      * @param {Vector3} result
      * @return {boolean}
      * @deprecated
      */
     computePositionOrder1(result) {
-        console.warn('deprecated');
-        const pointCount = this.getPointCount();
-        const markerIndex = this.markerIndex;
-
-
-        if (markerIndex >= pointCount) {
-            // we're at the end
-            return false;
-        }
-
-        this.getPosition(markerIndex, v3_a);
-        const d = this.markerOffset;
-
-        if (d === 0) {
-            result.copy(v3_a);
-            return true;
-        }
-
-        const next_index = markerIndex + 1;
-
-        if (next_index >= pointCount) {
-            // we're at the end, no next point
-            return false;
-        }
-
-        this.getPosition(next_index, v3_b);
-
-        const l = this.markerDistanceToNext;
-
-        if (d === l) {
-            result.copy(v3_b);
-            return true;
-        }
-
-        const nd = d / l;
-
-        result.lerpVectors(v3_a, v3_b, nd);
-
-        return true;
+        throw new Error('deprecated, use PathFollower instead');
     }
 
     /**
      *
-     * TODO this needs to be moved to PathFollower
      * @param {Vector3} result
      * @return {boolean}
      * @deprecated
      */
     computePositionOrder2(result) {
-        console.warn('deprecated');
-
-        const i = this.markerIndex;
-
-        const iMax = this.getPointCount() - 1;
-
-        if (iMax < 0) {
-            //no points to sample
-            return false;
-        }
-
-        //get 2 below and 2 above
-        const pi0 = max2(i - 1, 0);
-        const pi1 = i;
-        const pi2 = min2(i + 1, iMax);
-        const pi3 = min2(i + 2, iMax);
-
-        // read out point data
-        this.getPosition(pi0, v3_a);
-
-        const p0_x = v3_a.x;
-        const p0_y = v3_a.y;
-        const p0_z = v3_a.z;
-
-        this.getPosition(pi1, v3_a);
-
-        const p1_x = v3_a.x;
-        const p1_y = v3_a.y;
-        const p1_z = v3_a.z;
-
-        this.getPosition(pi2, v3_a);
-
-        const p2_x = v3_a.x;
-        const p2_y = v3_a.y;
-        const p2_z = v3_a.z;
-
-        this.getPosition(pi3, v3_a);
-
-        const p3_x = v3_a.x;
-        const p3_y = v3_a.y;
-        const p3_z = v3_a.z;
-
-        //compute delta vectors between points
-        const ax = p1_x - p0_x;
-        const ay = p1_y - p0_y;
-        const az = p1_z - p0_z;
-
-        const cx = p3_x - p2_x;
-        const cy = p3_y - p2_y;
-        const cz = p3_z - p2_z;
-
-        const d = this.markerOffset;
-        const l = this.markerDistanceToNext;
-
-        let nd;
-
-        if (l === 0) {
-            nd = 0;
-        } else {
-            nd = d / l;
-        }
-
-        //interpolate slope
-        const ind = 1 - nd;
-
-        const x = lerp(p1_x + ax * nd, p2_x - cx * ind, nd);
-        const y = lerp(p1_y + ay * nd, p2_y - cy * ind, nd);
-        const z = lerp(p1_z + az * nd, p2_z - cz * ind, nd);
-
-        result.set(x, y, z);
-
-        return true;
+        throw new Error('deprecated, use PathFollower instead');
     }
 
     toString() {

package/engine/notify/Notification.js

@@ -6,6 +6,9 @@
 import ObservedValue from '../../core/model/ObservedValue.js';
 import { assert } from "../../core/assert.js";
 
+/**
+ * @class
+ */
 export class Notification {
     /**
      *

package/engine/scene/transitionToScene.js

@@ -6,6 +6,7 @@ import { noop } from "../../core/function/Functions.js";
 import { compileAllMaterials } from "../graphics/ecs/compileAllMaterials.js";
 import { createTaskWaitForMeshesToLoad } from "../graphics/ecs/mesh/createTaskWaitForMeshesToLoad.js";
 import { loadVisibleTerrainTiles } from "../ecs/terrain/util/loadVisibleTerrainTiles.js";
+import { TaskLoadingScreen } from "../../view/task/TaskLoadingScreen.js";
 
 
 /**
@@ -117,7 +118,7 @@ export function transitionToScene({ tasks = [], scene, engine, name }) {
         }
     );
 
-    const promise = engine.loadSlowTask(taskGroup);
+    const promise = TaskLoadingScreen.load(engine, taskGroup);
 
     Task.joinAll(tasks, () => {
         engine.executor.runMany(extraTasks);

package/engine/ui/notification/AnimatedObjectEmitter.js

@@ -75,7 +75,8 @@ export class AnimatedObjectEmitter {
         this.rushThreshold = Number.POSITIVE_INFINITY;
 
         /**
-         * Maximum number of elements to be emitted per second
+         * Minimum time that must pass between objects being emitted (in Seconds)
+         * Objects spawned more often than that will be buffered and released at regular intervals
          * @type {number}
          */
         this.spawnDelay = 0;
@@ -101,7 +102,7 @@ export class AnimatedObjectEmitter {
         };
 
         /**
-         *
+         * Number of active objects
          * @type {number}
          */
         this.liveCount = 0;

package/engine/ui/notification/ViewEmitter.js

@@ -58,6 +58,14 @@ class ViewEmitter {
         this.objectEmitter.rushThreshold = v;
     }
 
+    /**
+     *
+     * @param {number} v in seconds
+     */
+    setSpawnDelay(v) {
+        this.objectEmitter.spawnDelay = v;
+    }
+
     tick(timeDelta) {
         const scaledTimeDelta = timeDelta * this.timeScale;
 

package/engine/ui/scene/initializeNotifications.js

@@ -12,6 +12,7 @@ function makePrimary() {
      */
     const viewEmitter = new ViewEmitter();
     viewEmitter.setRushThreshold(1);
+    viewEmitter.setSpawnDelay(2);
 
     const animationTrack = new AnimationTrack(["alpha", "scale"]);
     animationTrack.addKey(0, [0, 1.3]);
@@ -51,6 +52,7 @@ function makeSecondary() {
      */
     const viewEmitter = new ViewEmitter();
     viewEmitter.setRushThreshold(1);
+    viewEmitter.setSpawnDelay(0.7);
 
     const animationTrack = new AnimationTrack(["alpha", "position.y", "scale"]);
     animationTrack.addKey(0, [0.2, 0, 1.1]);
@@ -92,6 +94,7 @@ function makeToast() {
      */
     const viewEmitter = new ViewEmitter();
     viewEmitter.setRushThreshold(5);
+    viewEmitter.setSpawnDelay(0.1);
 
     const animationTrack = new AnimationTrack(["alpha", "position.x"]);
     animationTrack.addKey(0, [0.2, 100]);

package/generation/{GridGenerator.js → GridTaskGroup.js}

@@ -1,22 +1,38 @@
 import TaskGroup from "../core/process/task/TaskGroup.js";
+import { GridTaskGenerator } from "./grid/GridTaskGenerator.js";
 
-export class GridGenerator {
+export class GridTaskGroup extends GridTaskGenerator {
     constructor() {
+        super();
 
         /**
          *
          * @type {GridTaskGenerator[]}
          */
-        this.generators = [];
+        this.children = [];
 
     }
 
+
+    /**
+     *
+     * @param {GridTaskGenerator[]} children
+     * @returns {GridTaskGroup}
+     */
+    static from(children) {
+        const r = new GridTaskGroup();
+
+        children.forEach(r.addGenerator, r);
+
+        return r;
+    }
+
     /**
      *
      * @param {GridTaskGenerator} generator
      */
     addGenerator(generator) {
-        this.generators.push(generator);
+        this.children.push(generator);
     }
 
     /**
@@ -26,7 +42,7 @@ export class GridGenerator {
      * @param {number} seed
      * @returns {TaskGroup}
      */
-    generate(ecd, grid, seed) {
+    build(grid, ecd, seed) {
 
         /**
          *
@@ -34,7 +50,7 @@ export class GridGenerator {
          */
         const tasks = [];
 
-        const generators = this.generators;
+        const generators = this.children;
         const generator_count = generators.length;
 
         //generate tasks

package/generation/example/SampleGenerator0.js

@@ -1,4 +1,4 @@
-import { GridGenerator } from "../GridGenerator.js";
+import { GridTaskGroup } from "../GridTaskGroup.js";
 import { GridCellPlacementRule } from "../placement/GridCellPlacementRule.js";
 import { CellMatcherGridPattern } from "../rules/cell/CellMatcherGridPattern.js";
 import { CellMatcherLayerBitMaskTest } from "../rules/CellMatcherLayerBitMaskTest.js";
@@ -55,7 +55,7 @@ import { CellFilterCubicFunction } from "../filtering/numeric/math/poly/CellFilt
 import { CellFilterMax2 } from "../filtering/numeric/math/CellFilterMax2.js";
 import { matcher_not_play_area } from "./rules/matcher_not_play_area.js";
 
-export const SampleGenerator0 = new GridGenerator();
+export const SampleGenerator0 = new GridTaskGroup();
 
 
 const pTreasureCorner = new CellMatcherGridPattern();

package/generation/example/main.js

@@ -28,6 +28,7 @@ import { MeshSystem } from "../../engine/graphics/ecs/mesh/MeshSystem.js";
 import TopDownCameraControllerSystem from "../../engine/graphics/ecs/camera/topdown/TopDownCameraControllerSystem.js";
 import { TopDownCameraLanderSystem } from "../../engine/graphics/ecs/camera/topdown/TopDownCameraLanderSystem.js";
 import LightSystem from "../../engine/graphics/ecs/light/LightSystem.js";
+import { TaskLoadingScreen } from "../../view/task/TaskLoadingScreen.js";
 
 function makeEngineConfig(engine) {
     const config = new EngineConfiguration();
@@ -182,7 +183,7 @@ function main(engine) {
 
     const tBuildLevel = prepare_gen_task({ ecd });
 
-    engine.loadSlowTask(tBuildLevel);
+    TaskLoadingScreen.load(engine, tBuildLevel);
 
     engine.executor.runGroup(tBuildLevel);
 

package/generation/filtering/core/CellFilterUnaryOperation.js

@@ -1,15 +1,12 @@
 import { CellFilter } from "../CellFilter.js";
 
 export class CellFilterUnaryOperation extends CellFilter {
-    constructor() {
-        super();
 
-        /**
-         *
-         * @type {CellFilter}
-         */
-        this.source = null;
-    }
+    /**
+     *
+     * @type {CellFilter}
+     */
+    source = null;
 
     /**
      *

package/generation/filtering/numeric/util/CellFilterDisplaced.js

@@ -1,14 +1,14 @@
 import { CellFilterUnaryOperation } from "../../core/CellFilterUnaryOperation.js";
-import Vector2 from "../../../core/geom/Vector2.js";
-import { assert } from "../../../core/assert.js";
+import Vector2 from "../../../../core/geom/Vector2.js";
+import { assert } from "../../../../core/assert.js";
 
 export class CellFilterDisplaced extends CellFilterUnaryOperation {
+    /**
+     * @readonly
+     * @type {Vector2}
+     */
+    offset = new Vector2();
 
-    constructor() {
-        super();
-
-        this.offset = new Vector2();
-    }
 
     /**
      *

package/generation/grid/generation/GridTaskSequence.js

@@ -31,17 +31,19 @@ export class GridTaskSequence extends GridTaskGenerator {
 
         const tasks = [];
 
+        // Build tasks
         for (let i = 0; i < n; i++) {
             const child = children[i];
 
             if (child.dependencies.length > 0) {
-                throw new Error('Children are not allowed to have dependencies');
+                throw new Error('Children are not allowed to have dependencies, dependencies are implied by the sequence');
             }
 
             const task = child.build(grid, ecd, seed);
 
-            if (tasks.length > 0) {
-                task.addDependency(tasks[tasks.length - 1]);
+            if (i > 0) {
+                // add dependence on previous task
+                task.addDependency(tasks[i - 1]);
             }
 
             tasks.push(task);