@woosh/meep-engine 2.60.1 → 2.62.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/engine/ecs/components/ClingToHeightMap.js

@@ -1,19 +0,0 @@
-/**
- * User: Alex Goldring
- * Date: 1/10/2014
- * Time: 21:29
- */
-import Vector3 from "../../../core/geom/Vector3.js";
-
-function ClingToHeightMap(options) {
-    if (options === void 0) {
-        options = {};
-    }
-    this.normalAlign = options.normalAlign !== void 0 ? options.normalAlign : false;
-    this.sampleCount = options.sampleCount !== void 0 ? options.sampleCount : 1;
-    this.samplingRadius = options.samplingRadius !== void 0 ? options.samplingRadius : 0;
-    const inf = Number.POSITIVE_INFINITY;
-    this.__prevPosition = new Vector3(inf, inf, inf);
-}
-
-export default ClingToHeightMap;

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

@@ -1,15 +0,0 @@
-/**
- * Created by Alex on 05/02/2015.
- */
-function SynchronizePosition(options) {
-    this.targetEntity = options.targetEntity;
-    this.x = options.x !== void 0 ? options.x : true;
-    this.y = options.y !== void 0 ? options.y : true;
-    this.z = options.z !== void 0 ? options.z : true;
-}
-
-SynchronizePosition.typeName = "SynchronizePosition";
-
-SynchronizePosition.serializable = false;
-
-export default SynchronizePosition;

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

