@woosh/meep-engine 2.33.21 → 2.33.25

package/engine/graphics/geometry/AttributeSpec.js

@@ -0,0 +1,105 @@
+import { DataType } from "../../../core/collection/table/DataType.js";
+import { computeStringHash } from "../../../core/primitives/strings/computeStringHash.js";
+import { DataTypeByteSizes } from "../../../core/collection/table/DataTypeByteSizes.js";
+import { assert } from "../../../core/assert.js";
+
+export class AttributeSpec {
+    constructor() {
+        /**
+         *
+         * @type {string}
+         */
+        this.name = "";
+
+        /**
+         *
+         * @type {DataType}
+         */
+        this.type = DataType.Float32;
+
+        /**
+         *
+         * @type {number}
+         */
+        this.itemSize = 1;
+
+        /**
+         * Normalized values will be automatically converted to float32 in the shader
+         * This gives good optimization opportunities for things like normal vectors
+         * Applies to integer types only
+         * @type {boolean}
+         */
+        this.normalized = false;
+    }
+
+    static fromJSON(j) {
+        const r = new AttributeSpec();
+
+        r.fromJSON(j);
+
+        return r;
+    }
+
+    fromJSON({
+                 name,
+                 type,
+                 itemSize,
+                 normalized = false
+             }) {
+
+        assert.isString(name, 'name');
+        assert.enum(type, DataType, 'type');
+
+        assert.isNumber(itemSize, 'itemSize');
+        assert.isNonNegativeInteger(itemSize, 'itemSize');
+        assert.greaterThanOrEqual(itemSize, 1, 'itemSize must be >= 1');
+
+        assert.isBoolean(normalized, 'normalized');
+
+        this.name = name;
+        this.type = type;
+        this.itemSize = itemSize;
+        this.normalized = normalized;
+    }
+
+    hash() {
+        return computeStringHash(this.name);
+    }
+
+    /**
+     *
+     * @param {AttributeSpec} other
+     * @returns {boolean}
+     */
+    equals(other) {
+        return this.type === other.type
+            && this.itemSize === other.itemSize
+            && this.normalized === other.normalized
+            && this.name === other.name
+            ;
+    }
+
+    /**
+     *
+     * @returns {number}
+     */
+    getByteSize() {
+        return this.itemSize * DataTypeByteSizes[this.type];
+    }
+
+    /**
+     *
+     * @param {AttributeSpec} a
+     * @param {AttributeSpec} b
+     * @return {number}
+     */
+    static byName(a, b) {
+        return a.name.localeCompare(b.name);
+    }
+}
+
+/**
+ * @readonly
+ * @type {boolean}
+ */
+AttributeSpec.prototype.isAttributeSpec = true;

package/engine/graphics/{micron/format/MicronVertexDataSpec.js → geometry/VertexDataSpec.js}

@@ -1,14 +1,14 @@
-import { isArrayEqual } from "../../../../core/collection/ArrayUtils.js";
-import { computeHashArray } from "../../../../core/math/MathUtils.js";
-import { invokeObjectHash } from "../../../../core/model/object/invokeObjectHash.js";
+import { isArrayEqual } from "../../../core/collection/ArrayUtils.js";
+import { invokeObjectHash } from "../../../core/model/object/invokeObjectHash.js";
+import { computeHashArray } from "../../../core/collection/array/computeHashArray.js";
 
 const DEFAULT_HASH = 123456;
 
-export class MicronVertexDataSpec {
+export class VertexDataSpec {
     constructor() {
         /**
          *
-         * @type {MicronGeometryBufferAttributeSpec[]}
+         * @type {AttributeSpec[]}
          */
         this.attributes = [];
 
@@ -22,7 +22,49 @@ export class MicronVertexDataSpec {
 
     /**
      *
-     * @param {MicronGeometryBufferAttributeSpec[]} attributes
+     * @param {string} name
+     * @return {AttributeSpec|undefined}
+     */
+    getAttributeByName(name) {
+
+        const attributes = this.attributes;
+        const n = attributes.length;
+
+        for (let i = 0; i < n; i++) {
+            const attribute = attributes[i];
+
+            if (attribute.name === name) {
+                return attribute;
+            }
+        }
+
+        return undefined;
+    }
+
+    /**
+     *
+     * @param {AttributeSpec} attribute
+     * @return {VertexDataSpec}
+     */
+    add(attribute) {
+
+        //check uniqueness of name
+        if (this.getAttributeByName(attribute.name) !== undefined) {
+            throw new Error(`Attribute named '${attribute.name}' already exists`);
+        }
+
+        this.attributes.push(attribute);
+
+        // reset hash
+        this.__hash = DEFAULT_HASH;
+
+        //for chaining, return self
+        return this;
+    }
+
+    /**
+     *
+     * @param {AttributeSpec[]} attributes
      */
     setAttributes(attributes) {
         this.attributes = attributes;
@@ -33,7 +75,7 @@ export class MicronVertexDataSpec {
 
     /**
      *
-     * @param {MicronVertexDataSpec} other
+     * @param {VertexDataSpec} other
      * @returns {boolean}
      */
     equals(other) {
@@ -56,24 +98,6 @@ export class MicronVertexDataSpec {
         return this.__hash;
     }
 
-    /**
-     *
-     * @param {string} name
-     * @return {MicronGeometryBufferAttributeSpec|undefined}
-     */
-    getAttributeByName(name) {
-        const attributes = this.attributes;
-        const n = attributes.length;
-        for (let i = 0; i < n; i++) {
-            const spec = attributes[i];
-
-            if (spec.name === name) {
-                return spec;
-            }
-        }
-
-    }
-
     /**
      *
      * @returns {number}
@@ -93,3 +117,10 @@ export class MicronVertexDataSpec {
         return result;
     }
 }
+
+
+/**
+ * @readonly
+ * @type {boolean}
+ */
+VertexDataSpec.prototype.isVertexDataSpec = true;

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;
@@ -320,7 +320,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/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);
 
     /**
      *
@@ -63,10 +69,12 @@ ParticularEngine.prototype.add = function (emitter) {
  * @param {ParticleEmitter} emitter
  */
 ParticularEngine.prototype.remove = function (emitter) {
-    const i = this.emitters.indexOf(emitter);
+    const emitters = this.emitters;
+
+    const i = emitters.indexOf(emitter);
 
     if (i !== -1) {
-        this.emitters.remove(i);
+        emitters.remove(i);
     }
 
     this.shaderManager.deregister(emitter);

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

@@ -0,0 +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
+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
+}));
+
+// 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(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
+}));