@woosh/meep-engine 2.61.0 → 2.63.0

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

@@ -5,23 +5,24 @@
  */
 
 
-import { System } from '../../../ecs/System.js';
-import { SoundEmitter } from './SoundEmitter.js';
-import { Transform } from '../../../ecs/transform/Transform.js';
-import { SoundAssetLoader } from "../../../asset/loaders/SoundAssetLoader.js";
-import { GameAssetType } from "../../../asset/GameAssetType.js";
-import { BinaryNode } from "../../../../core/bvh2/BinaryNode.js";
-import SoundListener from "../SoundListener.js";
-import { IncrementalDeltaSet } from "../../../graphics/render/visibility/IncrementalDeltaSet.js";
 import {
-    queryBinaryNode_SphereIntersections_Data
-} from "../../../../core/bvh2/traversal/queryBinaryNode_SphereIntersections.js";
-import { SoundEmitterComponentContext } from "./SoundEmitterComponentContext.js";
-import { SoundEmitterFlags } from "./SoundEmitterFlags.js";
-import { SoundEmitterChannel } from "./SoundEmitterChannel.js";
-import { invokeObjectCompare } from "../../../../core/model/object/invokeObjectCompare.js";
-import { tryRotateSingleNode } from "../../../../core/bvh2/transform/tryRotateSingleNode.js";
-import { SoundTrackFlags } from "./SoundTrackFlags.js";
+    ExplicitBinaryBoundingVolumeHierarchy
+} from "../../../../core/bvh2/bvh3/ExplicitBinaryBoundingVolumeHierarchy.js";
+import {
+    bvh_query_user_data_overlaps_sphere
+} from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_overlaps_sphere.js";
+import {invokeObjectCompare} from "../../../../core/model/object/invokeObjectCompare.js";
+import {GameAssetType} from "../../../asset/GameAssetType.js";
+import {SoundAssetLoader} from "../../../asset/loaders/SoundAssetLoader.js";
+import {System} from '../../../ecs/System.js';
+import {Transform} from '../../../ecs/transform/Transform.js';
+import {IncrementalDeltaSet} from "../../../graphics/render/visibility/IncrementalDeltaSet.js";
+import SoundListener from "../SoundListener.js";
+import {SoundEmitter} from './SoundEmitter.js';
+import {SoundEmitterChannel} from "./SoundEmitterChannel.js";
+import {SoundEmitterComponentContext} from "./SoundEmitterComponentContext.js";
+import {SoundEmitterFlags} from "./SoundEmitterFlags.js";
+import {SoundTrackFlags} from "./SoundTrackFlags.js";
 
 /**
  * @readonly
@@ -35,21 +36,9 @@ export const SoundEmitterChannels = {
 
 /**
  *
- * @type {Map<NodeDescription, number>}
- */
-const leafCount = new Map();
-
-/**
- *
- * @type {SoundEmitterComponentContext[]}
+ * @type {number[]}
  */
