@woosh/meep-engine 2.63.0 → 2.64.0

package/src/engine/graphics/particles/particular/engine/emitter/ParticleEmitter.js

@@ -1,23 +1,24 @@
-import {Box3, BufferGeometry, Frustum, Points, PointsMaterial} from 'three';
-import {assert} from "../../../../../../core/assert.js";
-import {EBBVHLeafProxy} from "../../../../../../core/bvh2/bvh3/EBBVHLeafProxy.js";
-import {computeHashIntegerArray} from "../../../../../../core/collection/array/computeHashIntegerArray.js";
+import { Box3, BufferGeometry, Frustum, Points, PointsMaterial } from 'three';
+import { assert } from "../../../../../../core/assert.js";
+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} from "../../../../../../core/geom/3d/aabb/AABB3.js";
-import {aabb3_array_combine} from "../../../../../../core/geom/3d/aabb/aabb3_array_combine.js";
-import {compose_matrix4_array} from "../../../../../../core/geom/3d/compose_matrix4_array.js";
+import { AABB3 } from "../../../../../../core/geom/3d/aabb/AABB3.js";
+import { aabb3_array_combine } from "../../../../../../core/geom/3d/aabb/aabb3_array_combine.js";
+import { aabb3_expand_array } from "../../../../../../core/geom/3d/aabb/aabb3_expand_array.js";
+import { compose_matrix4_array } from "../../../../../../core/geom/3d/compose_matrix4_array.js";
 import Quaternion from "../../../../../../core/geom/Quaternion.js";
-import {v3_dot_array_array} from "../../../../../../core/geom/vec3/v3_dot_array_array.js";
+import { v3_dot_array_array } from "../../../../../../core/geom/vec3/v3_dot_array_array.js";
 import Vector3 from "../../../../../../core/geom/Vector3.js";
