@woosh/meep-engine 2.33.22 → 2.33.23

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

@@ -3,7 +3,6 @@ import List from "../../../../../../core/collection/list/List.js";
 import { lerp } from "../../../../../../core/math/lerp.js";
 import { max2 } from "../../../../../../core/math/max2.js";
 import { min2 } from "../../../../../../core/math/min2.js";
-import { ParticleAttributeType, ParticleDataType } from "../../group/ParticleGroup.js";
 import { Box3, BufferGeometry, Frustum, Matrix4, Points, PointsMaterial } from 'three';
 import { frustumFromCamera } from "../../../../ecs/camera/CameraSystem.js";
 import { ParticlePool } from "./ParticlePool.js";
@@ -16,8 +15,6 @@ import { ParticleParameters } from "./ParticleParameters.js";
 import { BlendingType } from "../../../../texture/sampler/BlendingType.js";
 import Quaternion from "../../../../../../core/geom/Quaternion.js";
 import { computeHashIntegerArray } from "../../../../../../core/math/MathUtils.js";
-import { ParticleSpecification } from "../../group/ParticleSpecification.js";
-import { ParticleAttribute } from "../../group/ParticleAttribute.js";
 import { ParticleEmitterFlag } from "./ParticleEmitterFlag.js";
 import { AABB3 } from "../../../../../../core/bvh2/aabb3/AABB3.js";
 import {
@@ -34,14 +31,10 @@ import {
     PARTICLE_ATTRIBUTE_VELOCITY
 } from "./PARTICLE_ATTRIBUTES.js";
 import { composeMatrix4 } from "../../../../util/composeMatrix4.js";
-import { randomPointInPoint } from "../../../../../../core/geom/random/randomPointInPoint.js";
-import { randomPointInSphere } from "../../../../../../core/geom/random/randomPointInSphere.js";
-import { randomPointOnSphere } from "../../../../../../core/geom/random/randomPointOnSphere.js";
-import { randomPointInBox } from "../../../../../../core/geom/random/randomPointInBox.js";
-import { randomPointOnBox } from "../../../../../../core/geom/random/randomPointOnBox.js";
-import { EmissionFromType } from "./EmissionFromType.js";
-import { EmissionShapeType } from "./EmissionShapeType.js";
 import { update_parameters } from "../simulator/update_parameters.js";
+import { distance_to_camera } from "./distance_to_camera.js";
+import { computeEmissionFunction } from "./computeEmissionFunction.js";
+import { PARTICULAR_PARTICLE_SPECIFICATION } from "./PARTICULAR_PARTICLE_SPECIFICATION.js";
 
 const EMPTY_GEOMETRY = new BufferGeometry();
 
@@ -66,60 +59,6 @@ const corners = new Float64Array(24);
  */
 const scratch_array = [];
 
-/**
- *
- * @param {EmissionFromType} emissionType
- * @param {EmissionShapeType} emissionShape
- * @returns {function(random: function, result:Vector3):void}
- */
-function computeEmissionFunction(emissionType, emissionShape) {
-    if (emissionShape === EmissionShapeType.Point) {
-        return randomPointInPoint;
-    } else if (emissionShape === EmissionShapeType.Sphere) {
-        if (emissionType === EmissionFromType.Volume) {
-            return randomPointInSphere;
-        } else if (emissionType === EmissionFromType.Shell) {
-            return randomPointOnSphere;
-        } else {
-            throw new TypeError(`Unsupported EmissionFrom Type`);
-        }
-    } else if (emissionShape === EmissionShapeType.Box) {
-        if (emissionType === EmissionFromType.Volume) {
-            return randomPointInBox;
-        } else if (emissionType === EmissionFromType.Shell) {
-            return randomPointOnBox;
-        } else {
-            throw new TypeError(`Unsupported EmissionFrom Type`);
-        }
-    }
-}
-
-/**
- *
- * @param {number} index
- * @param {number[]|Float32Array} positionArray
- * @param {Vector3} planeNormal
- * @return {number}
- */
-function distanceToCamera(index, positionArray, planeNormal) {
-    const address = index * 3;
-
-    // extract position components of the particle
-    const x = positionArray[address];
-    const y = positionArray[address + 1];
-    const z = positionArray[address + 2];
-
-    const planeNormalX = planeNormal.x;
-    const planeNormalY = planeNormal.y;
-    const planeNormalZ = planeNormal.z;
-
-    // compute dot product
-    const dot = x * planeNormalX + y * planeNormalY + z * planeNormalZ;
-
-    // use dot product instead of the actual distance to save computation. Difference is going to be constant
-    return dot;
-}
-
 /**
  *
  * @param {ParameterSet} parameters
@@ -411,7 +350,12 @@ export class ParticleEmitter {
 
         let removeCount = 0;
 
-        for (let i = occupancy.nextSetBit(0); i !== -1; i = occupancy.nextSetBit(i + 1)) {
+        for (
+            let i = occupancy.nextSetBit(0);
+            i !== -1;
+            i = occupancy.nextSetBit(i + 1)
+        ) {
+
             const layerPosition = particles.readAttributeScalar(i, PARTICLE_ATTRIBUTE_LAYER_POSITION);
 
             const layerIndex = Math.round(layerPosition * numLayers);
@@ -425,6 +369,7 @@ export class ParticleEmitter {
             occupancy.set(i, false);
 
             removeCount++;
+
         }
 
         if (removeCount > 0) {
@@ -489,7 +434,10 @@ export class ParticleEmitter {
             }
         }
 
-        this.emisionBounds.setBounds(bounds_x0, bounds_y0, bounds_z0, bounds_x1, bounds_y1, bounds_z1);
+        this.emisionBounds.setBounds(
+            bounds_x0, bounds_y0, bounds_z0,
+            bounds_x1, bounds_y1, bounds_z1
+        );
 
         this.clearFlag(ParticleEmitterFlag.BaseBoundsNeedUpdate);
     }
@@ -708,8 +656,8 @@ export class ParticleEmitter {
     }
 
     computeHash() {
-        const parametersHash = this.parameters.hash();
-        const layersHash = this.layers.hash();
+        const parameters_hash = this.parameters.hash();
+        const layers_hash = this.layers.hash();
 
         /**
          * Extract relevant flags
@@ -717,7 +665,12 @@ export class ParticleEmitter {
          */
         const flags = this.flags & (SERIALIZABLE_FLAGS);
 
-        return computeHashIntegerArray(parametersHash, layersHash, this.blendingMode, flags);
+        return computeHashIntegerArray(
+            parameters_hash,
+            layers_hash,
+            this.blendingMode,
+            flags
+        );
     }
 
     hash() {
@@ -799,14 +752,19 @@ export class ParticleEmitter {
 
             const pivotIndex = (left + right) >> 1;
 
-            const pivot = distanceToCamera(pivotIndex, positionArray, nearPlaneNormal);
+            const pivot = distance_to_camera(pivotIndex, positionArray, nearPlaneNormal);
 
             /* partition */
             while (i <= j) {
-                while (distanceToCamera(i, positionArray, nearPlaneNormal) > pivot)
+
+                while (distance_to_camera(i, positionArray, nearPlaneNormal) > pivot) {
                     i++;
-                while (distanceToCamera(j, positionArray, nearPlaneNormal) < pivot)
+                }
+
+                while (distance_to_camera(j, positionArray, nearPlaneNormal) < pivot) {
                     j--;
+                }
+
                 if (i <= j) {
 
                     if (i !== j) {
@@ -1032,7 +990,7 @@ export class ParticleEmitter {
 
             update_parameters(ref, particles, layer, initialAge / deathAge);
 
-            particles.writeAttributeScalar(ref,PARTICLE_ATTRIBUTE_BLEND,this.blendingMode);
+            particles.writeAttributeScalar(ref, PARTICLE_ATTRIBUTE_BLEND, this.blendingMode);
         }
 
         //update time buffer
@@ -1051,9 +1009,11 @@ export class ParticleEmitter {
             return;
         }
 
-        assert.ok(layerIndex < this.layers.length && layerIndex >= 0, `layerIndex[=${layerIndex}] is out of bounds`);
+        const layers = this.layers;
 
-        const layer = this.layers.get(layerIndex);
+        assert.ok(layerIndex < layers.length && layerIndex >= 0, `layerIndex[=${layerIndex}] is out of bounds`);
+
+        const layer = layers.get(layerIndex);
 
         const random = Math.random;
 
@@ -1065,7 +1025,7 @@ export class ParticleEmitter {
 
         const emissionFunction = computeEmissionFunction(layer.emissionFrom, layer.emissionShape);
 
-        const layerPosition = layerIndex / this.layers.length;
+        const layerPosition = layerIndex / layers.length;
 
         //compute transform matrix of the emitter
         composeMatrix4(matrix4, this.position, this.rotation, this.scale);
@@ -1159,7 +1119,7 @@ export class ParticleEmitter {
 
             update_parameters(ref, particles, layer, initialAge / deathAge);
 
-            particles.writeAttributeScalar(ref,PARTICLE_ATTRIBUTE_BLEND,this.blendingMode);
+            particles.writeAttributeScalar(ref, PARTICLE_ATTRIBUTE_BLEND, this.blendingMode);
         }
 
         if (spritesNeedUpdate) {
@@ -1197,7 +1157,9 @@ export class ParticleEmitter {
                 continue;
             }
 
-            const averageLifetime = (layer.particleLife.max + layer.particleLife.min) / 2;
+            const particleLife = layer.particleLife;
+
+            const averageLifetime = (particleLife.max + particleLife.min) / 2;
 
             //emitting more than averageLifetime lifetime is unproductive, so we'll crop the emission
             let emissionDelta;
@@ -1260,27 +1222,8 @@ const matrix4 = new Matrix4();
 
 const defaultPointsMaterial = new PointsMaterial({ color: 0xFFFFFF });
 
-
-//build particle spec
-export const PARTICULAR_PARTICLE_SPECIFICATION = new ParticleSpecification();
-
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('position', ParticleAttributeType.Vector3, ParticleDataType.Float32));
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('age', ParticleAttributeType.Scalar, ParticleDataType.Float32));
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('deathAge', ParticleAttributeType.Scalar, ParticleDataType.Float32));
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('atlasPatch', ParticleAttributeType.Vector4, ParticleDataType.Float32));
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('size', ParticleAttributeType.Scalar, ParticleDataType.Float32));
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('layerPosition', ParticleAttributeType.Scalar, ParticleDataType.Float32));
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('velocity', ParticleAttributeType.Vector3, ParticleDataType.Float32));
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('rotation', ParticleAttributeType.Scalar, ParticleDataType.Float32));
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('rotationSpeed', ParticleAttributeType.Scalar, ParticleDataType.Float32));
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('color', ParticleAttributeType.Vector4, ParticleDataType.Float32));
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('blending', ParticleAttributeType.Scalar, ParticleDataType.Uint8));
-PARTICULAR_PARTICLE_SPECIFICATION.add(new ParticleAttribute('size_initial', ParticleAttributeType.Scalar, ParticleDataType.Float32));
-
-
 const frustum = new Frustum();
 