-const positionalNodes = [];
-
-/**
- *
- * @type {number}
- */
-const OPTIMIZATION_LOOP_LIMIT = 10000;
+const scratch_array = [];
 
 export class SoundEmitterSystem extends System {
     /**
@@ -103,17 +92,10 @@ export class SoundEmitterSystem extends System {
 
         /**
          * Spatial index
-         * @type {BinaryNode}
-         * @private
-         */
-        this.__bvh = new BinaryNode();
-
-        /**
-         *
-         * @type {number}
+         * @type {ExplicitBinaryBoundingVolumeHierarchy}
          * @private
          */
-        this.__optimizationPointer = 0;
+        this.__bvh = new ExplicitBinaryBoundingVolumeHierarchy();
 
         /**
          * Number of currently linked entities
@@ -226,6 +208,8 @@ export class SoundEmitterSystem extends System {
             emitter.buildNodes(context);
         }
 
+        emitter.bvh.link(this.__bvh, entity);
+
         const ctx = new SoundEmitterComponentContext();
 
         ctx.system = this;
@@ -240,11 +224,6 @@ export class SoundEmitterSystem extends System {
 
         this.data[entity] = ctx;
 
-        //attach bvh
-        this.__bvh.insertNode(ctx.leaf);
-
-        leafCount.clear();
-
         this.__linkedCount++;
     }
 
@@ -266,12 +245,9 @@ export class SoundEmitterSystem extends System {
 
             ctx.unlink();
 
-            ctx.leaf.disconnect();
-
         }
 
-
-        leafCount.clear();
+        emitter.bvh.unlink();
 
         this.__linkedCount--;
     }
@@ -296,13 +272,18 @@ export class SoundEmitterSystem extends System {
 
             const listenerPosition = listenerTransform.position;
 
-            const matchCount = queryBinaryNode_SphereIntersections_Data(positionalNodes, 0, this.__bvh, listenerPosition.x, listenerPosition.y, listenerPosition.z, 0);
+            const matchCount = bvh_query_user_data_overlaps_sphere(
+                scratch_array, 0,
+                this.__bvh, [listenerPosition.x, listenerPosition.y, listenerPosition.z, 0]
+            );
 
             for (let i = 0; i < matchCount; i++) {
+                const entity = scratch_array[i];
+
                 /**
                  * @type {SoundEmitterComponentContext}
                  */
-                const ctx = positionalNodes[i];
+                const ctx = this.data[entity];
 
                 const emitter = ctx.emitter;
 
@@ -378,79 +359,8 @@ export class SoundEmitterSystem extends System {
         }
 
         activeSet.finalizeUpdate();
-
-        this.optimize(1, 50);
     }
 
-    /**
-     *
-     * @param {number} timeout In milliseconds
-     * @param {number} iterations Maximum number of steps the optimizer can take
-     */
-    optimize(timeout, iterations) {
-        let ctx;
-
-        let i = 0;
-        let j = 0;
-
-        if (this.__linkedCount <= 0) {
-            //nothing to optimize
-            return;
-        }
-
-        const data = this.data;
-        const length = data.length;
-
-        const t0 = performance.now();
-
-
-        LOOP_MAIN: while (j < OPTIMIZATION_LOOP_LIMIT) {
-
-            j++;
-
-            //find next entity
-            while (((ctx = data[this.__optimizationPointer]) === undefined)) {
-
-                this.__optimizationPointer++;
-
-                j++;
-
-                if (this.__optimizationPointer >= length) {
-                    this.__optimizationPointer = 0;
-
-                    continue LOOP_MAIN;
-                }
-
-            }
-
-            let n = ctx.leaf.parentNode;
-
-            while (n !== null) {
-
-                tryRotateSingleNode(n, leafCount);
-
-                i++
-
-                if (Math.random() < 0.5) {
-                    //random exit
-                    break;
-                }
-
-                n = n.parentNode;
-            }
-
-            this.__optimizationPointer++;
-
-            const t1 = performance.now();
-
-            const time = t1 - t0;
-
-            if (time > timeout || i > iterations) {
-
-                break;
-            }
-        }
-    }
 
 
 }

package/src/engine/sound/volume2dB.js

@@ -0,0 +1,8 @@
+/**
+ * Convert percentage volume to decibel
+ * @param {number} volume
+ * @returns {number}
+ */
+function volume2dB(volume) {
+    return 20 * Math.log10(volume);
+}

package/src/generation/theme/ThemeEngine.js

@@ -1,25 +1,23 @@
-import { QuadTreeNode } from "../../core/geom/2d/quad-tree/QuadTreeNode.js";
-import { assert } from "../../core/assert.js";
-import { seededRandom } from "../../core/math/random/seededRandom.js";
-import { TerrainLayerRuleAggregator } from "./TerrainLayerRuleAggregator.js";
-import { Sampler2D } from "../../engine/graphics/texture/sampler/Sampler2D.js";
+import {assert} from "../../core/assert.js";
+import {binarySearchLowIndex} from "../../core/collection/array/binarySearchLowIndex.js";
+import {HashMap} from "../../core/collection/map/HashMap.js";
+import {QuadTreeNode} from "../../core/geom/2d/quad-tree/QuadTreeNode.js";
+import {randomFloatBetween} from "../../core/math/random/randomFloatBetween.js";
+import {seededRandom} from "../../core/math/random/seededRandom.js";
+import {number_compare_ascending} from "../../core/primitives/numbers/number_compare_ascending.js";
+import Future from "../../core/process/Future.js";
 import Task from "../../core/process/task/Task.js";