@@ -1,170 +0,0 @@
-/**
- * User: Alex Goldring
- * Date: 1/10/2014
- * Time: 21:32
- */
-import { System } from '../System.js';
-import ClingToHeightMap from '../components/ClingToHeightMap.js';
-import { Transform } from '../transform/Transform.js';
-import { Euler as ThreeEuler, Matrix4 as ThreeMatrix4, Vector2 as ThreeVector2, Vector3 as ThreeVector3 } from 'three';
-
-class ClingToHeightMapSystem extends System {
-    constructor(grid) {
-        super();
-
-        this.dependencies = [ClingToHeightMap];
-        //
-        this.entityManager = null;
-        this.grid = grid;
-        this.update = function () {
-            const uv = new ThreeVector2();
-            let u, v;
-            const euler = new ThreeEuler();
-            const normal = new ThreeVector3();
-            const m = new ThreeMatrix4();
-            const vUp = new ThreeVector3(0, 1, 0);
-            const vOrigin = new ThreeVector3();
-
-            function update(timeDelta) {
-                const entityManager = this.entityManager;
-                const terrain = this.terrain;
-                if (terrain === void 0) {
-                    return 0;
-                }
-                const grid = this.grid;
-                const heightSampler = terrain.samplerHeight;
-                const samplerNormal = terrain.samplerNormal;
-                entityManager.traverseEntities([ClingToHeightMap, Transform], function (clingon, transform) {
-                    const position = transform.global.position;
-                    if (position.equals(clingon.__prevPosition)) {
-                        return; //already correct placement
-                    } else {
-                        clingon.__prevPosition.copy(position);
-                    }
-                    grid.pointWorld2Grid(position, uv);
-                    uv.divide(grid.size);
-                    u = uv.x;
-                    v = uv.y;
-                    position.y = heightSampler.sample(u, v);
-                    transform.setGlobalPosition(position.x, position.y, position.z);
-                    //
-                    if (clingon.normalAlign) {
-                        if (clingon.samplingRadius !== 0 && clingon.sampleCount > 1) {
-                            //more than one sample is to be used to compute normal by averaging
-                            sampleNormalOnDisk(clingon.sampleCount, clingon.samplingRadius, samplerNormal, uv, normal);
-                        } else {
-                            samplerNormal.sample(u, v, normal);
-                        }
-                        vOrigin.set(0, 0, 0);
-                        vUp.set(0, 1, 0);
-                        //normal.set(-normal.x, normal.z, -normal.y);
-                        //
-                        m.identity();
-                        m.lookAt(normal, vOrigin, vUp);
-                        euler.setFromRotationMatrix(m, "XZY");
-                        if (Math.abs(euler.y) + 0.0001 >= Math.PI) {
-                            euler.z = -euler.z;
-                        }
-                        euler.y = 0; //drop rotation orthogonal to terrain
-                        transform.rotation.setFromEuler(euler);
-                    }
-                });
-            }
-
-            return update;
-        }();
-    }
-
-    remove(component) {
-    }
-
-    add(component) {
-    }
-
-    clearCache() {
-        const em = this.entityManager;
-        em.traverseEntities([ClingToHeightMap], function (clingon) {
-            clingon.__prevPosition.set(Number.NaN, Number.NaN, Number.NaN);
-        });
-    }
-}
-
-
-const sampleNormalOnDisk = (function () {
-    const tempNormal = new ThreeVector3();
-    const offset = new ThreeVector2();
-    const PI2 = Math.PI * 2;
-
-    //TODO consider plane-fitting algorithm from: http://www.ilikebigbits.com/blog/2015/3/2/plane-from-points
-    /*
-     // source: http://www.ilikebigbits.com/blog/2015/3/2/plane-from-points
-     // @author Emil Ernerfeldt
-     // Constructs a plane from a collection of points
-     // so that the summed squared distance to all points is minimzized
-     fn plane_from_points(points: &[Vec3]) -> Plane {
-     let n = points.len();
-     assert!(n >= 3, "At least three points required");
-
-     let mut sum = Vec3{x:0.0, y:0.0, z:0.0};
-     for p in points {
-     sum = &sum + &p;
-     }
-     let centroid = &sum * (1.0 / (n as f64));
-
-     // Calc full 3x3 covariance matrix, excluding symmetries:
-     let mut xx = 0.0; let mut xy = 0.0; let mut xz = 0.0;
-     let mut yy = 0.0; let mut yz = 0.0; let mut zz = 0.0;
-
-     for p in points {
-     let r = p - &centroid;
-     xx += r.x * r.x;
-     xy += r.x * r.y;
-     xz += r.x * r.z;
-     yy += r.y * r.y;
-     yz += r.y * r.z;
-     zz += r.z * r.z;
-     }
-
-     let det_x = yy*zz - yz*yz;
-     let det_y = xx*zz - xz*xz;
-     let det_z = xx*yy - xy*xy;
-
-     let det_max = max3(det_x, det_y, det_z);
-     assert!(det_max > 0.0, 'The points don't span a plane");
-
-     // Pick path with best conditioning:
-     let dir =
-     if det_max == det_x {
-     let a = (xz*yz - xy*zz) / det_x;
-     let b = (xy*yz - xz*yy) / det_x;
-     Vec3{x: 1.0, y: a, z: b}
-     } else if det_max == det_y {
-     let a = (yz*xz - xy*zz) / det_y;
-     let b = (xy*xz - yz*xx) / det_y;
-     Vec3{x: a, y: 1.0, z: b}
-     } else {
-     let a = (yz*xy - xz*yy) / det_z;
-     let b = (xz*xy - yz*xx) / det_z;
-     Vec3{x: a, y: b, z: 1.0}
-     };
-
-     plane_from_point_and_normal(&centroid, &normalize(dir))
-     }
-     */
-    function sampleNormalOnDisk(sampleCount, radius, sampler, origin, result) {
-        const radiusU = radius / sampler.width;
-        const radiusV = radius / sampler.height;
-        result.set(0, 0, 0);
-        for (let i = 0; i < sampleCount; i++) {
-            const angle = PI2 * (i / sampleCount);
-            offset.set(radiusU * Math.cos(angle), radiusV * Math.sin(angle));
-            sampler.sample(origin.x + offset.x, origin.y + offset.y, tempNormal);
-            result.add(tempNormal);
-        }
-        result.normalize();
-    }
-
-    return sampleNormalOnDisk;
-})();
-
-export default ClingToHeightMapSystem;

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

@@ -1,43 +0,0 @@
-/**
- * Created by Alex on 05/02/2015.
- */
-import { System } from '../System.js';
-import SynchronizePosition from '../components/SynchronizePosition.js';
-import { Transform } from '../transform/Transform.js';
-
-
-class SynchronizePositionSystem extends System {
-    constructor() {
-        super();
-
-        this.dependencies = [SynchronizePosition];
-
-        this.entityManager = null;
-    }
-
-    update(timeDelta) {
-        const em = this.entityManager;
-        const ecd = em.dataset;
-
-        if (ecd === null) {
-            return;
-        }
-
-        ecd.traverseEntities([SynchronizePosition, Transform], function (sync, transform) {
-            const targetEntity = sync.targetEntity;
-            const targetTransform = ecd.getComponent(targetEntity, Transform);
-            if (sync.x) {
-                transform.position.x = targetTransform.position.x;
-            }
-            if (sync.y) {
-                transform.position.y = targetTransform.position.y;
-            }
-            if (sync.z) {
-                transform.position.z = targetTransform.position.z;
-            }
-        });
-    }
-}
-
-
-export default SynchronizePositionSystem;