@woosh/meep-engine 2.33.23 → 2.33.24

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

@@ -1,20 +1,84 @@
+import { VertexDataSpec } from "../../../../geometry/VertexDataSpec.js";
+import { AttributeSpec } from "../../../../geometry/AttributeSpec.js";
+import { DataType } from "../../../../../../core/collection/table/DataType.js";
+
 //build particle spec
-import { ParticleSpecification } from "../../group/ParticleSpecification.js";
-import { ParticleAttribute } from "../../group/ParticleAttribute.js";
-import { ParticleAttributeType, ParticleDataType } from "../../group/ParticleGroup.js";
+export const PARTICULAR_PARTICLE_SPECIFICATION = new VertexDataSpec();
+
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'position',
+    itemSize: 3,
+    type: DataType.Float32,
+    normalized: false
+}));
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'age',
+    itemSize: 1,
+    type: DataType.Float32,
+    normalized: false
+}));
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'deathAge',
+    itemSize: 1,
+    type: DataType.Float32,
+    normalized: false
+}));
+
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'atlasPatch',
+    itemSize: 4,
+    type: DataType.Uint16,
+    normalized: true
+}));
 
-export const PARTICULAR_PARTICLE_SPECIFICATION = new ParticleSpecification();
+// TODO convert "size" to scale instead
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'size',
+    itemSize: 1,
+    type: DataType.Float32,
+    normalized: false
+}));
 
-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));
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'layerPosition',
+    itemSize: 1,
+    type: DataType.Uint8,
+    normalized: false
+}));
 
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'velocity',
+    itemSize: 3,
+    type: DataType.Float32,
+    normalized: false
+}));
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'rotation',
+    itemSize: 1,
+    type: DataType.Float32,
+    normalized: false
+}));
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'rotationSpeed',
+    itemSize: 1,
+    type: DataType.Float32,
+    normalized: false
+}));
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'color',
+    itemSize: 4,
+    type: DataType.Uint8,
+    normalized: true
+}));
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'blending',
+    itemSize: 1,
+    type: DataType.Float32,
+    normalized: false
+}));
+PARTICULAR_PARTICLE_SPECIFICATION.add(AttributeSpec.fromJSON({
+    name: 'size_initial',
+    itemSize: 1,
+    type: DataType.Float32,
+    normalized: false
+}));

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