-import { TaskSignal } from "../../core/process/task/TaskSignal.js";
 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/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";
-import { randomFloatBetween } from "../../core/math/random/randomFloatBetween.js";
-import { obtainTerrain } from "../../engine/ecs/terrain/util/obtainTerrain.js";
-import { actionTask } from "../../core/process/task/util/actionTask.js";
-import { countTask } from "../../core/process/task/util/countTask.js";
-import { emptyTask } from "../../core/process/task/util/emptyTask.js";
-import { futureTask } from "../../core/process/task/util/futureTask.js";
-import { number_compare_ascending } from "../../core/primitives/numbers/number_compare_ascending.js";
+import {TaskSignal} from "../../core/process/task/TaskSignal.js";
+import {actionTask} from "../../core/process/task/util/actionTask.js";
+import {countTask} from "../../core/process/task/util/countTask.js";
+import {emptyTask} from "../../core/process/task/util/emptyTask.js";
+import {futureTask} from "../../core/process/task/util/futureTask.js";
+import {TerrainLayer} from "../../engine/ecs/terrain/ecs/layers/TerrainLayer.js";
+import {TerrainFlags} from "../../engine/ecs/terrain/ecs/TerrainFlags.js";
+import {obtainTerrain} from "../../engine/ecs/terrain/util/obtainTerrain.js";
+import {Sampler2D} from "../../engine/graphics/texture/sampler/Sampler2D.js";
+import {TerrainLayerRuleAggregator} from "./TerrainLayerRuleAggregator.js";
 
 /**
  *
@@ -530,39 +528,7 @@ export class ThemeEngine {
             terrain.buildLightMap().then(resolve, reject);
         }), 'Building Lightmap');
 
-        const optimization_task = new TaskGroup([]);
-
-        const tOptimizeMeshes = new Task({
-            name: 'Mesh optimization',
-            initializer(task, executor) {
-
-                const o = optimizeIndividualMeshesEntitiesToInstances(ecd, 10);
-
-                optimization_task.addChildren(o.tasks);
-
-                executor.runGroup(optimization_task);
-            },
-            cycleFunction() {
-                const state = optimization_task.state.getValue();
-
-                if (state === TaskState.RUNNING) {
-                    return TaskSignal.Yield;
-                } else if (state === TaskState.FAILED) {
-                    return TaskSignal.EndFailure;
-                } else if (state === TaskState.SUCCEEDED) {
-                    return TaskSignal.EndSuccess;
-                } else {
-                    return TaskSignal.Continue;
-                }
-            },
-            computeProgress() {
-                return optimization_task.computeProgress();
-            }
-        });
-
-        tOptimizeMeshes.estimatedDuration = 5;
-
-        return new TaskGroup([tLightMap, tOptimizeMeshes]);
+        return new TaskGroup([tLightMap]);
     }
 
     /**

package/src/core/binary/stringToByteArray.js

@@ -1,24 +0,0 @@
-/**
- * Turns a string into an array of bytes; a "byte" being a JS number in the
- * range 0-255.
- * @param {string} str String value to arrify.
- * @return {Uint8Array} Array of numbers corresponding to the
- *     UCS character codes of each character in str.
- */
-export function stringToByteArray(str) {
-    const length = str.length;
-
-    const output = [];
-    let p = 0;
-
-    for (let i = 0; i < length; i++) {
-        let c = str.charCodeAt(i);
-        while (c > 0xff) {
-            output[p++] = c & 0xff;
-            c >>= 8;
-        }
-        output[p++] = c;
-    }
-
-    return new Uint8Array(output);
-}

package/src/engine/graphics/geometry/bvh/buffered/BVHFromBufferGeometry.js