-const velocity = [];
 const position = [];
 
 const v3position = new Vector3();

package/engine/graphics/particles/particular/engine/emitter/ParticleLayer.js

@@ -68,6 +68,7 @@ function ParticleLayer() {
      * @type {number}
      */
     this.emissionRate = 1;
+
     /**
      * When layer is added - it will immediately emit this number of particles
      * @type {number}
@@ -97,6 +98,11 @@ function ParticleLayer() {
      * @type {ConicRay}
      */
     this.particleVelocityDirection = new ConicRay();
+
+    /**
+     *
+     * @type {NumericInterval}
+     */
     this.particleSpeed = new NumericInterval(0, 0);
 
     /**
@@ -111,7 +117,6 @@ function ParticleLayer() {
      */
     this.isEmitting = true;
 
-
     /**
      * Simulation steps that are to be applied
      * @type {List<SimulationStepDefinition>}
@@ -173,7 +178,12 @@ ParticleLayer.prototype.computePointBoundingBox = function (result) {
     //displace by current position
     const position = this.position;
 
-    computeConeBoundingBox(aabb3, position.x, position.y, position.z, direction.x, direction.y, direction.z, particleVelocityDirection.angle, maxDisplacement);
+    computeConeBoundingBox(
+        aabb3,
+        position.x, position.y, position.z,
+        direction.x, direction.y, direction.z,
+        particleVelocityDirection.angle, maxDisplacement
+    );
 
     x0 = aabb3.x0;
     y0 = aabb3.y0;

package/engine/graphics/particles/particular/engine/emitter/computeEmissionFunction.js

@@ -0,0 +1,37 @@
+import { EmissionShapeType } from "./EmissionShapeType.js";
+import { randomPointInPoint } from "../../../../../../core/geom/random/randomPointInPoint.js";
+import { EmissionFromType } from "./EmissionFromType.js";
+import { randomPointInSphere } from "../../../../../../core/geom/random/randomPointInSphere.js";
+import { randomPointOnSphere } from "../../../../../../core/geom/random/randomPointOnSphere.js";
+import { randomPointInBox } from "../../../../../../core/geom/random/randomPointInBox.js";
+import { randomPointOnBox } from "../../../../../../core/geom/random/randomPointOnBox.js";
+
+/**
+ *
+ * @param {EmissionFromType} emissionType
+ * @param {EmissionShapeType} emissionShape
+ * @returns {function(random: function, result:Vector3):void}
+ */
+export function computeEmissionFunction(emissionType, emissionShape) {
+    if (emissionShape === EmissionShapeType.Point) {
+        return randomPointInPoint;
+    } else if (emissionShape === EmissionShapeType.Sphere) {
+        if (emissionType === EmissionFromType.Volume) {
+            return randomPointInSphere;
+        } else if (emissionType === EmissionFromType.Shell) {
+            return randomPointOnSphere;
+        } else {
+            throw new TypeError('Unsupported EmissionFrom Type');
+        }
+    } else if (emissionShape === EmissionShapeType.Box) {
+        if (emissionType === EmissionFromType.Volume) {
+            return randomPointInBox;
+        } else if (emissionType === EmissionFromType.Shell) {
+            return randomPointOnBox;
+        } else {
+            throw new TypeError('Unsupported EmissionFrom Type');
+        }
+    } else {
+        throw new TypeError('Unsupported emission shape');
+    }
+}

package/engine/graphics/particles/particular/engine/emitter/distance_to_camera.js

@@ -0,0 +1,25 @@
+/**
+ *
+ * @param {number} index
+ * @param {number[]|Float32Array} positionArray
+ * @param {Vector3} planeNormal
+ * @return {number}
+ */
+export function distance_to_camera(index, positionArray, planeNormal) {
+    const address = index * 3;
+
+    // extract position components of the particle
+    const x = positionArray[address];
+    const y = positionArray[address + 1];
+    const z = positionArray[address + 2];
+
+    const planeNormalX = planeNormal.x;
+    const planeNormalY = planeNormal.y;
+    const planeNormalZ = planeNormal.z;
+
+    // compute dot product
+    const dot = x * planeNormalX + y * planeNormalY + z * planeNormalZ;
+
+    // use dot product instead of the actual distance to save computation. Difference is going to be constant
+    return dot;
+}

package/engine/graphics/render/buffer/buffers/prototypeNormalFrameBuffer.js

@@ -108,7 +108,7 @@ function makeConfig(engine) {
         new ClingToTerrainSystem(),
         new TerrainSystem(graphics, assetManager),
         new WaterSystem(graphics),
-        new Trail2DSystem(graphics, assetManager),
+        new Trail2DSystem(engine),
         new Foliage2System(assetManager, graphics),
         new ViewportPositionSystem(graphics.viewport.size),
         new GridPosition2TransformSystem(),
@@ -326,7 +326,7 @@ function main(engine) {
                     position: {
                         x: 60 + i * 10,
                         y: 0,
-                        z: 30 + j*10
+                        z: 30 + j * 10
                     },
                     scale: {
                         x: 1,

package/engine/graphics/render/forward_plus/LightManager.js

@@ -508,6 +508,7 @@ export class LightManager {
         let lookup_address_offset = 0;
         let i_x_0, i_y_0, i_z_0;
 
+        // clear cache
         LOOKUP_CACHE.fill(0xFFFFFFFF);
 
         for (i_z_0 = 0; i_z_0 < tr_z; i_z_0++) {
@@ -529,7 +530,6 @@ export class LightManager {
                 read_plane_pair(cluster_planes, y_plane_index_offset_0, scratch_frustum_planes, 8);
 
                 for (i_x_0 = 0; i_x_0 < tr_x; i_x_0++) {
-                    const i_x_1 = i_x_0 + 1;
 
                     // construct x planes
 
@@ -551,6 +551,8 @@ export class LightManager {
                     const frustum_point_index_011 = i_z_1 * tr_xy_1 + i_y_1 * tr_x_1 + i_x_0;
                     read_frustum_corner(cluster_frustum_points, frustum_point_index_011, scratch_corners, 9);
 
+                    const i_x_1 = i_x_0 + 1;
+
                     const frustum_point_index_100 = i_z_0 * tr_xy_1 + i_y_0 * tr_x_1 + i_x_1;
                     read_frustum_corner(cluster_frustum_points, frustum_point_index_100, scratch_corners, 12);
 
@@ -565,7 +567,13 @@ export class LightManager {
 
 
                     // at this point we have a fully constructed cluster, we can query lights within the cluster
-                    const match_count = queryBVH_Frustum(scratch_light_nodes, 0, bvh, scratch_frustum_planes, scratch_corners);
+                    const match_count = queryBVH_Frustum(
+                        scratch_light_nodes,
+                        0,
+                        bvh,
+                        scratch_frustum_planes,
+                        scratch_corners
+                    );
 
                     const tile_index = (i_z_0 * tile_slice_size) + (i_y_0 * tr_x) + (tr_x - i_x_1);
 

package/engine/graphics/render/forward_plus/computeFrustumCorners.js

@@ -1,15 +1,5 @@
-import Vector3 from "../../../../core/geom/Vector3.js";
 import { plane_three_computeConvex3PlaneIntersection } from "../../../../core/geom/3d/plane/plane_computeConvex3PlaneIntersection.js";
 
-const v_000 = new Vector3();
-const v_001 = new Vector3();
-const v_010 = new Vector3();
-const v_011 = new Vector3();
-const v_100 = new Vector3();
-const v_101 = new Vector3();
-const v_110 = new Vector3();
-const v_111 = new Vector3();
-
 /**
  *
  * @param {Float32Array|number[]} result
@@ -18,68 +8,60 @@ const v_111 = new Vector3();
 export function computeFrustumCorners(result, planes) {
 
     const plane_x0 = planes[0];
-    const plane_x1 = planes[1];
-
     const plane_y0 = planes[2];
-    const plane_y1 = planes[3];
-
     const plane_z0 = planes[4];
-    const plane_z1 = planes[5];
 
-    plane_three_computeConvex3PlaneIntersection(v_000,
+    plane_three_computeConvex3PlaneIntersection(result, 0,
         plane_x0,
         plane_y0,
         plane_z0
     );
 
-    plane_three_computeConvex3PlaneIntersection(v_001,
+    const plane_z1 = planes[5];
+
+    plane_three_computeConvex3PlaneIntersection(result, 3,
         plane_x0,
         plane_y0,
         plane_z1
     );
 
-    plane_three_computeConvex3PlaneIntersection(v_010,
+    const plane_y1 = planes[3];
+
+    plane_three_computeConvex3PlaneIntersection(result, 6,
         plane_x0,
         plane_y1,
         plane_z0
     );
 
-    plane_three_computeConvex3PlaneIntersection(v_011,
+    plane_three_computeConvex3PlaneIntersection(result, 9,
         plane_x0,
         plane_y1,
         plane_z1
     );
 
-    plane_three_computeConvex3PlaneIntersection(v_100,
+    const plane_x1 = planes[1];
+
+    plane_three_computeConvex3PlaneIntersection(result, 12,
         plane_x1,
         plane_y0,
         plane_z0
     );
 
-    plane_three_computeConvex3PlaneIntersection(v_101,
+    plane_three_computeConvex3PlaneIntersection(result, 15,
         plane_x1,
         plane_y0,
         plane_z1
     );
 
-    plane_three_computeConvex3PlaneIntersection(v_110,
+    plane_three_computeConvex3PlaneIntersection(result, 18,
         plane_x1,
         plane_y1,
         plane_z0
     );
 
-    plane_three_computeConvex3PlaneIntersection(v_111,
+    plane_three_computeConvex3PlaneIntersection(result, 21,
         plane_x1,
         plane_y1,
         plane_z1
     );
-
-    v_000.writeToArray(result, 0);
-    v_001.writeToArray(result, 3);
-    v_010.writeToArray(result, 6);
-    v_011.writeToArray(result, 9);
-    v_100.writeToArray(result, 12);
-    v_101.writeToArray(result, 15);
-    v_110.writeToArray(result, 18);
-    v_111.writeToArray(result, 21);
 }

package/engine/graphics/render/forward_plus/plugin/ptototypeFPPlugin.js

@@ -125,7 +125,7 @@ function makeConfig(engine) {
         new ClingToTerrainSystem(),
         new TerrainSystem(graphics, assetManager),
         new WaterSystem(graphics),
-        new Trail2DSystem(graphics, assetManager),
+        new Trail2DSystem(engine),
         new Foliage2System(assetManager, graphics),
         new ViewportPositionSystem(graphics.viewport.size),
         new GridPosition2TransformSystem(),