@woosh/meep-engine 2.54.0 → 2.55.0

package/src/engine/intelligence/blackboard/BlackboardSerializationAdapter.js

@@ -4,12 +4,9 @@ import { Blackboard } from "./Blackboard.js";
 import { BlackboardValue } from "./BlackboardValue.js";
 
 export class BlackboardSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
 
-        this.klass = Blackboard;
-        this.version = 0;
-    }
+    klass = Blackboard;
+    version = 0;
 
     /**
      *

package/src/engine/knowledge/database/StaticKnowledgeDatabase.js

@@ -18,22 +18,21 @@ export const StaticKnowledgeState = {
 };
 
 export class StaticKnowledgeDatabase {
-    constructor() {
 
-        /**
-         *
-         * @type {ObservedEnum<StaticKnowledgeState>}
-         */
-        this.__state = new ObservedEnum(StaticKnowledgeState.Initial, StaticKnowledgeState);
+    /**
+     *
+     * @type {ObservedEnum<StaticKnowledgeState>}
+     */
+    __state = new ObservedEnum(StaticKnowledgeState.Initial, StaticKnowledgeState);
 
 
-        /**
-         *
-         * @type {StaticKnowledgeDataTableDescriptor[]}
-         * @private
-         */
-        this.__specs = [];
-    }
+    /**
+     *
+     * @type {StaticKnowledgeDataTableDescriptor[]}
+     * @private
+     */
+    __specs = [];
+    
 
     /**
      * Reset database, drop all table data

package/src/engine/knowledge/database/StaticKnowledgeDatabase.spec.js

@@ -0,0 +1,23 @@
+import { StaticKnowledgeDatabase } from "./StaticKnowledgeDatabase.js";
+import { StaticKnowledgeDataTable } from "./StaticKnowledgeDataTable.js";
+
+test("constructor does not throw", () => {
+    new StaticKnowledgeDatabase()
+});
+
+test("reset empty", () => {
+    const database = new StaticKnowledgeDatabase();
+
+    database.reset();
+});
+
+test("add/get", () => {
+    const database = new StaticKnowledgeDatabase();
+
+    const table = new StaticKnowledgeDataTable();
+    database.add("x", "y", table)
+
+    const actual = database.getTable('x');
+
+    expect(actual).toBe(table);
+});

package/src/engine/navigation/ecs/components/PathSerializationAdapter.js

@@ -6,12 +6,9 @@ import Path from "./Path.js";
 const v0 = new Vector3();
 
 export class PathSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
 
-        this.klass = Path;
-        this.version = 3;
-    }
+    klass = Path;
+    version = 3;
 
     /**
      *

package/src/engine/navigation/ecs/path_following/PathFollowerSerializationAdapter.js

@@ -2,12 +2,9 @@ import { BinaryClassSerializationAdapter } from "../../../ecs/storage/binary/Bin
 import PathFollower from "./PathFollower.js";
 
 export class PathFollowerSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
 
-        this.klass = PathFollower;
-        this.version = 3;
-    }
+    klass = PathFollower;
+    version = 3;
 
     /**
      *

package/src/engine/navigation/grid/find_path_on_grid_astar.spec.js

@@ -5,3 +5,28 @@ test("sanity check on 1x1 grid", () => {
 
     expect(path).toEqual([0]);
 });
+
+test("sanity check on 2x1 grid", () => {
+    const path = find_path_on_grid_astar(
+        [0, 0], 2, 1,
+        0, 1,
+        0, 0, 1
+    );
+
+    expect(path).toEqual([0, 1]);
+});
+
+test("sanity check on 2x2 grid", () => {
+
+    const path = find_path_on_grid_astar(
+        [
+            0, 0,
+            1, 0
+        ],
+        2, 2,
+        0, 3,
+        0, 0, 1
+    );
+
+    expect(path).toEqual([0, 1, 3]);
+});

package/src/engine/options/OptionAbstract.js

@@ -1,4 +1,10 @@
 export class OptionAbstract {
+    /**
+     *
+     * @type {OptionGroup|null}
+     */
+    parent = null;
+
     /**
      *
      * @param {string} id
@@ -11,11 +17,6 @@ export class OptionAbstract {
          */
         this.id = id;
 
-        /**
-         *
-         * @type {OptionGroup|null}
-         */
-        this.parent = null;
     }
 
     /**

package/src/engine/options/OptionGroup.js

@@ -8,20 +8,12 @@ function isOption(c) {
 }
 
 export class OptionGroup extends OptionAbstract {
+
     /**
      *
-     * @param {string} id
-     * @constructor
+     * @type {Array<OptionGroup|Option>}
      */
