@woosh/meep-engine 2.33.23 → 2.33.27

package/engine/graphics/geometry/instancing/InstancedMeshGroup.js

@@ -9,6 +9,7 @@ import ThreeFactory from "../../three/ThreeFactory.js";
 import { StaticMaterialCache } from "../../../asset/loaders/material/StaticMaterialCache.js";
 import { composeCompile } from "../../material/composeCompile.js";
 import { typed_array_copy } from "../../../../core/collection/array/typed/typed_array_copy.js";
+import { rewriteMaterial } from "./rewriteMaterial.js";
 
 /**
  *
@@ -94,77 +95,6 @@ InstancedMeshGroup.prototype.setGeometry = function (geometry) {
 };
 
 
-const SHADER_PREAMBLE = `
-    attribute vec3 instancePosition;
-    attribute vec4 instanceRotation;
-    attribute vec3 instanceScale;
-    
-    vec3 instanceTransform( in vec3 position, vec3 T, vec4 R, vec3 S ){
-        vec3 result = position;
-        
-        //applies the scale
-        result *= S;
-        //computes the rotation where R is a (vec4) quaternion
-        result += 2.0 * cross( R.xyz, cross( R.xyz, result ) + R.w * result );
-        //translates the transformed 'blueprint'
-        result += T;
-        
-        return result;
-    }
-    
-    mat4 getInstanceMatrix(){
-      vec4 q = instanceRotation;
-      vec3 s = instanceScale;
-      vec3 v = instancePosition;
-
-      vec3 q2 = q.xyz + q.xyz;
-      vec3 a = q.xxx * q2.xyz;
-      vec3 b = q.yyz * q2.yzz;
-      vec3 c = q.www * q2.xyz;
-    
-      vec3 r0 = vec3( 1.0 - (b.x + b.z) , a.y + c.z , a.z - c.y ) * s.xxx;
-      vec3 r1 = vec3( a.y - c.z , 1.0 - (a.x + b.z) , b.y + c.x ) * s.yyy;
-      vec3 r2 = vec3( a.z + c.y , b.y - c.x , 1.0 - (a.x + b.x) ) * s.zzz;
-    
-      return mat4(
-          r0 , 0.0,
-          r1 , 0.0,
-          r2 , 0.0,
-          v  , 1.0
-      );
-    }\n`;
-
-function rewriteMaterial(shader) {
-    const originalVertexShader = shader.vertexShader;
-
-    const newVertexShader = SHADER_PREAMBLE
-        + originalVertexShader
-            .replace(
-                '#include <uv_vertex>',
-                `
-                mat4 instanceMatrix = getInstanceMatrix();
-                #include <uv_vertex>
-                `
-            )
-            .replace(
-                '#include <begin_vertex>',
-                `
-                vec3 transformed = ( instanceMatrix * vec4(position,1.0) ).xyz;
-                `
-            )
-            .replace(
-                '#include <beginnormal_vertex>',
-                `
-                vec3 objectNormal = mat3( instanceMatrix ) * vec3( normal );
-                #ifdef USE_TANGENT
-                    vec3 objectTangent = vec3( tangent.xyz );
-                #endif
-                `
-            );
-
-    shader.vertexShader = newVertexShader;
-}
-
 /**
  *
  * @param {THREE.Material} sourceMaterial
@@ -332,7 +262,19 @@ InstancedMeshGroup.prototype.add = function (reference) {
  * @param {*} [thisArg]
  */
 InstancedMeshGroup.prototype.traverseReferences = function (visitor, thisArg) {
-    this.indices.forEach(visitor, thisArg);
+    const indices = this.indices;
+    const index_count = indices.length;
+
+    for (let i = 0; i < index_count; i++) {
+        const index = indices[i];
+
+        if (index === undefined) {
+            // unoccupied
+            continue;
+        }
+
+        visitor.call(thisArg, index, i);
+    }
 };
 
 /**

package/engine/graphics/geometry/instancing/rewriteMaterial.js

@@ -0,0 +1,70 @@
+const SHADER_PREAMBLE = `
+    attribute vec3 instancePosition;
+    attribute vec4 instanceRotation;
+    attribute vec3 instanceScale;
+    
+    vec3 instanceTransform( in vec3 position, vec3 T, vec4 R, vec3 S ){
+        vec3 result = position;
+        
+        //applies the scale
+        result *= S;
+        //computes the rotation where R is a (vec4) quaternion
+        result += 2.0 * cross( R.xyz, cross( R.xyz, result ) + R.w * result );
+        //translates the transformed 'blueprint'
+        result += T;
+        
+        return result;
+    }
+    
+    mat4 getInstanceMatrix(){
+      vec4 q = instanceRotation;
+      vec3 s = instanceScale;
+      vec3 v = instancePosition;
+
+      vec3 q2 = q.xyz + q.xyz;
+      vec3 a = q.xxx * q2.xyz;
+      vec3 b = q.yyz * q2.yzz;
+      vec3 c = q.www * q2.xyz;
+    
+      vec3 r0 = vec3( 1.0 - (b.x + b.z) , a.y + c.z , a.z - c.y ) * s.xxx;
+      vec3 r1 = vec3( a.y - c.z , 1.0 - (a.x + b.z) , b.y + c.x ) * s.yyy;
+      vec3 r2 = vec3( a.z + c.y , b.y - c.x , 1.0 - (a.x + b.x) ) * s.zzz;
+    
+      return mat4(
+          r0 , 0.0,
+          r1 , 0.0,
+          r2 , 0.0,
+          v  , 1.0
+      );
+    }\n`;
+
+export function rewriteMaterial(shader) {
+    const originalVertexShader = shader.vertexShader;
+
+    const newVertexShader = SHADER_PREAMBLE
+        + originalVertexShader
+            .replace(
+                '#include <uv_vertex>',
+                `
+                mat4 instanceMatrix = getInstanceMatrix();
+                #include <uv_vertex>
+                `
+            )
+            .replace(
+                '#include <begin_vertex>',
+                `
+                vec3 transformed = ( instanceMatrix * vec4(position,1.0) ).xyz;
+                `
+            )
+            .replace(
+                '#include <beginnormal_vertex>',
+                `
+                vec3 objectNormal = mat3( instanceMatrix ) * vec3( normal );
+                #ifdef USE_TANGENT
+                    vec3 objectTangent = vec3( tangent.xyz );
+                #endif
+                `
+            );
+
+    shader.vertexShader = newVertexShader;
+}

package/engine/graphics/material/manager/MaterialManager.js

@@ -14,7 +14,8 @@ export class MaterialManager {
          */
         this.__library = new HashMap({
             keyHashFunction: computeMaterialHash,
-            keyEqualityFunction: computeMaterialEquality
+            keyEqualityFunction: computeMaterialEquality,
+            capacity: 1024
         });
 
         /**

package/engine/graphics/micron/build/buildMicronGeometryFromBufferGeometry.js

@@ -2,7 +2,7 @@ import { TopoMesh } from "../../../../core/geom/3d/topology/TopoMesh.js";
 import { PatchRepresentation } from "./PatchRepresentation.js";
 import { MicronGeometry } from "../format/MicronGeometry.js";
 import { buildAbstractPatchHierarchy } from "./hierarchy/buildAbstractPatchHierarchy.js";
-import { MicronGeometryBufferAttributeSpec } from "../format/MicronGeometryBufferAttributeSpec.js";
+import { AttributeSpec } from "../../geometry/AttributeSpec.js";
 import { typedArrayToDataType } from "../../../../core/collection/array/typedArrayToDataType.js";
 import { DataType } from "../../../../core/collection/table/DataType.js";
 import { MicronGeometryPatch } from "../format/MicronGeometryPatch.js";
@@ -28,7 +28,7 @@ function current_time_millis() {
 
 /**
  *
- * @param {MicronGeometryBufferAttributeSpec} spec
+ * @param {AttributeSpec} spec
  * @param {THREE.BufferAttribute} source
  */
 function custom_attribute_format_normal(spec, source) {
@@ -39,7 +39,7 @@ function custom_attribute_format_normal(spec, source) {
 
 /**
  *
- * @param {MicronGeometryBufferAttributeSpec} spec
+ * @param {AttributeSpec} spec
  * @param {THREE.BufferAttribute} source
  */
 function custom_attribute_format_uv(spec, source) {
@@ -49,7 +49,7 @@ function custom_attribute_format_uv(spec, source) {
 
 /**
  *
- * @param {MicronGeometryBufferAttributeSpec} spec
+ * @param {AttributeSpec} spec
  * @param {THREE.BufferAttribute} source
  * @param {string} name
  */
@@ -76,7 +76,7 @@ function format_attribute(spec, source, name) {
 /**
  *
  * @param {THREE.BufferGeometry} buffer_geometry
- * @returns {MicronGeometryBufferAttributeSpec[]}
+ * @returns {AttributeSpec[]}
  */
 function attributes_from_buffer_geometry(buffer_geometry) {
     const result = [];
@@ -84,7 +84,7 @@ function attributes_from_buffer_geometry(buffer_geometry) {
     const source_attributes = buffer_geometry.attributes;
     for (const attributesKey in source_attributes) {
         const source_attribute = source_attributes[attributesKey];
-        const spec = new MicronGeometryBufferAttributeSpec();
+        const spec = new AttributeSpec();
 
         format_attribute(spec, source_attribute, attributesKey);
 
@@ -92,7 +92,7 @@ function attributes_from_buffer_geometry(buffer_geometry) {
     }
 
     // to ensure that input order of attributes does not matter, we sort the attributes by name
-    result.sort(MicronGeometryBufferAttributeSpec.byName);
+    result.sort(AttributeSpec.byName);
 
     return result;
 }

package/engine/graphics/micron/build/fill_patch_geometry_data.js

@@ -110,7 +110,7 @@ const DataConverterType = {
 
 /**
  * How to convert data from source three.js buffer attribute to what we store in the patch description based on the supplied micron spec
- * @param {MicronGeometryBufferAttributeSpec} spec
+ * @param {AttributeSpec} spec
  * @param {THREE.BufferAttribute} source
  * @returns {DataConverterType}
  */

package/engine/graphics/micron/buildPatchwork.js

@@ -2,7 +2,7 @@ import { FrontSide, Group, Mesh, MeshBasicMaterial, MeshStandardMaterial } from
 import { patchToBufferGeometry } from "./util/patchToBufferGeometry.js";
 import { Color } from "../../../core/color/Color.js";
 import { seededRandom } from "../../../core/math/random/seededRandom.js";
-import { randomFloatBetween } from "../../../core/math/MathUtils.js";
+import { randomFloatBetween } from "../../../core/math/random/randomFloatBetween.js";
 
 /**
  *

package/engine/graphics/micron/format/MicronGeometry.js

@@ -1,4 +1,4 @@
-import { MicronVertexDataSpec } from "./MicronVertexDataSpec.js";
+import { VertexDataSpec } from "../../geometry/VertexDataSpec.js";
 import { assert } from "../../../../core/assert.js";
 
 let id_counter = 0;
@@ -30,9 +30,9 @@ export class MicronGeometry {
 
         /**
          *
-         * @type {MicronVertexDataSpec|null}
+         * @type {VertexDataSpec|null}
          */
-        this.vertex_spec = new MicronVertexDataSpec();
+        this.vertex_spec = new VertexDataSpec();
 
         /**
          *

package/engine/graphics/micron/format/serialization/MicronGeometryBinarySerializationAdapter.js

@@ -1,6 +1,6 @@
 import { BinaryClassSerializationAdapter } from "../../../../ecs/storage/binary/BinaryClassSerializationAdapter.js";
 import { MicronGeometry } from "../MicronGeometry.js";
-import { MicronGeometryBufferAttributeSpec } from "../MicronGeometryBufferAttributeSpec.js";
+import { AttributeSpec } from "../../../geometry/AttributeSpec.js";
 import { MicronGeometryPatch } from "../MicronGeometryPatch.js";
 import { serialize_patch } from "./serialize_patch.js";
 import { deserialize_patch } from "./deserialize_patch.js";
@@ -63,7 +63,7 @@ export class MicronGeometryBinarySerializationAdapter extends BinaryClassSeriali
         const attribute_count = buffer.readUintVar();
         const attributes = [];
         for (let i = 0; i < attribute_count; i++) {
-            const spec = new MicronGeometryBufferAttributeSpec();
+            const spec = new AttributeSpec();
 
             deserialize_attribute_spec(buffer, spec);
             attributes[i] = spec;

package/engine/graphics/micron/format/serialization/deserialize_attribute_spec.js

@@ -3,7 +3,7 @@ import { computeDataTypeByIndex } from "../../../../../core/collection/table/com
 /**
  *
  * @param {BinaryBuffer} buffer
- * @param {MicronGeometryBufferAttributeSpec} spec
+ * @param {AttributeSpec} spec
  */
 export function deserialize_attribute_spec(buffer, spec) {
 

package/engine/graphics/micron/format/serialization/serialize_attribute_spec.js

@@ -3,7 +3,7 @@ import { DataTypeIndices } from "../../../../../core/collection/table/DataTypeIn
 /**
  *
  * @param {BinaryBuffer} buffer
- * @param {MicronGeometryBufferAttributeSpec} spec
+ * @param {AttributeSpec} spec
  */
 export function serialize_attribute_spec(buffer, spec) {
     buffer.writeUTF8String(spec.name);

package/engine/graphics/micron/render/PatchCacheKey.js

@@ -1,7 +1,7 @@
 import { mortonEncode_magicbits } from "../../../../core/geom/3d/morton/mortonEncode_magicbits.js";
-import { computeHashFloat } from "../../../../core/math/MathUtils.js";
 import { isArrayEqualStrict } from "../../../../core/collection/array/isArrayEqualStrict.js";
 import { SimpleObjectPoolFactory } from "../../../../core/model/object/SimpleObjectPoolFactory.js";
+import { computeHashFloat } from "../../../../core/math/hash/computeHashFloat.js";
 
 export class PatchCacheKey {
     constructor() {

package/engine/graphics/micron/render/instanced/AttributeDataTexture.js

@@ -53,18 +53,18 @@ function normalized_internal_format(dt, channel_count) {
 export class AttributeDataTexture {
     /**
      *
-     * @param {MicronGeometryBufferAttributeSpec} spec
+     * @param {AttributeSpec} spec
      * @param {number} column_count
      */
     constructor(spec, column_count) {
         assert.defined(spec, 'spec');
-        assert.equal(spec.isMicronGeometryBufferAttributeSpec, true, 'spec.isMicronGeometryBufferAttributeSpec !== true');
+        assert.equal(spec.isAttributeSpec, true, 'spec.isAttributeSpec !== true');
 
         assert.isNonNegativeInteger(column_count, 'column_count');
 
         /**
          *
-         * @type {MicronGeometryBufferAttributeSpec}
+         * @type {AttributeSpec}
          * @private
          */
         this.__spec = spec;
@@ -90,7 +90,7 @@ export class AttributeDataTexture {
 
     /**
      *
-     * @return {MicronGeometryBufferAttributeSpec}
+     * @return {AttributeSpec}
      */
     get spec() {
         return this.__spec;
@@ -237,8 +237,8 @@ export class AttributeDataTexture {
     /**
      *
      * @param {number} slot
-     * @param {number[]} indices
-     * @param {number[]} source
+     * @param {number[]} indices triangle indices (index buffer)
+     * @param {number[]} source vertex data
      */
     write_slot_from_indexed(slot, indices, source) {
         assert.isNonNegativeInteger(slot, 'index');
@@ -289,8 +289,10 @@ export class AttributeDataTexture {
         const start_index = slot_size * index;
         const end_index = slot_size * (index + 1);
 
-        this.__texture.image.data.fill(0, start_index, end_index);
-        this.__texture.needsUpdate = true;
+        const texture = this.__texture;
+
+        texture.image.data.fill(0, start_index, end_index);
+        texture.needsUpdate = true;
     }
 
     /**
@@ -320,7 +322,7 @@ export class AttributeDataTexture {
     /**
      *
      * @return {AttributeDataTexture}
-     * @param {MicronGeometryBufferAttributeSpec} spec
+     * @param {AttributeSpec} spec
      * @param {number} column_count
      */
     static from(spec, column_count) {

package/engine/graphics/micron/render/instanced/ThreeInstancedAdapter.js

@@ -11,7 +11,6 @@ import Signal from "../../../../../core/events/signal/Signal.js";
 import { ATTRIBUTE_NAME_ADDRESS, ATTRIBUTE_NAME_TRANSFORM } from "./shader/constants.js";
 import { shader_rewrite_standard } from "./shader/shader_rewrite_standard.js";
 
-
 export class ThreeInstancedAdapter {
     /**
      *
@@ -79,7 +78,6 @@ export class ThreeInstancedAdapter {
         const position_buffer = new BufferAttribute(new Uint8Array(MICRON_PATCH_SIZE_MAX * 3 * 3), 3, false);
 
 
-
         position_buffer.setUsage(StaticReadUsage);
 
         geo.setAttribute('position', position_buffer);

package/engine/graphics/micron/render/v1/ThreeVirtualGeometryAdapter.js

@@ -4,7 +4,7 @@ import { DataType2TypedArrayConstructorMapping } from "../../../../../core/colle
 import { getTransformedPositionsCached } from "./getTransformedPositionsCached.js";
 import { Color } from "../../../../../core/color/Color.js";
 import { seededRandom } from "../../../../../core/math/random/seededRandom.js";
-import { randomFloatBetween } from "../../../../../core/math/MathUtils.js";
+import { randomFloatBetween } from "../../../../../core/math/random/randomFloatBetween.js";
 
 
 const scratch_random = seededRandom(0);

package/engine/graphics/particles/ParticleEmitterLibrary.js

@@ -2,6 +2,9 @@ import { ParticleEmitter } from "./particular/engine/emitter/ParticleEmitter.js"
 import { GameAssetType } from "../../asset/GameAssetType.js";
 import { assert } from "../../../core/assert.js";
 
+/**
+ * @deprecated Use "Effect" API to achieve the same results
+ */
 export class ParticleEmitterLibrary {
     /**
      *

package/engine/graphics/particles/ecs/{ParticleEmitterSystem2.js → ParticleEmitterSystem.js}

@@ -8,6 +8,7 @@ import { ParticleEmitterLibrary } from "../ParticleEmitterLibrary.js";
 import { GameAssetType } from "../../../asset/GameAssetType.js";
 import { ImageRGBADataLoader } from "../../../asset/loaders/image/ImageRGBADataLoader.js";
 import { StandardFrameBuffers } from "../../StandardFrameBuffers.js";
+import { assert } from "../../../../core/assert.js";
 
 /**
  *
@@ -28,36 +29,38 @@ function putEmitterToSleep(emitter) {
     emitter.setFlag(ParticleEmitterFlag.Sleeping);
 }
 
-export class ParticleEmitterSystem2 extends System {
+export class ParticleEmitterSystem extends System {
     /**
      *
      * @extends {System.<ParticleEmitter>}
      * @constructor
-     * @param {AssetManager} assetManager
-     * @param {GraphicsEngine} graphicsEngine
+     * @param {Engine} engine
      */
-    constructor(assetManager, graphicsEngine) {
+    constructor(engine) {
         super();
 
+        assert.defined(engine, 'engine');
+        assert.equal(engine.isEngine, true, 'engine.isEngine !== true');
+
         this.dependencies = [ParticleEmitter, Transform];
 
         /**
          *
          * @type {GraphicsEngine}
          */
-        this.graphicsEngine = graphicsEngine;
+        this.graphicsEngine = engine.graphics;
 
         /**
          *
          * @type {AssetManager}
          */
-        this.assetManager = assetManager;
+        this.assetManager = engine.assetManager;
 
         /**
          *
          * @type {ParticularEngine}
          */
-        this.particleEngine = new ParticularEngine(assetManager);
+        this.particleEngine = new ParticularEngine(engine.assetManager, engine.graphics.getMaterialManager());
 
         /**
          *
@@ -72,14 +75,19 @@ export class ParticleEmitterSystem2 extends System {
         this.bvh = null;
 
         /**
-         *
+         * @deprecated Use "Effect" API to achieve the same results
          * @type {ParticleEmitterLibrary}
          */
-        this.library = new ParticleEmitterLibrary(assetManager);
+        this.__library = new ParticleEmitterLibrary(engine.assetManager);
 
         this.__handlers = [];
     }
 
+    get library() {
+        console.warn('Deprecated, use "Effect" API to achieve the same results');
+        return this.__library;
+    }
+
     get componentClass() {
         return ParticleEmitter;
     }

package/engine/graphics/particles/particular/engine/ParticularEngine.js

@@ -8,8 +8,14 @@ import { SimulationStepApplyForce } from "./simulator/SimulationStepApplyForce.j
 import { SimulationStepCurlNoiseVelocity } from "./simulator/SimulationStepCurlNoiseVelocity.js";
 
 
-function ParticularEngine(assetManager) {
-    this.shaderManager = new ShaderManager(assetManager);
+/**
+ *
+ * @param {AssetManager} assetManager
+ * @param {MaterialManager} material_manager
+ * @constructor
+ */
+function ParticularEngine(assetManager, material_manager) {
+    this.shaderManager = new ShaderManager(assetManager, material_manager);
 
     /**
      *

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
+}));