@woosh/meep-engine 2.42.4 → 2.42.6

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

@@ -69,7 +69,7 @@ export class MaterialContext {
 
         const rewrite_material = this.adapter.rewriteMaterial.bind(this.adapter);
 
-        if (material[MATERIAL_FLAG] === undefined) {
+        if (this.material[MATERIAL_FLAG] === undefined) {
             material.onBeforeCompile = composeCompile(this.material.onBeforeCompile, rewrite_material);
             material.needsUpdate = true;
 

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

@@ -3,6 +3,7 @@ import { EnginePlugin } from "../../../../plugin/EnginePlugin.js";
 import { MaterialTransformer } from "./MaterialTransformer.js";
 import { Vector2 as ThreeVector2 } from "three";
 
+
 export class ForwardPlusRenderingPlugin extends EnginePlugin {
     constructor() {
         super();
@@ -16,6 +17,13 @@ export class ForwardPlusRenderingPlugin extends EnginePlugin {
             light_manager: this.__light_manager,
             resolution: this.__resolution
         });
+
+        /**
+         * Track lifecycle state
+         * @type {boolean}
+         * @private
+         */
+        this.__state_is_running = false;
     }
 
     /**
@@ -36,6 +44,12 @@ 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);
@@ -52,14 +66,23 @@ export class ForwardPlusRenderingPlugin extends EnginePlugin {
 
         this.updateResolution();
 
-
         await super.startup();
     }
 
     async shutdown() {
+        if (!this.__state_is_running) {
+            throw new Error("Not running");
+        }
+
+        this.__state_is_running = false;
+
         const graphics = this.engine.graphics;
 
-        graphics.getMaterialManager().removeCompileStep(this.__material_transformer);
+        const is_material_removed = graphics.getMaterialManager().removeCompileStep(this.__material_transformer);
+
+        if (!is_material_removed) {
+            console.warn('Failed to remove material transformer');
+        }
 
         graphics.viewport.size.onChanged.remove(this.updateResolution, this);
         graphics.pixelRatio.onChanged.remove(this.updateResolution, this);

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

@@ -6,6 +6,12 @@ import { fp_build_fragment_shader } from "../materials/fp_build_fragment_shader.
 import { fp_build_vertex_shader } from "../materials/fp_build_vertex_shader.js";
 import { fp_build_vertex_lighting_shared } from "../materials/fp_build_vertex_lighting_shared.js";
 
+/**
+ * @readonly
+ * @type {string}
+ */
+const PROPERTY_TRANSFORMER_MARKER = '@forward-plus-material-transformer';
+
 export class MaterialTransformer extends AbstractMaterialTransformer {
 
     /**
@@ -88,6 +94,17 @@ export class MaterialTransformer extends AbstractMaterialTransformer {
     }
 
     transform(source) {
+        if (source.hasOwnProperty(PROPERTY_TRANSFORMER_MARKER)) {
+            // already transformed
+
+            if (source[PROPERTY_TRANSFORMER_MARKER] !== this) {
+                throw new Error('The material is already transformed, but is associated with a different transformer instance');
+            } else {
+                return source;
+            }
+
+        }
+
         let result = source;
 
         if (isLitMaterial(source)) {
@@ -96,12 +113,16 @@ export class MaterialTransformer extends AbstractMaterialTransformer {
             // inherit uniforms directly
 
             if (source.isShaderMaterial) {
-                result.uniforms = source.uniforms;
-                result.defines = source.defines;
+                // TODO use Proxy
+                result.uniforms = Object.assign({}, source.uniforms);
+                result.defines = Object.assign({}, source.defines);
             }
 
             result.onBeforeCompile = composeCompile(source.onBeforeCompile, this.__on_before_compile);
 
+
+            result[PROPERTY_TRANSFORMER_MARKER] = this;
+
         }
 
         return result;

package/engine/plugin/EnginePluginManager.js

@@ -4,6 +4,7 @@ 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() {
@@ -246,6 +247,11 @@ export class EnginePluginManager extends BaseProcess {
 
         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);
 

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