@@ -14,7 +14,6 @@ import { ParticleLayer } from "./ParticleLayer.js";
 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 { ParticleEmitterFlag } from "./ParticleEmitterFlag.js";
 import { AABB3 } from "../../../../../../core/bvh2/aabb3/AABB3.js";
 import {
@@ -35,6 +34,7 @@ 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";
+import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
 
 const EMPTY_GEOMETRY = new BufferGeometry();
 
@@ -59,6 +59,12 @@ const corners = new Float64Array(24);
  */
 const scratch_array = [];
 
+/**
+ *
+ * @type {number[]}
+ */
+const scratch_v3_array = [];
+
 /**
  *
  * @param {ParameterSet} parameters
@@ -74,6 +80,35 @@ function generateStandardParameterSet(parameters) {
     parameters.add(pColor);
 }
 
+
+const uint16_mul = 65536;
+
+/**
+ *
+ * @param {AtlasPatch} atlasPatch
+ * @param {ParticlePool} particles
+ * @param {number} ref
+ */
+function write_particle_patch_uv(atlasPatch, particles, ref) {
+    const uv = atlasPatch.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_mul, v0 * uint16_mul, u1 * uint16_mul, v1 * uint16_mul
+    );
+}
+
 export class ParticleEmitter {
     constructor() {
         /**
@@ -236,6 +271,7 @@ export class ParticleEmitter {
             readDepth: !this.getFlag(ParticleEmitterFlag.DepthReadDisabled),
             softDepth: !this.getFlag(ParticleEmitterFlag.DepthSoftDisabled),
             velocityAlign: this.getFlag(ParticleEmitterFlag.AlignOnVelocity),
+            depthSort: this.getFlag(ParticleEmitterFlag.DepthSorting),
             blendingMode: this.blendingMode,
             layers: this.layers.toJSON()
         };
@@ -288,6 +324,12 @@ export class ParticleEmitter {
             this.writeFlag(ParticleEmitterFlag.AlignOnVelocity, false);
         }
 
+        if (typeof json.depthSort === "boolean") {
+            this.writeFlag(ParticleEmitterFlag.DepthSorting, json.depthSort);
+        } else {
+            this.writeFlag(ParticleEmitterFlag.DepthSorting, true);
+        }
+
         this.layers.fromJSON(json.layers, ParticleLayer);
 
         this.writeFlag(ParticleEmitterFlag.Built, false);
@@ -343,8 +385,6 @@ export class ParticleEmitter {
             throw new Error('Layer not found');
         }
 
-        const numLayers = layers.length;
-
         const particles = this.particles;
         const occupancy = particles.occupancy;
 
@@ -358,9 +398,7 @@ export class ParticleEmitter {
 
             const layerPosition = particles.readAttributeScalar(i, PARTICLE_ATTRIBUTE_LAYER_POSITION);
 
-            const layerIndex = Math.round(layerPosition * numLayers);
-
-            if (layerIndex !== targetLayerIndex) {
+            if (layerPosition !== targetLayerIndex) {
                 // not the layer we want
                 continue;
             }
@@ -837,29 +875,19 @@ export class ParticleEmitter {
 
         const layers = this.layers;
 
-        const numLayers = layers.length;
-
         let missingFlag = false;
 
         //cycle through each particle
         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);
+            const layerIndex = particles.readAttributeScalar(i, PARTICLE_ATTRIBUTE_LAYER_POSITION);
 
             const layer = layers.get(layerIndex);
 
             const atlasPatch = layer.__atlasPatch;
 
             if (atlasPatch !== null) {
-                const uv = atlasPatch.uv;
-
-                const u0 = uv.position.x;
-                const v0 = uv.position.y;
-                const u1 = uv.size.x;
-                const v1 = uv.size.y;
 
-                particles.writeAttributeVector4(i, PARTICLE_ATTRIBUTE_UV, u0, v0, u1, v1);
+                write_particle_patch_uv(atlasPatch, particles, i);
             } else {
                 missingFlag = true;
             }
@@ -891,8 +919,6 @@ export class ParticleEmitter {
 
         const emissionPeriod = 1 / layer.emissionRate;
 
-        const layerPosition = layerIndex / this.layers.length;
-
         //compute transform matrix of the emitter
         const emitter_position = this.position;
         const last_spawn_position = this.__lastSpawnPosition;
@@ -910,7 +936,9 @@ export class ParticleEmitter {
             const f = time / timeDelta;
 
             //compute position for particle
-            emissionFunction(random, v3position);
+            emissionFunction(random, scratch_v3_array, 0);
+
+            v3position.readFromArray(scratch_v3_array, 0);
 
             //apply layer transform
             v3position.multiply(layer.scale);
@@ -969,24 +997,13 @@ export class ParticleEmitter {
             //write UV
             const atlasPatch = layer.__atlasPatch;
             if (atlasPatch !== null) {
-                const uv = atlasPatch.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, v0, u1, v1);
+                //patch exists, write it
+                write_particle_patch_uv(atlasPatch, particles, ref);
             } else {
                 this.setFlag(ParticleEmitterFlag.SpritesNeedUpdate);
             }
 
-            particles.writeAttributeScalar(ref, PARTICLE_ATTRIBUTE_LAYER_POSITION, layerPosition);
+            particles.writeAttributeScalar(ref, PARTICLE_ATTRIBUTE_LAYER_POSITION, layerIndex);
 
             update_parameters(ref, particles, layer, initialAge / deathAge);
 
@@ -1025,8 +1042,6 @@ export class ParticleEmitter {
 
         const emissionFunction = computeEmissionFunction(layer.emissionFrom, layer.emissionShape);
 
-        const layerPosition = layerIndex / layers.length;
-
         //compute transform matrix of the emitter
         composeMatrix4(matrix4, this.position, this.rotation, this.scale);
 
@@ -1039,7 +1054,9 @@ export class ParticleEmitter {
             const ref = particles.create();
 
             //compute position for particle
-            emissionFunction(random, v3position);
+            emissionFunction(random, scratch_v3_array, 0);
+
+            v3position.readFromArray(scratch_v3_array, 0);
 
             //apply layer transform
             v3position.multiply(layer.scale);
@@ -1097,25 +1114,13 @@ export class ParticleEmitter {
 
             if (atlasPatch !== null) {
                 //patch exists, write it
-                const uv = atlasPatch.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, v0, u1, v1);
+                write_particle_patch_uv(atlasPatch, particles, ref);
             } else {
                 //patch is not loaded yet, request update
                 spritesNeedUpdate = true;
             }
 
-            particles.writeAttributeScalar(ref, PARTICLE_ATTRIBUTE_LAYER_POSITION, layerPosition);
+            particles.writeAttributeScalar(ref, PARTICLE_ATTRIBUTE_LAYER_POSITION, layerIndex);
 
             update_parameters(ref, particles, layer, initialAge / deathAge);
 

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

@@ -3,7 +3,6 @@ import { NumericInterval } from "../../../../../../core/math/interval/NumericInt
 import { ParameterTrackSet } from "../parameter/ParameterTrackSet.js";
 import { AABB3 } from "../../../../../../core/bvh2/aabb3/AABB3.js";
 import { ParticleParameters } from "./ParticleParameters.js";
-import { computeHashFloat, computeHashIntegerArray } from "../../../../../../core/math/MathUtils.js";
 import { ConicRay } from "../../../../../../core/geom/ConicRay.js";
 import { SimulationStepDefinition } from "../simulator/SimulationStepDefinition.js";
 import List from "../../../../../../core/collection/list/List.js";
@@ -12,6 +11,8 @@ import { computeStringHash } from "../../../../../../core/primitives/strings/com
 import { computeConeBoundingBox } from "../../../../../../core/geom/3d/cone/computeConeBoundingBox.js";
 import { EmissionFromType } from "./EmissionFromType.js";
 import { EmissionShapeType } from "./EmissionShapeType.js";
+import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloat } from "../../../../../../core/math/hash/computeHashFloat.js";
 
 function ParticleLayer() {
     /**

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

@@ -1,9 +1,10 @@
 import { BitSet } from "../../../../../../core/binary/BitSet.js";
 import { max3 } from "../../../../../../core/math/max3.js";
-import { itemSizeFromAttributeType, typedArrayConstructorFromDataType } from "../../group/ParticleGroup.js";
-import { BufferAttribute, BufferGeometry, DynamicDrawUsage } from 'three';
+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 { compute_typed_array_constructor_from_data_type } from "../../../../../../core/collection/table/DataType2TypedArrayConstructorMapping.js";
 
 const SHRINK_THRESHOLD = 64;
 const GROW_MIN_STEP = 32;
@@ -11,13 +12,15 @@ const GROW_MIN_STEP = 32;
 export class ParticlePool {
     /**
      *
-     * @param {ParticleSpecification} spec
+     * @param {VertexDataSpec} spec
      * @constructor
      */
     constructor(spec) {
+        assert.equal(spec.isVertexDataSpec, true, 'spec.VertexDataSpec !== true');
+
         /**
          *
-         * @type {ParticleSpecification}
+         * @type {VertexDataSpec}
          */
         this.spec = spec;
 
@@ -224,6 +227,41 @@ export class ParticlePool {
         }
     }
 
+    /**
+     *
+     * @param {AttributeSpec} spec
+     * @return {number}
+     * @private
+     */
+    __compute_attribute_byte_size(spec) {
+
+        const item_size = spec.itemSize;
+
+        const TypedArrayConstructor = compute_typed_array_constructor_from_data_type(spec.type);
+
+        const element_byte_size = TypedArrayConstructor.BYTES_PER_ELEMENT;
+
+        return item_size * element_byte_size * this.capacity;
+    }
+
+    /**
+     *
+     * @return {number}
+     * @private
+     */
+    __compute_attribute_byte_size_total() {
+
+        const spec_attributes = this.spec.attributes;
+        const l = spec_attributes.length;
+
+        let r = 0;
+        for (let i = 0; i < l; i++) {
+            r += this.__compute_attribute_byte_size(spec_attributes[i]);
+        }
+
+        return r;
+    }
+
     build() {
         const geometry = new BufferGeometry();
         geometry.dynamic = true;
@@ -234,25 +272,26 @@ export class ParticlePool {
         for (let i = 0; i < l; i++) {
 
             /**
-             * @type {ParticleAttribute}
+             * @type {AttributeSpec}
              */
             const attributeSpec = spec_attributes[i];
 
-            const itemSize = itemSizeFromAttributeType(attributeSpec.type);
-            const TypedArrayConstructor = typedArrayConstructorFromDataType(attributeSpec.dataType);
+            const itemSize = attributeSpec.itemSize;
+            const TypedArrayConstructor = compute_typed_array_constructor_from_data_type(attributeSpec.type);
 
             const newArrayLength = itemSize * this.capacity;
             const newArray = new TypedArrayConstructor(newArrayLength);
 
-            const attribute = this.attributes[i];
-            if (attribute !== undefined && attribute.count !== 0) {
+            const old_attribute = this.attributes[i];
+
+            if (old_attribute !== undefined && old_attribute.count !== 0) {
                 //copy old data
-                typed_array_copy(attribute.array, newArray);
+                typed_array_copy(old_attribute.array, newArray);
             }
 
-            const newAttribute = new BufferAttribute(newArray, itemSize);
+            const newAttribute = new BufferAttribute(newArray, itemSize, attributeSpec.normalized);
 
-            newAttribute.setUsage(DynamicDrawUsage);
+            newAttribute.setUsage(StreamDrawUsage);
             newAttribute.name = attributeSpec.name;
 
             this.attributes[i] = newAttribute;

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

@@ -1,7 +1,8 @@
 import { ParticlePool } from "./ParticlePool.js";
-import { ParticleAttributeType, ParticleDataType, } from "../../group/ParticleGroup.js";
 import { ParticleSpecification } from "../../group/ParticleSpecification.js";
 import { ParticleAttribute } from "../../group/ParticleAttribute.js";
+import { ParticleDataType } from "../../group/ParticleDataType.js";
+import { ParticleAttributeType } from "../../group/ParticleAttributeType.js";
 
 /**
  *
@@ -184,4 +185,4 @@ test('read/write scalar attribute', () => {
     pool.writeAttributeScalar(1, 0, 42);
 
     expect(pool.readAttributeScalar(1, 0)).toBe(42);
-});
+});

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

@@ -10,7 +10,7 @@ import { randomPointOnBox } from "../../../../../../core/geom/random/randomPoint
  *
  * @param {EmissionFromType} emissionType
  * @param {EmissionShapeType} emissionShape
- * @returns {function(random: function, result:Vector3):void}
+ * @returns {function(random: function, result:(number[]|Float32Array|Float64Array), result_offset:number):void}
  */
 export function computeEmissionFunction(emissionType, emissionShape) {
     if (emissionShape === EmissionShapeType.Point) {

package/engine/graphics/particles/particular/engine/emitter/serde/ParameterLookupTableSerializationAdapter.js

@@ -86,10 +86,16 @@ export class ParameterLookupTableSerializationAdapter extends BinaryClassSeriali
 
         const dataLength = itemCount * value.itemSize;
 
-        const data = new Float32Array(dataLength);
+        /**
+         * Reserve a continuous chunk of memory for faster access
+         * @type {ArrayBuffer}
+         */
+        const array_buffer = new ArrayBuffer((dataLength + itemCount) * 4);
+
+        const data = new Float32Array(array_buffer, itemCount * 4, dataLength);
         buffer.readFloat32Array(data, 0, dataLength);
 
-        const positions = new Float32Array(itemCount);
+        const positions = new Float32Array(array_buffer, 0, itemCount);
         buffer.readFloat32Array(positions, 0, itemCount);
 
         value.write(data, positions);

package/engine/graphics/particles/particular/engine/parameter/ParameterLookupTable.js

@@ -1,11 +1,12 @@
 import { inverseLerp } from "../../../../../../core/math/inverseLerp.js";
-import { computeHashFloatArray, computeHashIntegerArray } from "../../../../../../core/math/MathUtils.js";
 import { assert } from "../../../../../../core/assert.js";
 import { max2 } from "../../../../../../core/math/max2.js";
 import { min2 } from "../../../../../../core/math/min2.js";
 import { mix } from "../../../../../../core/math/mix.js";
 import { ParameterLookupTableFlags } from "./ParameterLookupTableFlags.js";
 import { ParameterLookupTableSerializationAdapter } from "../emitter/serde/ParameterLookupTableSerializationAdapter.js";
+import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
+import { computeHashFloatArray } from "../../../../../../core/math/hash/computeHashFloatArray.js";
 
 
 export class ParameterLookupTable {

package/engine/graphics/particles/particular/engine/parameter/ParameterTrack.js

@@ -5,8 +5,8 @@
  * @constructor
  */
 import { ParameterLookupTable } from "./ParameterLookupTable.js";
-import { computeHashIntegerArray } from "../../../../../../core/math/MathUtils.js";
 import { computeStringHash } from "../../../../../../core/primitives/strings/computeStringHash.js";
+import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
 
 export class ParameterTrack {
     constructor(name, lut) {

package/engine/graphics/particles/particular/engine/parameter/ParticleParameter.js

@@ -1,10 +1,10 @@
-import { computeHashIntegerArray} from "../../../../../../core/math/MathUtils.js";
 import { assert } from "../../../../../../core/assert.js";
 import { max2 } from "../../../../../../core/math/max2.js";
 import { min2 } from "../../../../../../core/math/min2.js";
 import { ParameterLookupTable } from "./ParameterLookupTable.js";
 import List from "../../../../../../core/collection/list/List.js";
 import { computeStringHash } from "../../../../../../core/primitives/strings/computeStringHash.js";
+import { computeHashIntegerArray } from "../../../../../../core/collection/array/computeHashIntegerArray.js";
 
 
 export class ParticleParameter {

package/engine/graphics/particles/particular/engine/renderers/billboard/BILLBOARD_PARTICLE_SPECIFICATION.js

@@ -0,0 +1,21 @@
+import { ParticleSpecification } from "../../../group/ParticleSpecification.js";
+import { ParticleAttribute } from "../../../group/ParticleAttribute.js";
+import { ParticleAttributeType } from "../../../group/ParticleAttributeType.js";
+import { ParticleDataType } from "../../../group/ParticleDataType.js";
+
+export const BILLBOARD_PARTICLE_ATTRIBUTE_POSITION = 0;
+export const BILLBOARD_PARTICLE_ATTRIBUTE_UV = 1;
+export const BILLBOARD_PARTICLE_ATTRIBUTE_SIZE = 2;
+export const BILLBOARD_PARTICLE_ATTRIBUTE_VELOCITY = 3;
+export const BILLBOARD_PARTICLE_ATTRIBUTE_COLOR = 5;
+export const BILLBOARD_PARTICLE_ATTRIBUTE_BLEND = 6;
+
+export const BILLBOARD_PARTICLE_SPECIFICATION = new ParticleSpecification();
+
+BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('position', ParticleAttributeType.Vector3, ParticleDataType.Float32));
+BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('atlasPatch', ParticleAttributeType.Vector4, ParticleDataType.Float32));
+BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('size', ParticleAttributeType.Scalar, ParticleDataType.Float32));
+BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('velocity', ParticleAttributeType.Vector3, ParticleDataType.Float32));
+BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('rotation', ParticleAttributeType.Scalar, ParticleDataType.Float32));
+BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('color', ParticleAttributeType.Vector4, ParticleDataType.Float32));
+BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('blending', ParticleAttributeType.Scalar, ParticleDataType.Uint8));

package/engine/graphics/particles/particular/engine/renderers/billboard/ParticleBillboardMaterial.js

@@ -1,25 +1,5 @@
 import { AddEquation, CustomBlending, Matrix4, OneFactor, OneMinusSrcAlphaFactor, ShaderMaterial } from "three";
 import { Vector2 as ThreeVector2 } from "three/src/math/Vector2.js";
-import { ParticleSpecification } from "../../../group/ParticleSpecification.js";
-import { ParticleAttribute } from "../../../group/ParticleAttribute.js";
-import { ParticleAttributeType, ParticleDataType } from "../../../group/ParticleGroup.js";
-
-export const BILLBOARD_PARTICLE_SPECIFICATION = new ParticleSpecification();
-
-BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('position', ParticleAttributeType.Vector3, ParticleDataType.Float32));
-BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('atlasPatch', ParticleAttributeType.Vector4, ParticleDataType.Float32));
-BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('size', ParticleAttributeType.Scalar, ParticleDataType.Float32));
-BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('velocity', ParticleAttributeType.Vector3, ParticleDataType.Float32));
-BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('rotation', ParticleAttributeType.Scalar, ParticleDataType.Float32));
-BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('color', ParticleAttributeType.Vector4, ParticleDataType.Float32));
-BILLBOARD_PARTICLE_SPECIFICATION.add(new ParticleAttribute('blending', ParticleAttributeType.Scalar, ParticleDataType.Uint8));
-
-export const BILLBOARD_PARTICLE_ATTRIBUTE_POSITION = 0;
-export const BILLBOARD_PARTICLE_ATTRIBUTE_UV = 1;
-export const BILLBOARD_PARTICLE_ATTRIBUTE_SIZE = 2;
-export const BILLBOARD_PARTICLE_ATTRIBUTE_VELOCITY = 3;
-export const BILLBOARD_PARTICLE_ATTRIBUTE_COLOR = 5;
-export const BILLBOARD_PARTICLE_ATTRIBUTE_BLEND = 6;
 
 const DEPTH_ERROR_MARGIN = 0.0001;
 