-    constructor(id) {
-        super(id);
-
-        /**
-         *
-         * @type {Array<OptionGroup|Option>}
-         */
-        this.children = [];
-    }
+    children = [];
 
     /**
      *
@@ -141,6 +133,7 @@ export class OptionGroup extends OptionAbstract {
      *
      * @param {string} path
      * @param {Storage} storage
+     * @returns {Promise}
      */
     attachToStorage(path, storage) {
         const group = this;
@@ -151,20 +144,6 @@ export class OptionGroup extends OptionAbstract {
             storage.load(key, resolve, reject);
         });
 
-        p
-            .then((loaded) => {
-                try {
-                    group.fromJSON(JSON.parse(loaded));
-                } catch (e) {
-                    console.log('Failed to load options')
-                }
-            })
-            .catch(console.error)
-            .finally(() => {
-
-                group.traverseOptions(op => op.on.written.add(store));
-            });
-
 
         function store() {
             const json = group.toJSON();
@@ -174,6 +153,15 @@ export class OptionGroup extends OptionAbstract {
             storage.store(key, value, noop, console.error, noop);
         }
 
+        return p
+            .then((loaded) => {
+                group.fromJSON(JSON.parse(loaded));
+            })
+            .finally(() => {
+
+                group.traverseOptions(op => op.on.written.add(store));
+            });
+
     }
 }
 

package/src/engine/options/OptionGroup.spec.js

@@ -0,0 +1,61 @@
+import { OptionGroup } from "./OptionGroup.js";
+import { noop } from "../../core/function/Functions.js";
+import { InMemoryStorage } from "../save/storage/InMemoryStorage.js";
+
+test("constructor", () => {
+    const group = new OptionGroup("x");
+
+    expect(group.id).toEqual("x");
+});
+
+test("resolve non-existent", () => {
+
+    const group = new OptionGroup("x");
+
+    expect(() => group.resolve(['a'])).toThrow();
+
+});
+
+test("add/get", () => {
+    const group = new OptionGroup("x");
+
+    group.add("a", noop, noop, {});
+
+    expect(group.getChildById('a')).toBeDefined();
+});
+
+test("to/from JSON", () => {
+    const group = new OptionGroup("x");
+
+    const writer = jest.fn();
+
+    group.add("a", () => 7, writer, {});
+
+    const json = group.toJSON();
+
+    expect(json).toEqual({ a: 7 });
+
+    group.fromJSON({ a: 13 });
+
+    expect(writer).toHaveBeenCalledTimes(1);
+    expect(writer).toHaveBeenCalledWith(13);
+});
+
+
+test("attach to storage", async () => {
+    const group = new OptionGroup("x");
+
+    const op_a = {
+        value: 3
+    };
+
+    group.add('a', () => op_a.value, v => op_a.value = v, {});
+
+    const storage = new InMemoryStorage();
+
+    storage.store('options', JSON.stringify({ a: 13 }));
+
+    await group.attachToStorage('options', storage);
+
+    expect(op_a.value).toEqual(13);
+});

package/src/engine/save/storage/InMemoryStorage.js

@@ -1,10 +1,11 @@
 import Storage from "../Storage.js";
 import { collectIteratorValueToArray } from "../../../core/collection/collectIteratorValueToArray.js";
