@woosh/meep-engine 2.33.49 → 2.33.53

package/core/model/object/read_property.js

@@ -16,7 +16,7 @@ export function read_property(root, parts, part_offset, part_count) {
 
         const part = parts[i + part_offset];
 
-        if (thing.hasOwnProperty(part)) {
+        if (typeof thing[part] !== 'undefined') {
             thing = thing[part];
         } else {
             const getter_name = `get${capitalize(part)}`;

package/core/model/object/write_property.js

@@ -17,7 +17,7 @@ export function write_property(root, parts, part_offset, part_count, value) {
 
         const part = parts[i + part_offset];
 
-        if (thing.hasOwnProperty(part)) {
+        if (typeof thing[part] !== 'undefined') {
             thing = thing[part];
         } else {
 
@@ -42,11 +42,9 @@ export function write_property(root, parts, part_offset, part_count, value) {
     if (typeof setter === "function") {
         // resolve via setter
         setter.call(thing, value);
-    } else if (thing.hasOwnProperty(last_part)) {
-        thing[last_part] = value;
     } else {
-        // no setter
-        throw new Error(`No no property or getter found for '${last_part}' on [${part_count - 1}]'${parts.slice(part_offset, part_offset + part_count).join('/')}'`);
+        // write directly to the field
+        thing[last_part] = value;
     }
 }
 

package/engine/animation/AnimationUtils.js

@@ -7,10 +7,8 @@ import { removeComponentsExcept } from "../ecs/util/removeComponentsExcept.js";
 import { createSound, createTimer } from "../EntityCreator.js";
 import Mesh from "../graphics/ecs/mesh/Mesh.js";
 import Trail2D, { Trail2DFlags } from "../graphics/ecs/trail2d/Trail2D.js";
-import { ParticleEmitterSystem } from "../graphics/particles/ecs/ParticleEmitterSystem.js";
 import { ParticleEmitter } from "../graphics/particles/particular/engine/emitter/ParticleEmitter.js";
 import { ParticleEmitterFlag } from "../graphics/particles/particular/engine/emitter/ParticleEmitterFlag.js";
-import { distributeParticlesOnObject3D } from "../graphics/particles/particular/engine/utils/distributeParticlesOnObject3D.js";
 import { SequenceBehavior } from "../intelligence/behavior/composite/SequenceBehavior.js";
 import { BehaviorComponent } from "../intelligence/behavior/ecs/BehaviorComponent.js";
 import { ActionBehavior } from "../intelligence/behavior/primitive/ActionBehavior.js";
@@ -118,124 +116,6 @@ export function stopEmitterAndNotifyOnceFinished(entity, ecd) {
 }
 
 
-/**
- *
- * @param {EntityManager} entityManager
- * @param {EntityComponentDataset} ecd
- * @param {number} entity
- * @param {string} particles
- * @returns {Promise<any>}
- */
-export function removeEntityWithMeshParticlesEffect(
-    {
-        entityManager,
-        ecd,
-        entity,
-        particles = 'mesh-cloud-puff-0'
-    }
-) {
-
-    /**
-     *
-     * @type {ParticleEmitterSystem}
-     */
-    const sPE = entityManager.getSystem(ParticleEmitterSystem);
-
-    /**
-     *
-     * @type {ParticleEmitterLibrary}
-     */
-    const emitterLibrary = sPE.library;
-
-    const emitter = emitterLibrary.create(particles);
-
-    //get entity mesh
-
-    const cMesh = ecd.getComponent(entity, Mesh);
-
-    if (cMesh !== undefined) {
-        if (cMesh.mesh !== null) {
-            const randomSeed = Math.random() * 1000000;
-
-            distributeParticlesOnObject3D(emitter, randomSeed, cMesh.mesh);
-        }
-    }
-
-    //prevent further interactions
-    removeComponentsExcept(ecd, entity, [Mesh, ParticleEmitter, Trail2D, Transform]);
-
-    /**
-     *
-     * @type {Transform}
-     */
-    const originalTransform = ecd.getComponent(entity, Transform);
-
-    if (originalTransform === undefined) {
-        throw new Error(`entity ${entity} doesn't have Transform`);
-    }
-
-    //create particle emitter
-    const effectBuilder = new EntityBuilder();
-    const effectEntity = effectBuilder
-        .add(emitter)
-        .add(originalTransform.clone())
-        .build(ecd);
-
-    Promise.all([
-        stopEntityAndNotifyWhenStopped(effectEntity, ecd)
-    ])
-        .then(() => effectBuilder.destroy());
-
-    return stopEntityAndNotifyWhenStopped(entity, ecd)
-        .then(() => {
-            ecd.removeEntity(entity);
-        });
-
-}
-
-/**
- *
- * @param {Engine} engine
- * @param {EntityComponentDataset} ecd
- * @param {number} entity
- * @param {string} [particles]
- * @param {string} [sound]
- * @returns {Promise<any>}
- */
-export function removeEntityGenericEffect(
-    {
-        engine,
-        ecd,
-        entity,
-        particles = 'cloud-puff',
-        sound = "data/sounds/effects/Magic_Game_Essentials/Magic_Vanish_3.wav"
-    }
-) {
-
-    /**
-     *
-     * @type {ParticleEmitterSystem}
-     */
-    const sPE = engine.entityManager.getSystem(ParticleEmitterSystem);
-
-    /**
-     *
-     * @type {ParticleEmitterLibrary}
-     */
-    const emitterLibrary = sPE.library;
-
-    const emitter = emitterLibrary.create(particles);
-
-    const result = removeEntityWithEffect({
-        entity,
-        ecd,
-        emitter,
-        soundEffect: sound
-    });
-
-    return result;
-}
-
 /**
  *
  * @param {number} entity

package/engine/animation/removeEntityGenericEffect.js

@@ -0,0 +1,168 @@
+import { removeEntityWithEffect } from "./AnimationUtils.js";
+import { ParticleEmitter } from "../graphics/particles/particular/engine/emitter/ParticleEmitter.js";
+
+const lib = {
+    'cloud-puff': {
+        "position": {
+            "x": 56.41791044776119,
+            "y": -8.887834661270745,
+            "z": 223.65671641791042
+        },
+        "scale": {
+            "x": 1,
+            "y": 1,
+            "z": 1
+        },
+        "rotation": {
+            "x": 0,
+            "y": 0,
+            "z": 0,
+            "w": 1
+        },
+        "parameters": [
+            {
+                "name": "scale",
+                "itemSize": 1,
+                "defaultTrackValue": {
+                    "itemSize": 1,
+                    "data": [
+                        1
+                    ],
+                    "positions": [
+                        0
+                    ]
+                }
+            },
+            {
+                "name": "color",
+                "itemSize": 4,
+                "defaultTrackValue": {
+                    "itemSize": 4,
+                    "data": [
+                        1,
+                        1,
+                        1,
+                        1
+                    ],
+                    "positions": [
+                        0
+                    ]
+                }
+            }
+        ],
+        "blendingMode": 0,
+        "layers": [
+            {
+                "imageURL": "data/textures/particle/smokeparticle.png",
+                "particleLife": {
+                    "min": 1.2,
+                    "max": 1.5
+                },
+                "particleSize": {
+                    "min": 1,
+                    "max": 1.2
+                },
+                "particleRotation": {
+                    "min": 0,
+                    "max": 0
+                },
+                "particleRotationSpeed": {
+                    "min": 0,
+                    "max": 0
+                },
+                "emissionShape": 1,
+                "emissionFrom": 1,
+                "emissionRate": 0,
+                "emissionImmediate": 25,
+                "parameterTracks": [
+                    {
+                        "name": "color",
+                        "track": {
+                            "itemSize": 4,
+                            "data": [
+                                0.9803921568627451,
+                                0.9803921568627451,
+                                0.9803921568627451,
+                                0.3,
+
+                                0.9882352941176471,
+                                0.9882352941176471,
+                                0.9882352941176471,
+                                0.9880952380952381,
+
+                                0.9882352941176471,
+                                0.9882352941176471,
+                                0.9882352941176471,
+                                0.5,
+
+                                0.9882352941176471,
+                                0.9882352941176471,
+                                0.9882352941176471,
+                                0
+                            ],
+                            "positions": [
+                                0,
+                                0.07,
+                                0.8097826086956522,
+                                1
+                            ]
+                        }
+                    }
+                ],
+                "position": {
+                    "x": 0,
+                    "y": 0.6,
+                    "z": 0
+                },
+                "scale": {
+                    "x": 0.9,
+                    "y": 0.5,
+                    "z": 0.65
+                },
+                "particleVelocityDirection": {
+                    "direction": {
+                        "x": 0,
+                        "y": 1,
+                        "z": 0
+                    },
+                    "angle": 1.5
+                },
+                "particleSpeed": {
+                    "min": 0.2,
+                    "max": 0.5
+                }
+            }
+        ]
+    }
+};
+
+/**
+ *
+ * @param {Engine} engine
+ * @param {EntityComponentDataset} ecd
+ * @param {number} entity
+ * @param {string} [particles]
+ * @param {string} [sound]
+ * @returns {Promise<any>}
+ */
+export function removeEntityGenericEffect(
+    {
+        engine,
+        ecd,
+        entity,
+        particles = 'cloud-puff',
+        sound = "data/sounds/effects/Magic_Game_Essentials/Magic_Vanish_3.wav"
+    }
+) {
+
+    const emitter = ParticleEmitter.fromJSON(lib[particles]);
+
+    const result = removeEntityWithEffect({
+        entity,
+        ecd,
+        emitter,
+        soundEffect: sound
+    });
+
+    return result;
+}

package/engine/animation/removeEntityWithMeshParticlesEffect.js

@@ -0,0 +1,201 @@
+import Mesh from "../graphics/ecs/mesh/Mesh.js";
+import { distributeParticlesOnObject3D } from "../graphics/particles/particular/engine/utils/distributeParticlesOnObject3D.js";
+import { removeComponentsExcept } from "../ecs/util/removeComponentsExcept.js";
+import { ParticleEmitter } from "../graphics/particles/particular/engine/emitter/ParticleEmitter.js";
+import Trail2D from "../graphics/ecs/trail2d/Trail2D.js";
+import { Transform } from "../ecs/transform/Transform.js";
+import EntityBuilder from "../ecs/EntityBuilder.js";
+import { stopEntityAndNotifyWhenStopped } from "./AnimatedActions.js";
+
+const lib = {
+    'mesh-cloud-puff-0': {
+        "position": {
+            "x": 9.17416,
+            "y": -1.90031,
+            "z": 12.06082
+        },
+        "scale": {
+            "x": 1,
+            "y": 1,
+            "z": 1
+        },
+        "rotation": {
+            "x": 0,
+            "y": 0,
+            "z": 0,
+            "w": 1
+        },
+        "parameters": [
+            {
+                "name": "scale",
+                "itemSize": 1,
+                "defaultTrackValue": {
+                    "itemSize": 1,
+                    "data": [
+                        1
+                    ],
+                    "positions": [
+                        0
+                    ]
+                }
+            },
+            {
+                "name": "color",
+                "itemSize": 4,
+                "defaultTrackValue": {
+                    "itemSize": 4,
+                    "data": [
+                        1,
+                        1,
+                        1,
+                        1
+                    ],
+                    "positions": [
+                        0
+                    ]
+                }
+            }
+        ],
+        "preWarm": false,
+        "readDepth": true,
+        "softDepth": true,
+        "blendingMode": 0,
+        "layers": [
+            {
+                "imageURL": "data/textures/particle/smokeparticle.png",
+                "particleLife": {
+                    "min": 0.6,
+                    "max": 1.2
+                },
+                "particleSize": {
+                    "min": 0.2,
+                    "max": 0.3
+                },
+                "particleRotation": {
+                    "min": 0,
+                    "max": 0
+                },
+                "particleRotationSpeed": {
+                    "min": 0,
+                    "max": 0
+                },
+                "emissionShape": 1,
+                "emissionFrom": 1,
+                "emissionRate": 0,
+                "emissionImmediate": 1200,
+                "parameterTracks": [
+                    {
+                        "name": "color",
+                        "track": {
+                            "itemSize": 4,
+                            "data": [
+                                0.9803921568627451,
+                                0.9803921568627451,
+                                0.9803921568627451,
+                                0.3,
+                                0.9882352941176471,
+                                0.9882352941176471,
+                                0.9882352941176471,
+                                0.265,
+                                0.9882352941176471,
+                                0.9882352941176471,
+                                0.9882352941176471,
+                                0
+                            ],
+                            "positions": [
+                                0,
+                                0.7957639171068672,
+                                1
+                            ]
+                        }
+                    }
+                ],
+                "position": {
+                    "x": 0,
+                    "y": 0.6,
+                    "z": 0
+                },
+                "scale": {
+                    "x": 0.9,
+                    "y": 0.5,
+                    "z": 0.65
+                },
+                "particleVelocityDirection": {
+                    "direction": {
+                        "x": 0,
+                        "y": 1,
+                        "z": 0
+                    },
+                    "angle": 0
+                },
+                "particleSpeed": {
+                    "min": 0.6,
+                    "max": 1.1
+                }
+            }
+        ]
+    }
+};
+
+/**
+ *
+ * @param {EntityManager} entityManager
+ * @param {EntityComponentDataset} ecd
+ * @param {number} entity
+ * @param {string} particles
+ * @returns {Promise<any>}
+ */
+export function removeEntityWithMeshParticlesEffect(
+    {
+        entityManager,
+        ecd,
+        entity,
+        particles = 'mesh-cloud-puff-0'
+    }
+) {
+
+    const emitter = ParticleEmitter.fromJSON(lib[particles]);
+
+    //get entity mesh
+
+    const cMesh = ecd.getComponent(entity, Mesh);
+
+    if (cMesh !== undefined) {
+        if (cMesh.mesh !== null) {
+            const randomSeed = Math.random() * 1000000;
+
+            distributeParticlesOnObject3D(emitter, randomSeed, cMesh.mesh);
+        }
+    }
+
+    //prevent further interactions
+    removeComponentsExcept(ecd, entity, [Mesh, ParticleEmitter, Trail2D, Transform]);
+
+    /**
+     *
+     * @type {Transform}
+     */
+    const originalTransform = ecd.getComponent(entity, Transform);
+
+    if (originalTransform === undefined) {
+        throw new Error(`entity ${entity} doesn't have Transform`);
+    }
+
+    //create particle emitter
+    const effectBuilder = new EntityBuilder();
+    const effectEntity = effectBuilder
+        .add(emitter)
+        .add(originalTransform.clone())
+        .build(ecd);
+
+    Promise.all([
+        stopEntityAndNotifyWhenStopped(effectEntity, ecd)
+    ])
+        .then(() => effectBuilder.destroy());
+
+    return stopEntityAndNotifyWhenStopped(entity, ecd)
+        .then(() => {
+            ecd.removeEntity(entity);
+        });
+
+}

package/engine/ecs/EntityManager.js

@@ -715,7 +715,7 @@ EntityManager.prototype.startup = function (readyCallback, errorCallback) {
     let firstFailure = true;
 
     function systemError(system, error) {
-        console.error("Failed to start system", system);
+        console.error("Failed to start system", system, 'Error:', error);
 
         if (firstFailure) {
             firstFailure = false;

package/engine/graphics/particles/ParticleEmitterLibrary.js

@@ -1,6 +1,7 @@
 import { ParticleEmitter } from "./particular/engine/emitter/ParticleEmitter.js";
 import { GameAssetType } from "../../asset/GameAssetType.js";
 import { assert } from "../../../core/assert.js";
+import { JsonAssetLoader } from "../../asset/loaders/JsonAssetLoader.js";
 
 /**
  * @deprecated Use "Effect" API to achieve the same results
@@ -20,6 +21,26 @@ export class ParticleEmitterLibrary {
         this.data = {};
     }
 
+    /**
+     *
+     * @param {string} path
+     * @returns {Promise<void>}
+     */
+    async load_from_registry_file(path) {
+
+        const am = this.assetManager;
+
+        if (am.getLoaderByType(GameAssetType.JSON) === undefined) {
+            // add missing loader
+            await am.registerLoader(GameAssetType.JSON, new JsonAssetLoader());
+        }
+
+        const asset = await am.promise(path, GameAssetType.JSON)
+        const particleSet = asset.create();
+
+        await this.load(particleSet);
+    }
+
     /**
      * @param {Object} listing
      * @returns {Promise}

package/engine/graphics/particles/ecs/ParticleEmitterSystem.d.ts

@@ -0,0 +1,7 @@
+import {System} from "../../../ecs/System";
+import Engine from "../../../Engine";
+import {ParticleEmitter} from "../particular/engine/emitter/ParticleEmitter";
+
+export class ParticleEmitterSystem extends System<ParticleEmitter> {
+    constructor(engine: Engine)
+}

package/engine/graphics/particles/ecs/ParticleEmitterSystem.js

@@ -4,8 +4,6 @@ import { ParticularEngine } from "../particular/engine/ParticularEngine.js";
 import { Transform } from "../../../ecs/transform/Transform.js";
 import { ParticleEmitterFlag } from "../particular/engine/emitter/ParticleEmitterFlag.js";
 import { RenderPassType } from "../../render/RenderPassType.js";
-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";
@@ -16,18 +14,9 @@ import { assert } from "../../../../core/assert.js";
  * @returns {Group|Object3D}
  */
 function extractRenderable(emitter) {
-
-
     return emitter.mesh;
 }
 
-/**
- *
- * @param {ParticleEmitter} emitter
- */
-function putEmitterToSleep(emitter) {
-    emitter.setFlag(ParticleEmitterFlag.Sleeping);
-}
 
 export class ParticleEmitterSystem extends System {
     /**
@@ -74,20 +63,9 @@ export class ParticleEmitterSystem extends System {
          */
         this.bvh = null;
 
-        /**
-         * @deprecated Use "Effect" API to achieve the same results
-         * @type {ParticleEmitterLibrary}
-         */
-        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;
     }
@@ -209,15 +187,7 @@ export class ParticleEmitterSystem extends System {
 
         graphicsEngine.on.preRender.add(preRenderHook);
 
-        const library = this.library;
-
-        am.promise('data/database/particles/data.json', GameAssetType.JSON)
-            .then(asset => {
-                const particleSet = asset.create();
-
-                return library.load(particleSet);
-            })
-            .then(readyCallback, errorCallback);
+        readyCallback();
     }
 
     shutdown(entityManager, readyCallback, errorCallback) {

package/engine/graphics/particles/particular/engine/emitter/ParticleEmitter.d.ts

@@ -0,0 +1,2 @@
+export class ParticleEmitter {
+}

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

@@ -154,28 +154,13 @@ export class ParticleVolume {
                             "track": {
                                 "itemSize": 4,
                                 "data": [
-                                    0.5764705882352941,
-                                    0.5764705882352941,
-                                    0.5764705882352941,
-                                    0,
-                                    0.803921568627451,
-                                    0.803921568627451,
-                                    0.803921568627451,
-                                    0.28160919540229884,
-                                    0.803921568627451,
-                                    0.803921568627451,
-                                    0.803921568627451,
-                                    0.21264367816091953,
-                                    0.803921568627451,
-                                    0.803921568627451,
-                                    0.803921568627451,
-                                    0
+                                    1,
+                                    1,
+                                    1,
+                                    1,
                                 ],
                                 "positions": [
-                                    0,
-                                    0.18085106382978725,
-                                    0.7074468085106383,
-                                    1
+                                    0
                                 ]
                             }
                         },

package/package.json

@@ -5,7 +5,7 @@
   "productName": "Meep",
   "description": "production-ready JavaScript game engine based on Entity Component System Architecture",
   "author": "Alexander Goldring",
-  "version": "2.33.49",
+  "version": "2.33.53",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",