@woosh/meep-engine 2.61.0 → 2.62.0

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

@@ -3,43 +3,25 @@
  */
 
 
+import {EBBVHLeafProxy} from "../../../../core/bvh2/bvh3/EBBVHLeafProxy.js";
+import {computeHashIntegerArray} from "../../../../core/collection/array/computeHashIntegerArray.js";
 import List from '../../../../core/collection/list/List.js';
+import {aabb3_array_compute_from_sphere} from "../../../../core/geom/3d/aabb/aabb3_array_compute_from_sphere.js";
 import Vector1 from "../../../../core/geom/Vector1.js";
-import { SoundTrack } from "./SoundTrack.js";
-import { SoundEmitterFlags } from "./SoundEmitterFlags.js";
-import { SoundAttenuationFunction } from "./SoundAttenuationFunction.js";
-import {
-    interpolate_irradiance_linear
-} from "../../../../core/math/physics/irradiance/interpolate_irradiance_linear.js";
+import {interpolate_irradiance_linear} from "../../../../core/math/physics/irradiance/interpolate_irradiance_linear.js";
 import {
     interpolate_irradiance_lograrithmic
 } from "../../../../core/math/physics/irradiance/interpolate_irradiance_lograrithmic.js";
-import { SoundPanningModelType } from "./SoundPanningModelType.js";
-import { interpolate_irradiance_smith } from "../../../../core/math/physics/irradiance/interpolate_irradiance_smith.js";
-import { objectKeyByValue } from "../../../../core/model/object/objectKeyByValue.js";
-import { computeStringHash } from "../../../../core/primitives/strings/computeStringHash.js";
-import { computeHashIntegerArray } from "../../../../core/collection/array/computeHashIntegerArray.js";
-import { computeHashFloat } from "../../../../core/primitives/numbers/computeHashFloat.js";
-import { compareStrings } from "../../../../core/primitives/strings/compareStrings.js";
-import { number_compare_ascending } from "../../../../core/primitives/numbers/number_compare_ascending.js";
-
-/**
- * Convert decibel to percentage volume
- * @param {number} dB
- * @returns {number}
- */
-function dB2Volume(dB) {
-    return Math.pow(10, 0.05 * dB);
-}
-
-/**
- * Convert percentage volume to decibel
- * @param {number} volume
- * @returns {number}
- */
-function volume2dB(volume) {
-    return 20 * Math.log10(volume);
-}
+import {interpolate_irradiance_smith} from "../../../../core/math/physics/irradiance/interpolate_irradiance_smith.js";
+import {objectKeyByValue} from "../../../../core/model/object/objectKeyByValue.js";
+import {computeHashFloat} from "../../../../core/primitives/numbers/computeHashFloat.js";
+import {number_compare_ascending} from "../../../../core/primitives/numbers/number_compare_ascending.js";
+import {compareStrings} from "../../../../core/primitives/strings/compareStrings.js";
+import {computeStringHash} from "../../../../core/primitives/strings/computeStringHash.js";
+import {SoundAttenuationFunction} from "./SoundAttenuationFunction.js";
+import {SoundEmitterFlags} from "./SoundEmitterFlags.js";
+import {SoundPanningModelType} from "./SoundPanningModelType.js";
+import {SoundTrack} from "./SoundTrack.js";
 
 const DEFAULT_DISTANCE_MIN = 1;
 const DEFAULT_DISTANCE_MAX = 10000;