package/engine/graphics/particles/particular/engine/renderers/billboard/prototypeBillboardRenderer.js

@@ -1,14 +1,6 @@
 import { EngineHarness } from "../../../../../../EngineHarness.js";
 import { ParticlePool } from "../../emitter/ParticlePool.js";
-import {
-    BILLBOARD_PARTICLE_ATTRIBUTE_BLEND,
-    BILLBOARD_PARTICLE_ATTRIBUTE_COLOR,
-    BILLBOARD_PARTICLE_ATTRIBUTE_POSITION,
-    BILLBOARD_PARTICLE_ATTRIBUTE_SIZE,
-    BILLBOARD_PARTICLE_ATTRIBUTE_UV,
-    BILLBOARD_PARTICLE_SPECIFICATION,
-    make_particle_billboard_shader
-} from "./ParticleBillboardMaterial.js";
+import { make_particle_billboard_shader } from "./ParticleBillboardMaterial.js";
 import { DataTexture, LinearFilter, LinearMipMapLinearFilter, Matrix4, Points } from "three";
 import { ManagedAtlas } from "../../../../../texture/atlas/ManagedTextureAtlas.js";
 import { writeSample2DDataToDataTexture } from "../../../../../texture/sampler/writeSampler2DDataToDataTexture.js";
@@ -21,6 +13,14 @@ import Mesh from "../../../../../ecs/mesh/Mesh.js";
 import Vector3 from "../../../../../../../core/geom/Vector3.js";
 import { RenderPassType } from "../../../../../render/RenderPassType.js";
 import { StandardFrameBuffers } from "../../../../../StandardFrameBuffers.js";
+import {
+    BILLBOARD_PARTICLE_ATTRIBUTE_BLEND,
+    BILLBOARD_PARTICLE_ATTRIBUTE_COLOR,
+    BILLBOARD_PARTICLE_ATTRIBUTE_POSITION,
+    BILLBOARD_PARTICLE_ATTRIBUTE_SIZE,
+    BILLBOARD_PARTICLE_ATTRIBUTE_UV,
+    BILLBOARD_PARTICLE_SPECIFICATION
+} from "./BILLBOARD_PARTICLE_SPECIFICATION.js";
 
 
 const engineHarness = new EngineHarness();

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];