-import {lerp} from "../../../../../../core/math/lerp.js";
-import {max2} from "../../../../../../core/math/max2.js";
-import {min2} from "../../../../../../core/math/min2.js";
-import {frustum_from_camera} from "../../../../ecs/camera/frustum_from_camera.js";
-import {BlendingType} from "../../../../texture/sampler/BlendingType.js";
-import {ParameterSet} from "../parameter/ParameterSet.js";
-import {ParticleParameter} from "../parameter/ParticleParameter.js";
-import {update_parameters} from "../simulator/update_parameters.js";
-import {computeEmissionFunction} from "./computeEmissionFunction.js";
+import { lerp } from "../../../../../../core/math/lerp.js";
+import { max2 } from "../../../../../../core/math/max2.js";
+import { min2 } from "../../../../../../core/math/min2.js";
+import { frustum_from_camera } from "../../../../ecs/camera/frustum_from_camera.js";
+import { BlendingType } from "../../../../texture/sampler/BlendingType.js";
+import { ParameterSet } from "../parameter/ParameterSet.js";
+import { ParticleParameter } from "../parameter/ParticleParameter.js";
+import { update_parameters } from "../simulator/update_parameters.js";
+import { computeEmissionFunction } from "./computeEmissionFunction.js";
 import {
     PARTICLE_ATTRIBUTE_AGE,
     PARTICLE_ATTRIBUTE_BLEND,
@@ -31,11 +32,12 @@ import {
     PARTICLE_ATTRIBUTE_UV,
     PARTICLE_ATTRIBUTE_VELOCITY
 } from "./PARTICLE_ATTRIBUTES.js";
-import {ParticleEmitterFlag} from "./ParticleEmitterFlag.js";
-import {ParticleLayer} from "./ParticleLayer.js";
-import {ParticleParameters} from "./ParticleParameters.js";
-import {ParticlePool} from "./ParticlePool.js";
-import {PARTICULAR_PARTICLE_SPECIFICATION} from "./PARTICULAR_PARTICLE_SPECIFICATION.js";
+import { ParticleEmitterFlag } from "./ParticleEmitterFlag.js";
+import { ParticleLayer } from "./ParticleLayer.js";
+import { ParticleParameters } from "./ParticleParameters.js";
+import { ParticlePool } from "./ParticlePool.js";
+import { PARTICULAR_PARTICLE_SPECIFICATION } from "./PARTICULAR_PARTICLE_SPECIFICATION.js";
+import { write_particle_patch_uv } from "./write_particle_patch_uv.js";
 
 const EMPTY_GEOMETRY = new BufferGeometry();
 
@@ -84,34 +86,6 @@ function generateStandardParameterSet(parameters) {
 }
 
 
-const UINT16_MAX = 65535; // = 2^16 - 1
-
-/**
- *
- * @param {AtlasPatch} patch
- * @param {ParticlePool} particles
- * @param {number} ref
- */
-function write_particle_patch_uv(patch, particles, ref) {
-    const uv = patch.uv;
-
-    const uv_position = uv.position;
-
-    const u0 = uv_position.x;
-    const v0 = uv_position.y;
-
-    const uv_size = uv.size;
-
-    const u1 = uv_size.x;
-    const v1 = uv_size.y;
-
-    particles.writeAttributeVector4(
-        ref,
-        PARTICLE_ATTRIBUTE_UV,
-        u0 * UINT16_MAX, v0 * UINT16_MAX, u1 * UINT16_MAX, v1 * UINT16_MAX
-    );
-}
-
 let id_counter = 0;
 
 export class ParticleEmitter {
@@ -122,6 +96,7 @@ export class ParticleEmitter {
 
     /**
      * @private
+     * @readonly
      * @type {List<ParticleLayer>}
      */
     layers = new List();
@@ -137,6 +112,7 @@ export class ParticleEmitter {
     /**
      *
      * @type {Vector3}
+     * @readonly
      * @private
      */
     __lastSpawnPosition = new Vector3(0, 0, 0);
@@ -175,12 +151,13 @@ export class ParticleEmitter {
 
     /**
      * Upper-bound of bounds for an individual particle
+     * @readonly
      * @type {AABB3}
      */
     particleBounds = new AABB3(Infinity, Infinity, Infinity, -Infinity, -Infinity, -Infinity);
 
     /**
-     *
+     * @readonly
      * @type {AABB3}
      */
     emissionBounds = new AABB3(0, 0, 0, 0, 0, 0);
@@ -199,11 +176,14 @@ export class ParticleEmitter {
      */
     __hash = 0;
 
+
+    /**
+     * @readonly
+     * @type {ParameterSet}
+     */
+    parameters = new ParameterSet();
+
     constructor() {
-        /**
-         * @type {ParameterSet}
-         */
-        this.parameters = new ParameterSet();
         generateStandardParameterSet(this.parameters);
 
 
@@ -506,29 +486,15 @@ export class ParticleEmitter {
 
         particles.computeAttributeVector3AxisAlignedBoundingBox(PARTICLE_ATTRIBUTE_POSITION, scratch_array);
 
-        let bounds_x0 = scratch_array[0];
-        let bounds_y0 = scratch_array[1];
-        let bounds_z0 = scratch_array[2];
-
-        let bounds_x1 = scratch_array[3];
-        let bounds_y1 = scratch_array[4];
-        let bounds_z1 = scratch_array[5];
-
         //expand bounds by maximum sprite size
         const extents = this.computeSpriteMaxHalfSize();
 
-        bounds_x0 -= extents;
-        bounds_y0 -= extents;
-        bounds_z0 -= extents;
-
-        bounds_x1 += extents;
-        bounds_y1 += extents;
-        bounds_z1 += extents;
+        aabb3_expand_array(scratch_array, scratch_array, extents);
 
         //write updated bonds
         const bb = this.particleBounds;
 
-        bb.setBounds(bounds_x0, bounds_y0, bounds_z0, bounds_x1, bounds_y1, bounds_z1);
+        bb.readFromArray(scratch_array);
 
         this.updateGeometryBounds();
 
@@ -620,7 +586,7 @@ export class ParticleEmitter {
 
         this.particles.build();
 
-        const points = new Points(EMPTY_GEOMETRY, defaultPointsMaterial);
+        const points = new Points(EMPTY_GEOMETRY, DEFAULT_POINT_MATERIAL);
         points.frustumCulled = false;
         points.matrixAutoUpdate = false;
 
@@ -683,7 +649,10 @@ export class ParticleEmitter {
         this.setFlag(ParticleEmitterFlag.Initialized);
     }
 
-    computeHash() {
+    /**
+     * @returns {number}
+     */
+    #computeHash() {
         const parameters_hash = this.parameters.hash();
         const layers_hash = this.layers.hash();
 
@@ -703,7 +672,7 @@ export class ParticleEmitter {
 
     hash() {
         if (this.getFlag(ParticleEmitterFlag.HashNeedUpdate)) {
-            this.__hash = this.computeHash();
+            this.__hash = this.#computeHash();
             this.clearFlag(ParticleEmitterFlag.HashNeedUpdate);
         }
 
@@ -747,8 +716,8 @@ export class ParticleEmitter {
         //assert.notOk(this.particles.hasHoles(), 'Broken pre-condition: particle pool must not have holes. Make sure to call "compact" before sorting');
 
         //get font plane of camera
-        frustum_from_camera(camera, frustum);
-        const nearPlane = frustum.planes[0];
+        frustum_from_camera(camera, scratch_frustum);
+        const nearPlane = scratch_frustum.planes[0];
         const nearPlaneNormal = nearPlane.normal;
         nearPlaneNormal.toArray(scratch_near_plane_normal);
 
@@ -824,7 +793,7 @@ export class ParticleEmitter {
 
         //check if sprites need updating
         if (this.getFlag(ParticleEmitterFlag.SpritesNeedUpdate)) {
-            this.updateSprites();
+            this.#updateSprites();
         }
     }
 
@@ -860,7 +829,7 @@ export class ParticleEmitter {
     /**
      * Write sprite UVs
      */
-    updateSprites() {
+    #updateSprites() {
         const particles = this.particles;
 
         const occupancy = particles.occupancy;
@@ -894,8 +863,6 @@ export class ParticleEmitter {
      * @param {number} timeDelta period over which particles are being spawned, this will ensure that spawned particles have different initial age
      */
     spawnLayerParticlesContinuous(layerIndex, timeDelta) {
-        assert.ok(layerIndex < this.layers.length && layerIndex >= 0, `layerIndex(=${layerIndex}) is out of bounds`);
-
         const layer = this.layers.get(layerIndex);
 
         const random = Math.random;
@@ -1020,8 +987,6 @@ export class ParticleEmitter {
 
         const layers = this.layers;
 
-        assert.ok(layerIndex < layers.length && layerIndex >= 0, `layerIndex[=${layerIndex}] is out of bounds`);
-
         const layer = layers.get(layerIndex);
 
         const random = Math.random;
@@ -1217,11 +1182,9 @@ ParticleEmitter.SERIALIZABLE_FLAGS = SERIALIZABLE_FLAGS;
 
 const matrix4 = new Float32Array(16);
 
-const defaultPointsMaterial = new PointsMaterial({color: 0xFFFFFF});
-
-const frustum = new Frustum();
+const DEFAULT_POINT_MATERIAL = new PointsMaterial({ color: 0xFFFFFF });
 
-const position = [];
+const scratch_frustum = new Frustum();
 
 const v3position = new Vector3();
 const v3velocity = new Vector3();

package/src/engine/graphics/particles/particular/engine/emitter/ParticlePool.js

@@ -1,19 +1,53 @@
-import { BitSet } from "../../../../../../core/binary/BitSet.js";
-import { max3 } from "../../../../../../core/math/max3.js";
 import { BufferAttribute, BufferGeometry, StreamDrawUsage } from 'three';
-import ObservedValue from "../../../../../../core/model/ObservedValue.js";
-import { typed_array_copy } from "../../../../../../core/collection/array/typed/typed_array_copy.js";
 import { assert } from "../../../../../../core/assert.js";
+import { BitSet } from "../../../../../../core/binary/BitSet.js";
 import {
     compute_typed_array_constructor_from_data_type
 } from "../../../../../../core/binary/type/DataType2TypedArrayConstructorMapping.js";
-import { min2 } from "../../../../../../core/math/min2.js";
-import { max2 } from "../../../../../../core/math/max2.js";
+import { typed_array_copy } from "../../../../../../core/collection/array/typed/typed_array_copy.js";
+import { aabb3_from_v3_array } from "../../../../../../core/geom/3d/aabb/aabb3_from_v3_array.js";
+import { max3 } from "../../../../../../core/math/max3.js";
+import ObservedValue from "../../../../../../core/model/ObservedValue.js";
 
 const SHRINK_THRESHOLD = 64;
 const GROW_MIN_STEP = 32;
 
 export class ParticlePool {
+    /**
+     *
+     * @type {BitSet}
+     */
+    occupancy = new BitSet();
+
+    /**
+     *
+     * @type {BufferAttribute[]}
+     */
+    attributes = [];
+
+    /**
+     * @type {ObservedValue.<BufferGeometry>}
+     */
+    geometry = new ObservedValue(null);
+
+    /**
+     *
+     * @type {number}
+     */
+    growFactor = 1.3;
+
+    /**
+     *
+     * @type {number}
+     */
+    shrinkFactor = 0.5;
+
+    /**
+     *
+     * @type {number}
+     */
+    capacity = 16;
+
     /**
      *
      * @param {VertexDataSpec} spec
@@ -28,40 +62,6 @@ export class ParticlePool {
          */
         this.spec = spec;
 
-        /**
-         *
-         * @type {BitSet}
-         */
-        this.occupancy = new BitSet();
-
-        /**
-         *
-         * @type {BufferAttribute[]}
-         */
-        this.attributes = [];
-
-        /**
-         * @type {ObservedValue.<BufferGeometry>}
-         */
-        this.geometry = new ObservedValue(null);
-
-        /**
-         *
-         * @type {number}
-         */
-        this.growFactor = 1.3;
-
-        /**
-         *
-         * @type {number}
-         */
-        this.shrinkFactor = 0.5;
-
-        /**
-         *
-         * @type {number}
-         */
-        this.capacity = 16;
 
         this.build();
     }
@@ -521,42 +521,11 @@ export class ParticlePool {
             throw new Error(`Attribute item_size is expected to be 3, instead was '${item_size}'`);
         }
 
-        let bounds_x0 = Infinity;
-        let bounds_y0 = Infinity;
-        let bounds_z0 = Infinity;
-
-        let bounds_x1 = -Infinity;
-        let bounds_y1 = -Infinity;
-        let bounds_z1 = -Infinity;
-
         const particle_count = this.size();
 
         const data = attribute.array;
 
-        for (let i = 0; i < particle_count; i++) {
-            const particle_address = i * 3;
-
-            const x = data[particle_address];
-            const y = data[particle_address + 1];
-            const z = data[particle_address + 2];
-
-            bounds_x0 = min2(bounds_x0, x);
-            bounds_y0 = min2(bounds_y0, y);
-            bounds_z0 = min2(bounds_z0, z);
-
-            bounds_x1 = max2(bounds_x1, x);
-            bounds_y1 = max2(bounds_y1, y);
-            bounds_z1 = max2(bounds_z1, z);
-        }
-
-        // read out
-        result[0] = bounds_x0;
-        result[1] = bounds_y0;
-        result[2] = bounds_z0;
-
-        result[3] = bounds_x1;
-        result[4] = bounds_y1;
-        result[5] = bounds_z1;
+        aabb3_from_v3_array(result,data,particle_count*3);
 
     }
 

package/src/engine/graphics/particles/particular/engine/emitter/write_particle_patch_uv.js

@@ -0,0 +1,28 @@
+import { UINT16_MAX } from "../../../../../../core/binary/UINT16_MAX.js";
+import { PARTICLE_ATTRIBUTE_UV } from "./PARTICLE_ATTRIBUTES.js";
+
+/**
+ *
+ * @param {AtlasPatch} patch
+ * @param {ParticlePool} particles
+ * @param {number} ref
+ */
+export function write_particle_patch_uv(patch, particles, ref) {
+    const uv = patch.uv;
+
+    const uv_position = uv.position;
+
+    const u0 = uv_position.x;
+    const v0 = uv_position.y;
+
+    const uv_size = uv.size;
+
+    const u1 = uv_size.x;
+    const v1 = uv_size.y;
+
+    particles.writeAttributeVector4(
+        ref,
+        PARTICLE_ATTRIBUTE_UV,
+        u0 * UINT16_MAX, v0 * UINT16_MAX, u1 * UINT16_MAX, v1 * UINT16_MAX
+    );
+}

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

@@ -8,21 +8,20 @@
 import {
     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 { bvh_query_user_data_generic } from "../../../../core/bvh2/bvh3/query/bvh_query_user_data_generic.js";
+import { BVHQueryIntersectsSphere } from "../../../../core/bvh2/bvh3/query/BVHQueryIntersectsSphere.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";
+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
@@ -272,9 +271,11 @@ export class SoundEmitterSystem extends System {
 
             const listenerPosition = listenerTransform.position;
 
-            const matchCount = bvh_query_user_data_overlaps_sphere(
+            const query = BVHQueryIntersectsSphere.from([listenerPosition.x, listenerPosition.y, listenerPosition.z, 0]);
+
+            const matchCount = bvh_query_user_data_generic(
                 scratch_array, 0,
-                this.__bvh, [listenerPosition.x, listenerPosition.y, listenerPosition.z, 0]
+                this.__bvh, this.__bvh.root, query
             );
 
             for (let i = 0; i < matchCount; i++) {
@@ -362,6 +363,5 @@ export class SoundEmitterSystem extends System {
     }
 
 
-
 }
 

package/src/core/bvh2/bvh3/query/bvh_query_user_data_overlaps_sphere.js

@@ -1,81 +0,0 @@
-import {SCRATCH_UINT32_TRAVERSAL_STACK} from "../../../collection/SCRATCH_UINT32_TRAVERSAL_STACK.js";
-import {aabb3_array_intersects_sphere_array} from "../../../geom/3d/aabb/aabb3_array_intersects_sphere_array.js";
-import {NULL_NODE} from "../ExplicitBinaryBoundingVolumeHierarchy.js";
-import {bvh_collect_user_data} from "./bvh_collect_user_data.js";
-
-const stack = SCRATCH_UINT32_TRAVERSAL_STACK;
-
-const scratch_aabb = new Float32Array(6);
-
-/**
- *
- * @param {number[]} result
- * @param {number} result_offset
- * @param {ExplicitBinaryBoundingVolumeHierarchy} bvh
- * @param {number[]|Float32Array} sphere
- */
-export function bvh_query_user_data_overlaps_sphere(
-    result,
-    result_offset,
-    bvh,
-    sphere
-) {
-    const root = bvh.root;
-
-    if (root === NULL_NODE) {
-        return 0;
-    }
-
-    /**
-     *
-     * @type {number}
-     */
-    const stack_top = stack.pointer++;
-
-    stack[stack_top] = root;
-
-    let result_cursor = result_offset;
-
-    while (stack.pointer > stack_top) {
-        stack.pointer--;
-
-        /**
-         *
-         * @type {number}
-         */
-        const node = stack[stack.pointer];
-
-        // test node against the ray
-        bvh.node_get_aabb(node, scratch_aabb);
-        const intersection = aabb3_array_intersects_sphere_array(scratch_aabb, sphere);
-
-        if (intersection === 0) {
-            // fully outside
-            continue;
-        }
-
-        const node_is_leaf = bvh.node_is_leaf(node);
-
-        if (node_is_leaf) {
-            // leaf node
-            result[result_cursor++] = bvh.node_get_user_data(node);
-
-        } else if (intersection === 2) {
-            // fully inside, fast collection path
-            result_cursor += bvh_collect_user_data(result, result_cursor, bvh, node);
-        } else {
-            // partially inside
-            // read in-order
-            const child1 = bvh.node_get_child1(node);
-            const child2 = bvh.node_get_child2(node);
-
-            // write to stack in reverse order, so that fist child ends up being visited first
-            stack[stack.pointer++] = child1;
-            stack[stack.pointer++] = child2;
-        }
-    }
-
-    // drop stack frame
-
-    return result_cursor - result_offset;
-}