@@ -50,92 +32,105 @@ const DEFAULT_CHANNEL = null;
  * @class
  */
 export class SoundEmitter {
+
+
+    /**
+     * @readonly
+     * @type {List<SoundTrack>}
+     */
+    tracks = new List();
+
     /**
      *
-     * @constructor
+     * @type {String|SoundEmitterChannels|null}
      */
-    constructor() {
+    channel = DEFAULT_CHANNEL;
 
-        /**
-         *
-         * @type {List<SoundTrack>}
-         */
-        this.tracks = new List();
+    /**
+     *
+     * @type {number}
+     * @private
+     */
+    __distanceMin = 1;
 
-        /**
-         *
-         * @type {String|SoundEmitterChannels|null}
-         */
-        this.channel = DEFAULT_CHANNEL;
+    /**
+     *
+     * @type {number}
+     * @private
+     */
+    __distanceMax = 10000;
 
-        /**
-         *
-         * @type {number}
-         * @private
-         */
-        this.__distanceMin = 1;
+    /**
+     * @deprecated
+     * @type {number}
+     * @private
+     */
+    __distanceRolloff = 1;
 
-        /**
-         *
-         * @type {number}
-         * @private
-         */
-        this.__distanceMax = 10000;
+    /**
+     * TODO add to binary serialization
+     * @type {SoundPanningModelType}
+     */
+    panningModel = SoundPanningModelType.HRTF;
+
+    /**
+     * Type of attenuation used for sound fall-off, this is only used if Attenuation flag is set
+     * @type {SoundAttenuationFunction|number}
+     */
+    attenuation = SoundAttenuationFunction.Smith;
+
+    /**
+     *
+     * @type {number|SoundEmitterFlags}
+     */
+    flags = 0;
 
+    /**
+     * @readonly
+     */
+    nodes = {
         /**
-         * @deprecated
-         * @type {number}
-         * @private
+         * @type {GainNode}
          */
-        this.__distanceRolloff = 1;
-
+        volume: null,
         /**
-         * TODO add to binary serialization
-         * @type {SoundPanningModelType}
+         * @type {PannerNode}
          */
-        this.panningModel = SoundPanningModelType.HRTF;
-
+        panner: null,
         /**
-         * Type of attenuation used for sound fall-off, this is only used if Attenuation flag is set
-         * @type {SoundAttenuationFunction|number}
+         * @type {GainNode}
          */
-        this.attenuation = SoundAttenuationFunction.Smith;
-
+        attenuation: null,
         /**
-         *
-         * @type {number|SoundEmitterFlags}
+         * One of the other nodes, depending on the configuration
+         * @type {AudioNode}
          */
-        this.flags = 0;
+        endpoint: null
+    };
 
-        const nodes = this.nodes = {
-            /**
-             * @type {GainNode}
-             */
-            volume: null,
-            /**
-             * @type {PannerNode}
-             */
-            panner: null,
-            /**
-             * @type {GainNode}
-             */
-            attenuation: null,
-            /**
-             * One of the other nodes, depending on the configuration
-             * @type {AudioNode}
-             */
-            endpoint: null
-        };
+    /**
+     *
+     * @type {Vector1}
+     */
+    volume = new Vector1(1);
 
-        /**
-         *
-         * @type {Vector1}
-         */
-        this.volume = new Vector1(1);
+    /**
+     * @readonly
+     * @type {EBBVHLeafProxy}
+     */
+    bvh = new EBBVHLeafProxy();
 
-        this.volume.onChanged.add(function (value) {
-            if (nodes.volume !== null) {
-                nodes.volume.gain.setValueAtTime(value, 0);
+    /**
+     *
+     * @constructor
+     */
+    constructor() {
+
+        this.volume.onChanged.add((value) => {
+            const volume_node = this.nodes.volume;
+
+            if (volume_node !== null) {
+                volume_node.gain.setValueAtTime(value, 0);
             }
         });
 
@@ -437,6 +432,37 @@ export class SoundEmitter {
         }
     }
 
+    /**
+     *
+     * @param {number} x
+     * @param {number} y
+     * @param {number} z
+     */
+    updatePosition(x, y, z) {
+        if (this.getFlag(SoundEmitterFlags.Spatialization)) {
+            //update position of the panner node
+            const nodes = this.nodes;
+
+            /**
+             *
+             * @type {PannerNode}
+             */
+            const panner = nodes.panner;
+
+            if (panner !== null) {
+                panner.setPosition(x, y, z);
+            }
+        }
+
+        const distanceMax = this.distanceMax;
+
+        const bounds = this.bvh.bounds;
+
+        aabb3_array_compute_from_sphere(bounds, 0, x, y, z, distanceMax);
+
+        this.bvh.write_bounds();
+    }
+
     /**
      *
      * @param {number} [duration] fade duration in seconds

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

@@ -1,8 +1,6 @@
-import { LeafNode } from "../../../../core/bvh2/LeafNode.js";
-import { SoundTrackNodes } from "./SoundTrackNodes.js";
-import { SoundEmitterFlags } from "./SoundEmitterFlags.js";
-import { SoundTrackFlags } from "./SoundTrackFlags.js";
-import { loadSoundTrackAsset } from "./loadSoundTrackAsset.js";
+import {loadSoundTrackAsset} from "./loadSoundTrackAsset.js";
+import {SoundTrackFlags} from "./SoundTrackFlags.js";
+import {SoundTrackNodes} from "./SoundTrackNodes.js";
 
 export class SoundEmitterComponentContext {
     constructor() {
@@ -31,12 +29,6 @@ export class SoundEmitterComponentContext {
          */
         this.targetNode = null;
 
-        /**
-         *
-         * @type {LeafNode}
-         */
-        this.leaf = new LeafNode(this, 0, 0, 0, 0, 0, 0);
-
         /**
          *
          * @type {boolean}
@@ -67,37 +59,7 @@ export class SoundEmitterComponentContext {
         const y = position.y;
         const z = position.z;
 
-        if (emitter.getFlag(SoundEmitterFlags.Spatialization)) {
-            //update position of the panner node
-            const nodes = emitter.nodes;
-
-            /**
-             *
-             * @type {PannerNode}
-             */
-            const panner = nodes.panner;
-
-            if (panner !== null) {
-                panner.setPosition(x, y, z);
-            }
-        }
-
-        /**
-         *
-         * @type {LeafNode}
-         */
-        const bvhLeaf = this.leaf;
-
-        const distanceMax = emitter.distanceMax;
-
-        bvhLeaf.resize(
-            x - distanceMax,
-            y - distanceMax,
-            z - distanceMax,
-            x + distanceMax,
-            y + distanceMax,
-            z + distanceMax
-        );
+        emitter.updatePosition(x, y, z);
     }
 
     /**

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]);
     }
 
     /**