+import { noop } from "../../../core/function/Functions.js";
 
 export class InMemoryStorage extends Storage {
     #data = new Map();
 
-    store(key, value, resolve, reject, progress) {
+    store(key, value, resolve=noop, reject, progress) {
         this.#data.set(key, value);
 
         resolve();
@@ -14,7 +15,7 @@ export class InMemoryStorage extends Storage {
         resolve(this.#data.get(key));
     }
 
-    remove(key, resolve, reject) {
+    remove(key, resolve=noop, reject) {
         this.#data.delete(key);
 
         resolve();

package/src/engine/sound/ecs/SoundController.js

@@ -146,12 +146,8 @@ export default SoundController;
 
 
 export class SoundControllerSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
-
-        this.klass = SoundController;
-        this.version = 0;
-    }
+    klass = SoundController;
+    version = 0;
 
     /**
      *

package/src/engine/sound/ecs/SoundListener.js

@@ -42,26 +42,8 @@ export default SoundListener;
 
 
 export class SoundListenerSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
+    klass = SoundListener;
+    version = 0;
 
-        this.klass = SoundListener;
-        this.version = 0;
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {SoundListener} value
-     */
-    serialize(buffer, value) {
-    }
-
-    /**
-     *
-     * @param {BinaryBuffer} buffer
-     * @param {SoundListener} value
-     */
-    deserialize(buffer, value) {
-    }
+    // NO-OP
 }

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

@@ -3,13 +3,9 @@ import { SoundEmitter } from "./SoundEmitter.js";
 import { SoundTrack } from "./SoundTrack.js";
 
 export class SoundEmitterSerializationAdapter extends BinaryClassSerializationAdapter {
-    constructor() {
-        super();
-
-        this.klass = SoundEmitter;
-        this.version = 2;
-    }
 
+    klass = SoundEmitter;
+    version = 2;
 
     /**
      *

package/src/generation/theme/ThemeEngine.js

@@ -10,7 +10,7 @@ import TaskGroup from "../../core/process/task/TaskGroup.js";
 import Future from "../../core/process/Future.js";
 import { optimizeIndividualMeshesEntitiesToInstances } from "../../engine/ecs/foliage/ecs/InstancedMeshUtils.js";
 import TaskState from "../../core/process/task/TaskState.js";
-import { HashMap } from "../../core/collection/HashMap.js";
+import { HashMap } from "../../core/collection/map/HashMap.js";
 import { TerrainLayer } from "../../engine/ecs/terrain/ecs/layers/TerrainLayer.js";
 import { TerrainFlags } from "../../engine/ecs/terrain/ecs/TerrainFlags.js";
 import { binarySearchLowIndex } from "../../core/collection/array/binarySearchLowIndex.js";

package/src/core/collection/LazyStream.js

@@ -1,23 +0,0 @@
-/**
- * @template A,B
- * @param {A[]} source
- * @param {function(A,index:number):B} transformer
- * @returns {B[]}
- */
-export function lazyArrayMap(source, transformer) {
-    return new Proxy(source, {
-        get(target, p, receiver) {
-            if (/^([0-9]+)$/.test(p)) {
-
-                const targetElement = target[p];
-
-                const resultElement = transformer(targetElement, p);
-
-                return resultElement;
-            } else {
-
-                return target[p];
-            }
-        }
-    });
-}

package/src/core/collection/LazyStream.spec.js

@@ -1,13 +0,0 @@
-import { lazyArrayMap } from "./LazyStream.js";
-
-test('lazyArrayMap', () => {
-    const source = [1, 2, 3];
-
-    const map = lazyArrayMap(source, a => a * 2);
-
-    expect(map.length).toBe(source.length);
-
-    for (let i = 0; i < source.length; i++) {
-        expect(map[i]).toBe(source[i] * 2);
-    }
-});

package/src/core/collection/heap/BinaryHeap.js

@@ -1,153 +0,0 @@
-/**
- * @deprecated use {@link FastBinaryHeap} instead
- * @param scoreFunction
- * @constructor
- */
-function BinaryHeap(scoreFunction) {
-    this.content = [];
-    this.hash = [];
-    this.scoreFunction = scoreFunction;
-}
-
-BinaryHeap.prototype = {
-    push: function (element) {
-        const content = this.content;
-        const length = content.length;
-        // Add the new element to the end of the array.
-        content.push(element);
-        //update hash
-        this.hash[element] = length;
-
-        // Allow it to sink down.
-        this.sinkDown(length);
-    },
-    pop: function () {
-        // Store the first element so we can return it later.
-        const content = this.content;
-        const hash = this.hash;
-        const result = content[0];
-        //update hash
-        delete hash[result];
-        // Get the element at the end of the array.
-        const end = content.pop();
-        // If there are any elements left, put the end element at the
-        // start, and let it bubble up.
-        const length = content.length;
-        if (length > 0) {
-            content[0] = end;
-            hash[end] = 0;
-            this.bubbleUp(0);
-        }
-        return result;
-    },
-    contains: function (node) {
-        return this.hash[node] !== void 0;
-    },
-    remove: function (node) {
-
-        const length = this.content.length;
-        const i = this.hash[node];
-
-        // When it is found, the process seen in 'pop' is repeated
-        // to fill up the hole.
-        const end = this.content.pop();
-        if (i !== length) {
-            this.content[i] = end;
-
-            if (this.scoreFunction(end) < this.scoreFunction(node)) {
-                this.sinkDown(i);
-            } else {
-                this.bubbleUp(i);
-            }
-        }
-    },
-    size: function () {
-        return this.content.length;
-    },
-    rescoreElement: function (node) {
-        this.sinkDown(this.hash[node]);
-    },
-    sinkDown: function (n) {
-        // Fetch the element that has to be sunk.
-        const content = this.content;
-        const hash = this.hash;
-        const element = content[n];
-
-        // When at 0, an element can not sink any further.
-        while (n > 0) {
-
-            // Compute the parent element's index, and fetch it.
-            const parentN = ((n + 1) >> 1) - 1,
-                parent = content[parentN];
-            // Swap the elements if the parent is greater.
-            if (this.scoreFunction(element) < this.scoreFunction(parent)) {
-                content[parentN] = element;
-                content[n] = parent;
-                //update hash
-                hash[element] = parentN;
-                hash[parent] = n;
-                // Update 'n' to continue at the new position.
-                n = parentN;
-            }
-            // Found a parent that is less, no need to sink any further.
-            else {
-                break;
-            }
-        }
-    },
-    bubbleUp: function (n) {
-        // Look up the target element and its score.
-        const content = this.content;
-        const hash = this.hash;
-        const scoreFunction = this.scoreFunction;
-        const length = content.length,
-            element = content[n],
-            elemScore = scoreFunction(element);
-
-        for (; ;) {
-            // Compute the indices of the child elements.
-            const child2N = (n + 1) << 1,
-                child1N = child2N - 1;
-            // This is used to store the new position of the element, if any.
-            let swap = null,
-                child1Score;
-            // If the first child exists (is inside the array)...
-            if (child1N < length) {
-                // Look it up and compute its score.
-                const child1 = content[child1N];
-                child1Score = scoreFunction(child1);
-
-                // If the score is less than our element's, we need to swap.
-                if (child1Score < elemScore) {
-                    swap = child1N;
-                }
-
-            }
-
-            // Do the same checks for the other child.
-            if (child2N < length) {
-                const child2 = content[child2N],
-                    child2Score = scoreFunction(child2);
-                if (child2Score < (swap === null ? elemScore : child1Score)) {
-                    swap = child2N;
-                }
-            }
-
-            // If the element needs to be moved, swap it, and continue.
-            if (swap !== null) {
-                const swapContent = content[swap];
-                content[n] = swapContent;
-                content[swap] = element;
-                //update hash
-                hash[element] = swap;
-                hash[swapContent] = n;
-                n = swap;
-            }
-            // Otherwise, we are done.
-            else {
-                break;
-            }
-        }
-    }
-};
-export default BinaryHeap;

package/src/engine/ecs/components/GeometryBVH.js

@@ -1,44 +0,0 @@
-/**
- * Created by Alex on 02/02/2015.
- */
-import { Ray as ThreeRay, Vector3 as ThreeVector3 } from 'three';
-
-function GeometryBVH(geometry) {
-    this.geometry = geometry;
-    this.bvh = null;
-}
-
-GeometryBVH.prototype.raycast = (function () {
-    const hit = new ThreeVector3();
-    const ray = new ThreeRay();
-
-    function raycast(origin, direction, callback) {
-        const geometry = this.geometry;
-        const vertices = geometry.vertices;
-        let hitCount = 0;
-        this.bvh.traverseRayLeafIntersections(origin.x, origin.y, origin.z, direction.x, direction.y, direction.z, function (leaf) {
-            const face = leaf.object;
-            hitCount++;
-            ray.set(origin, direction);
-            const vA = vertices[face.a];
-            const vB = vertices[face.b];
-            const vC = vertices[face.c];
-            let hitFound = ray.intersectTriangle(vA, vB, vC, false, hit);
-            if (hitFound) {
-                callback(hit, face, geometry);
-            } else {
-                //try opposite way
-                hitFound = ray.intersectTriangle(vC, vB, vA, false, hit);
-                if (hitFound) {
-                    callback(hit, face, geometry);
-                }
-            }
-        });
-    }
-
-    return raycast;
-})();
-
-GeometryBVH.typeName = "GeometryBVH";
-
-export default GeometryBVH;

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

@@ -1,36 +0,0 @@
-/**
- * Created by Alex on 02/02/2015.
- */
-import { System } from '../System.js';
-import GeometryBVH from '../components/GeometryBVH.js';
-import BVHFromGeometry from '../../graphics/geometry/bvh/BVHFromGeometry.js';
-
-
-class GeometryBVHSystem extends System {
-    constructor(grid) {
-        super();
-
-        this.dependencies = [GeometryBVH];
-        //
-        this.entityManager = null;
-        this.grid = grid;
-    }
-
-    unlink(component, entity) {
-    }
-
-    link(component, entity) {
-        //build bvh
-        const g = component.geometry;
-        //check if bvh exists
-        if (component.bvh === null) {
-            component.bvh = BVHFromGeometry(g);
-        }
-    }
-
-    update(timeDelta) {
-    }
-}
-
-
-export default GeometryBVHSystem;