@@ -1,133 +0,0 @@
-/**
- * Created by Alex on 04/05/2016.
- */
-import { BinaryNode } from '../../../../../core/bvh2/BinaryNode.js';
-import { LeafNode } from '../../../../../core/bvh2/LeafNode.js';
-import IndexedTriangleBoundsComputer from './IndexedTraingleBoundsComputer.js';
-
-import { buildUnsorted as buildUnsortedBinaryBVH } from './BinaryBVHFromBufferGeometry.js';
-
-const makeTriangle = IndexedTriangleBoundsComputer.compute;
-
-/**
- *
- * @param object
- * @param {number|uint} a
- * @param {number|uint} b
- * @param {number|uint} c
- * @param {Float32Array|Float64Array} vertices
- */
-function makeTriangleLeaf(object, a, b, c, vertices) {
-    return makeTriangle(a, b, c, vertices, function (x0, y0, z0, x1, y1, z1) {
-        return new LeafNode(object, x0, y0, z0, x1, y1, z1);
-    });
-}
-
-/**
- *
- * @param {Uint32Array|Uint16Array|Uint8Array} indices
- * @param {Float32Array|Float64Array} vertices
- * @param {BinaryNode} tree
- */
-function fillTree(indices, vertices, tree) {
-    const numFaces = indices.length / 3;
-    let iA, iB, iC;
-
-    function processLeaf(index) {
-        const index3 = index * 3;
-
-        iA = indices[index3];
-        iB = indices[index3 + 1];
-        iC = indices[index3 + 2];
-
-        return makeTriangleLeaf(index, iA * 3, iB * 3, iC * 3, vertices);
-    }
-
-    tree.insertManyBoxes2(processLeaf, numFaces);
-}
-
-/**
- *
- * @param {BufferGeometry} geometry
- * @returns {BinaryNode}
- */
-function bvhFromGeometry(geometry) {
-    // console.profile( "building geometry bvh" );
-    const tree = new BinaryNode();
-    tree.setNegativelyInfiniteBounds();
-    const vertices = geometry.getAttribute('position').array;
-    const indices = geometry.getIndex().array;
-
-    fillTree(indices, vertices, tree);
-
-    // console.profileEnd( "building geometry bvh" );
-    //
-    //console.log("built bvh for " + faces.length + " faces");
-    return tree;
-}
-
-/**
- *
- * @param {THREE.BufferGeometry} geometry
- * @returns {BinaryNode}
- */
-function buildUnsorted(geometry) {
-    const tree = new BinaryNode();
-    tree.setNegativelyInfiniteBounds();
-    //
-    const index = geometry.index;
-    const indices = index.array;
-    const vertices = geometry.attributes.position.array;
-
-    let numNodes = indices.length / 3;
-    let i, n;
-    //create leaf nodes
-    const nodes = new Array(numNodes);
-    let iA, iB, iC;
-
-
-    for (i = 0; i < numNodes; i++) {
-        //leaf needs to be set up inside the callback
-        const index3 = i * 3;
-
-        iA = indices[index3];
-        iB = indices[index3 + 1];
-        iC = indices[index3 + 2];
-        nodes[i] = makeTriangleLeaf(i, iA * 3, iB * 3, iC * 3, vertices);
-    }
-    while (numNodes > 2) {
-        //sort leafs
-
-        //pair
-        for (i = 0; i < numNodes; i += 2) {
-            const a = nodes[i];
-            const b = nodes[i + 1];
-            n = new BinaryNode();
-            n.setChildren(a, b);
-            nodes[i >> 1] = n;
-        }
-        numNodes = (numNodes >> 1) + numNodes % 2;
-        //nodes.length = numNodes;
-    }
-    //finally insert these boxes from this node
-    nodes.length = numNodes;
-    for (i = 0; i < numNodes; i++) {
-        n = nodes[i];
-        tree.insertNode(n);
-    }
-    return tree;
-}
-
-
-export default {
-    build: bvhFromGeometry,
-    buildUnsorted: buildUnsorted,
-    setFaceBounds: makeTriangleLeaf,
-    buildUnsortedBinaryBVH: function (geometry) {
-
-        const index = geometry.index;
-        const indices = index.array;
-        const vertices = geometry.attributes.position.array;
-        return buildUnsortedBinaryBVH(vertices, indices);
-    }
-};

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

