@woosh/meep-engine 2.33.21 → 2.33.25

package/engine/graphics/particles/particular/engine/simulator/SimulationStepApplyForce.js

@@ -18,15 +18,12 @@ export class SimulationStepApplyForce extends AbstractSimulationStep {
         const liveParticleCount = particles.size();
 
         const layerMask = this.layer_mask;
-        const layerCount = this.layer_count;
 
         for (let i = 0; i < liveParticleCount; i++) {
 
             const layer_position = particles.readAttributeScalar(i, PARTICLE_ATTRIBUTE_LAYER_POSITION);
 
-            const layer_index = layer_position * layerCount;
-
-            if ((layerMask & (1 << layer_index)) === 0) {
+            if ((layerMask & (1 << layer_position)) === 0) {
                 //skip
                 continue;
             }
@@ -35,7 +32,7 @@ export class SimulationStepApplyForce extends AbstractSimulationStep {
             particles.readAttributeVector3(i, PARTICLE_ATTRIBUTE_VELOCITY, velocity);
 
 
-            const params = layer_parameters[layer_index];
+            const params = layer_parameters[layer_position];
 
             const force_x = params[0];
             const force_y = params[1];

package/engine/graphics/particles/particular/engine/simulator/SimulationStepCurlNoiseAcceleration.js

@@ -29,17 +29,13 @@ export class SimulationStepCurlNoiseAcceleration extends AbstractSimulationStep
 
         const liveParticleCount = particles.size();
 
-        const layerCount = this.layer_count;
-
         const layerMask = this.layer_mask;
 
         for (let i = 0; i < liveParticleCount; i++) {
 
             const layer_position = particles.readAttributeScalar(i, PARTICLE_ATTRIBUTE_LAYER_POSITION);
 
-            const layer_index = layer_position * layerCount;
-
-            if ((layerMask & (1 << layer_index)) === 0) {
+            if ((layerMask & (1 << layer_position)) === 0) {
                 //skip
                 continue;
             }
@@ -50,7 +46,7 @@ export class SimulationStepCurlNoiseAcceleration extends AbstractSimulationStep
             particles.readAttributeVector3(i, PARTICLE_ATTRIBUTE_POSITION, position);
 
 
-            const params = layer_parameters[layer_index];
+            const params = layer_parameters[layer_position];
 
             const power_x = params[0];
             const power_y = params[1];

package/engine/graphics/particles/particular/engine/simulator/SimulationStepCurlNoiseVelocity.js

@@ -33,25 +33,20 @@ export class SimulationStepCurlNoiseVelocity extends AbstractSimulationStep {
 
         const liveParticleCount = particles.size();
 
-        const layerCount = this.layer_count;
-
         const layerMask = this.layer_mask;
 
         for (let i = 0; i < liveParticleCount; i++) {
 
-
             const layer_position = particles.readAttributeScalar(i, PARTICLE_ATTRIBUTE_LAYER_POSITION);
 
-            const layer_index = layer_position * layerCount;
-
-            if ((layerMask & (1 << layer_index)) === 0) {
+            if ((layerMask & (1 << layer_position)) === 0) {
                 //skip
                 continue;
             }
 
             particles.readAttributeVector3(i, PARTICLE_ATTRIBUTE_POSITION, position);
 
-            const params = layer_parameters[layer_index];
+            const params = layer_parameters[layer_position];
 
             const power_x = params[0];
             const power_y = params[1];

package/engine/graphics/particles/particular/engine/simulator/SimulationStepFixedPhysics.js

@@ -20,7 +20,6 @@ export class SimulationStepFixedPhysics extends AbstractSimulationStep {
 
         const liveParticleCount = particles.size();
 
-        const layerCount = this.layer_count;
 
         const layerMask = this.layer_mask;
 
@@ -36,9 +35,7 @@ export class SimulationStepFixedPhysics extends AbstractSimulationStep {
 
             const layer_position = particles.readAttributeScalar(i, PARTICLE_ATTRIBUTE_LAYER_POSITION);
 
-            const layer_index = Math.round(layer_position * layerCount);
-
-            if ((layerMask & (1 << layer_index)) === 0) {
+            if ((layerMask & (1 << layer_position)) === 0) {
                 //skip
                 continue;
             }
@@ -79,7 +76,7 @@ export class SimulationStepFixedPhysics extends AbstractSimulationStep {
 
             particles.writeAttributeVector3(i, PARTICLE_ATTRIBUTE_POSITION, p_x, p_y, p_z);
 
-            const layer = layers[layer_index];
+            const layer = layers[layer_position];
 
             update_parameters(i, particles, layer, normalized_age);
         }

package/engine/graphics/particles/particular/engine/simulator/update_parameters.js

@@ -22,7 +22,7 @@ export function update_parameters(particle_index, particles, layer, normalized_a
 
     if (param_color !== undefined) {
         param_color.track.sample(normalized_age, v4);
-        particles.writeAttributeVector4(particle_index, PARTICLE_ATTRIBUTE_COLOR, v4[0], v4[1], v4[2], v4[3]);
+        particles.writeAttributeVector4(particle_index, PARTICLE_ATTRIBUTE_COLOR, v4[0] * 255, v4[1] * 255, v4[2] * 255, v4[3] * 255);
     }
 
     // update size

package/engine/graphics/particles/particular/engine/utils/distributeParticlesOnObject3D.js

@@ -1,9 +1,9 @@
 import { seededRandom } from "../../../../../../core/math/random/seededRandom.js";
 import { computeMeshSurfaceArea } from "../../../../geometry/computeMeshSurfaceArea.js";
 import { ParticleEmitter } from "../emitter/ParticleEmitter.js";
-import { roundFair} from "../../../../../../core/math/MathUtils.js";
 import { ParticleEmitterFlag } from "../emitter/ParticleEmitterFlag.js";
 import { computeSkinnedMeshVertices } from "../../../../geometry/skining/computeSkinnedMeshVertices.js";
+import { roundFair } from "../../../../../../core/math/random/roundFair.js";
 
 let buffer_points = new Float32Array();
 let buffer_indices = new Uint32Array();

package/engine/graphics/particles/particular/engine/utils/distrubuteParticlesOnMesh.js

@@ -2,8 +2,8 @@ import { seededRandom } from "../../../../../../core/math/random/seededRandom.js
 import { ParticleEmitterFlag } from "../emitter/ParticleEmitterFlag.js";
 import { computeMeshSurfaceArea } from "../../../../geometry/computeMeshSurfaceArea.js";
 import { ParticleEmitter } from "../emitter/ParticleEmitter.js";
-import { roundFair } from "../../../../../../core/math/MathUtils.js";
 import { computeSkinnedMeshVertices } from "../../../../geometry/skining/computeSkinnedMeshVertices.js";
+import { roundFair } from "../../../../../../core/math/random/roundFair.js";
 
 /**
  *

package/engine/graphics/particles/particular/engine/utils/volume/AttributeValue.js

@@ -0,0 +1,141 @@
+import Signal from "../../../../../../../core/events/signal/Signal.js";
+import { DataType2TypedArrayConstructorMapping } from "../../../../../../../core/collection/table/DataType2TypedArrayConstructorMapping.js";
+import { array_copy } from "../../../../../../../core/collection/array/copyArray.js";
+import { min2 } from "../../../../../../../core/math/min2.js";
+import { assert } from "../../../../../../../core/assert.js";
+
+export class AttributeValue {
+    constructor() {
+        /**
+         * Attribute spec
+         * @type {AttributeSpec}
+         */
+        this.__spec = null;
+
+        /**
+         *
+         * @type {number[]}
+         */
+        this.__value = [];
+
+        /**
+         *
+         * @type {ParameterLookupTable}
+         * @private
+         */
+        this.__lut = null;
+
+        /**
+         *
+         * @type {Signal}
+         */
+        this.onValueChange = new Signal();
+    }
+
+    /**
+     * @param {AttributeSpec} s
+     */
+    set spec(s) {
+        this.__spec = s;
+        this.init();
+    }
+
+    /**
+     *
+     * @returns {AttributeSpec}
+     */
+    get spec() {
+        return this.__spec;
+    }
+
+    /**
+     * Will generate actual typed value storage
+     */
+    init() {
+        const spec = this.__spec;
+
+        const TAC = DataType2TypedArrayConstructorMapping[spec.type];
+
+        const new_storage = new TAC(spec.itemSize);
+
+        array_copy(this.__value, 0, new_storage, 0, min2(this.__value.length, new_storage.length));
+
+        this.__value = new_storage;
+    }
+
+    /**
+     * @param {ParameterLookupTable} v
+     */
+    set lookup(v) {
+        this.__lut = v;
+    }
+
+    /**
+     *
+     * @returns {ParameterLookupTable}
+     */
+    get lookup() {
+        return this.__lut;
+    }
+
+    /**
+     *
+     * @param {number} v
+     */
+    write_lookup_value(v) {
+        assert.isNumber(v, 'v');
+
+        if (this.__lut === null) {
+            throw new Error('No lookup table attached');
+        }
+
+        const r = [];
+
+        this.__lut.sample(v, r);
+
+        this.write_value(r);
+    }
+
+    /**
+     *
+     * @param {number[]} v
+     */
+    write_value_silent(v) {
+        this.onValueChange.mute();
+        this.write_value(v);
+        this.onValueChange.unmute();
+    }
+
+    /**
+     *
+     * @param {number[]} v
+     */
+    write_value(v) {
+        let change_flag = false;
+
+        const itemSize = this.__spec.itemSize;
+
+        for (let i = 0; i < itemSize; i++) {
+            const old = this.__value[i];
+
+            this.__value[i] = v[i];
+
+            if (this.__value[i] !== old) {
+                // stored value has changed
+                change_flag = true;
+            }
+        }
+
+        if (change_flag) {
+            this.onValueChange.send0();
+        }
+    }
+
+    /**
+     *
+     * @param {number[]} destination
+     */
+    read_value(destination) {
+        array_copy(this.__value, 0, destination, 0, this.spec.itemSize);
+    }
+}