@woosh/meep-engine 2.42.7 → 2.42.8

package/engine/graphics/render/forward_plus/plugin/ForwardPlusRenderingPlugin.js

@@ -17,13 +17,6 @@ export class ForwardPlusRenderingPlugin extends EnginePlugin {
             light_manager: this.__light_manager,
             resolution: this.__resolution
         });
-
-        /**
-         * Track lifecycle state
-         * @type {boolean}
-         * @private
-         */
-        this.__state_is_running = false;
     }
 
     /**
@@ -44,12 +37,6 @@ export class ForwardPlusRenderingPlugin extends EnginePlugin {
     }
 
     async startup() {
-        if (this.__state_is_running) {
-            throw new Error("Already running");
-        }
-
-        this.__state_is_running = true;
-
         const lm = this.__light_manager;
 
         lm.setTileMapResolution(16, 8, 8);
@@ -70,12 +57,6 @@ export class ForwardPlusRenderingPlugin extends EnginePlugin {
     }
 
     async shutdown() {
-        if (!this.__state_is_running) {
-            throw new Error("Not running");
-        }
-
-        this.__state_is_running = false;
-
         const graphics = this.engine.graphics;
 
         const is_material_removed = graphics.getMaterialManager().removeCompileStep(this.__material_transformer);

package/engine/plugin/EnginePluginManager.js

@@ -4,7 +4,6 @@ import { EnginePlugin } from "./EnginePlugin.js";
 import { PluginReferenceContext } from "./PluginReferenceContext.js";
 import { isSubclassOf } from "./isSubclassOf.js";
 import { assert } from "../../core/assert.js";
-import { IllegalStateException } from "../../core/fsm/exceptions/IllegalStateException.js";
 
 export class EnginePluginManager extends BaseProcess {
     constructor() {
@@ -222,49 +221,51 @@ export class EnginePluginManager extends BaseProcess {
         }
 
         let ctx = this.__plugins.get(PluginClass);
+        let reference;
 
-        if (ctx !== undefined) {
-            return ctx.getReference();
-        }
+        if (ctx === undefined) {
 
-        this.__version++;
+            this.__version++;
 
-        // context not found, create it
+            // context not found, create it
 
-        const instance = new PluginClass();
+            const instance = new PluginClass();
 
-        ctx = new PluginReferenceContext(instance, PluginClass);
+            ctx = new PluginReferenceContext(instance, PluginClass);
 
-        // monitor the context
-        ctx.on.lastReleased.add(this.__handle_last_plugin_reference_release, this);
+            // monitor the context
+            ctx.on.lastReleased.add(this.__handle_last_plugin_reference_release, this);
 
-        // get reference to make sure that the context doesn't come up as having no references
-        const reference = ctx.getReference();
+            // all dependencies acquired, register the plugin
+            this.__plugins.set(PluginClass, ctx);
 
-        // TODO address cyclic dependencies, these can cause a deadlock
-        // acquire dependencies
-        const dependency_refs = await this.acquireMany(instance.dependencies);
+            // get reference to make sure that the context doesn't come up as having no references
+            reference = ctx.getReference();
 
-        ctx.dependency_references.addAll(dependency_refs);
+            // TODO address cyclic dependencies, these can cause a deadlock
+            // acquire dependencies
+            const dependency_refs = await this.acquireMany(instance.dependencies);
+
+            ctx.dependency_references.addAll(dependency_refs);
 
-        // Sanity check
-        if (this.__plugins.has(PluginClass)) {
-            throw new IllegalStateException('Plugin was already instantiated during acquisition');
-        }
 
-        // all dependencies acquired, register the plugin
-        this.__plugins.set(PluginClass, ctx);
+            const manager_state_object = this.getState();
 
-        const manager_state_object = this.getState();
 
+            const manager_state_value = manager_state_object.getValue();
 
-        const manager_state_value = manager_state_object.getValue();
+            // bring the plugin into proper state
 
-        // bring the plugin into proper state
+            const engine = this.engine;
 
-        const engine = this.engine;
+            await ctx.transition(manager_state_value, engine);
+
+        } else {
+            reference = ctx.getReference();
+
+            await ctx.synchronize();
+        }
 
-        await ctx.transition(manager_state_value, engine);
 
         return reference;
 

package/engine/plugin/PluginReferenceContext.js

@@ -141,6 +141,15 @@ export class PluginReferenceContext {
         this.__transition = Promise.resolve();
     }
 
+    /**
+     * Returns promise to the latest transition, useful to synchronization
+     * @example await ctx.synchronize();
+     * @returns {Promise<void>}
+     */
+    synchronize() {
+        return this.__transition;
+    }
+
     /**
      *
      * @param {ProcessState} target_state

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.42.7",
+  "version": "2.42.8",
   "dependencies": {
     "gl-matrix": "3.4.3",
     "fast-levenshtein": "2.0.6",