@@ -1,148 +0,0 @@
-/**
- * Created by Alex on 22/02/2017.
- */
-
-
-import MsgPackCodec from './MsgPackCodec.js';
-
-import Storage from '../Storage.js';
-import { InMemoryLocalStorage } from "./InMemoryLocalStorage.js";
-import {stringToByteArray} from "../../../core/binary/stringToByteArray.js";
-import {byteArrayToString} from "../../../core/binary/byteArrayToString.js";
-
-
-class LocalStorage extends Storage {
-    constructor(namespace, services) {
-        super();
-        this.namespace = namespace;
-        this.services = services;
-
-        this.compressionLevel = 2;
-        this.compressionEnabled = false;
-
-        this.codec = new MsgPackCodec();
-
-        try {
-            console.log('Accessing Window.localStorage...');
-            this.localStorage = window.localStorage;
-            console.log('LocalStorage acquired');
-        } catch (e) {
-            console.error(`Failed to get localStorage:`, e);
-
-            // This fallback allows the system to continue functioning at least
-            this.localStorage = new InMemoryLocalStorage();
-
-            console.warn(`Falling back to in-memory storage`);
-        }
-
-        const item = this.localStorage.getItem(this.namespace + "-list");
-        let stored;
-
-        try {
-            stored = JSON.parse(item);
-        } catch (e) {
-            console.error('Failed to parse loaded item:', e, item);
-            console.warn('Ignoring previously stored data');
-            stored = null;
-        }
-
-        if (stored !== null && typeof stored === "object" && typeof stored.length === "number") {
-            this.__list = stored;
-        } else {
-            this.__list = [];
-        }
-    }
-
-    makeObjectId(key) {
-        return this.namespace + '-item-' + key;
-    }
-
-    storeBinary(key, value, resolve, reject, progress) {
-        const self = this;
-
-        function store(data) {
-            const compressedUint8Array = new Uint8Array(data.length);
-            compressedUint8Array.set(data, 0);
-
-            if (compressedUint8Array.length !== value.length) {
-                console.log("Compressed size:", compressedUint8Array.length, "bytes, original ", value.length, ".", (compressedUint8Array.length / value.length * 100).toFixed(2) + "% of the original");
-            }
-
-            const compressedString = byteArrayToString(compressedUint8Array);
-
-            self.localStorage.setItem(self.makeObjectId(key), compressedString);
-
-            if (self.__list.indexOf(key) === -1) {
-                //update the list
-                self.__list.push(key);
-                self.localStorage.setItem(self.namespace + "-list", JSON.stringify(self.__list));
-            }
-
-            if (typeof resolve === "function") {
-                resolve();
-            }
-        }
-
-        if (this.compressionEnabled) {
-            const compressionService = this.services.compression;
-
-            compressionService
-                .encode(value, this.compressionLevel)
-                .then(store, reject);
-        } else {
-            store(value);
-        }
-    }
-
-    store(key, value, resolve, reject, progress) {
-        const rawData = this.codec.encode(value);
-
-        this.storeBinary(key, rawData, resolve, reject, progress);
-    }
-
-    loadBinary(key, resolve, reject, progress) {
-
-        let compressedString = this.localStorage.getItem(this.makeObjectId(key));
-
-        if (compressedString === null) {
-            //no data
-            resolve(new ArrayBuffer(0));
-            return;
-        }
-
-        const uint8array = stringToByteArray(compressedString);
-
-        const data = uint8array.buffer;
-        // console.log("compressedBytes", compressedBytes);
-
-        if (this.compressionEnabled) {
-            const compressionService = this.services.compression;
-
-            compressionService.decode(data).then(resolve, reject);
-        } else {
-            resolve(data);
-        }
-    }
-
-    load(key, resolve, reject, progress) {
-        const codec = this.codec;
-
-        this.loadBinary(key, function (binary) {
-            let result;
-
-            try {
-                result = codec.decode(new Uint8Array(binary));
-            } catch (e) {
-                reject(e);
-            }
-
-            resolve(result);
-        }, reject, progress);
-    }
-
-    list(resolve, reject) {
-        resolve(this.__list);
-    }
-}
-
-export default LocalStorage;

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

@@ -1,22 +0,0 @@
-/**
- * Created by Alex on 12/06/2017.
- */
-
-import msgpack from 'msgpack-lite';
-
-function MsgPackCodec() {
-
-}
-
-MsgPackCodec.prototype.encode = function (json) {
-    console.time("encoding of value");
-    const result = msgpack.encode(json);
-    console.timeEnd("encoding of value");
-    return result;
-};
-
-MsgPackCodec.prototype.decode = function (bytes) {
-    return msgpack.decode(bytes);
-};
-
-export default MsgPackCodec;