@woosh/meep-engine 2.42.3 → 2.42.5

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

@@ -8,6 +8,12 @@ export class ManagedMaterial {
      * @param {Material} m
      */
     constructor(m) {
+        /**
+         *
+         * @type {Material|null}
+         * @private
+         */
+        this.__source = null;
 
         /**
          *
@@ -30,6 +36,10 @@ export class ManagedMaterial {
         this.onLastReleased = new Signal();
     }
 
+    getSource() {
+        return this.__source;
+    }
+
     /**
      *
      * @returns {Material}

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

@@ -8,7 +8,7 @@ export class MaterialManager {
     constructor() {
 
         /**
-         *
+         * Stores links from uncompiled (source) materials to managed containers
          * @type {HashMap<Material, ManagedMaterial>}
          * @private
          */
@@ -29,6 +29,17 @@ export class MaterialManager {
             maxWeight: 100
         });
 
+        /**
+         * Stores links from compiled materials back to the container
+         * @type {HashMap<Material, ManagedMaterial>}
+         * @private
+         */
+        this.__reverse_library = new HashMap({
+            keyHashFunction: computeMaterialHash,
+            keyEqualityFunction: computeMaterialEquality,
+            capacity: 1024
+        });
+
         this.__cache.onEvicted.add(this.__dispose_material, this);
 
         /**
@@ -55,13 +66,15 @@ export class MaterialManager {
      * @private
      */
     __handle_last_reference_removed(material) {
-        const key = material.getMaterial();
+        const compiled_material = material.getMaterial();
 
         // remove from library
-        this.__library.delete(key)
+        const source = material.getSource();
+        this.__library.delete(source);
+        this.__reverse_library.delete(compiled_material);
 
         // put material into cache
-        this.__cache.put(key, material);
+        this.__cache.put(source, material);
     }
 
     /**
@@ -118,7 +131,16 @@ export class MaterialManager {
      * @returns {Reference<Material>}
      */
     obtain(source) {
-        let material = this.__library.get(source);
+        // reverse check to see if this is actually an already compiled/managed material
+        let material = this.__reverse_library.get(source);
+
+        if (material !== undefined) {
+            // already compiled material
+            return material.getRef();
+        }
+
+        // forward check
+        material = this.__library.get(source);
 
         if (material === undefined) {
             // not found in library, check cache
@@ -138,6 +160,7 @@ export class MaterialManager {
             material.onLastReleased.addOne(this.__handle_last_reference_removed, this);
 
             this.__library.set(source, material);
+            this.__reverse_library.set(material.getMaterial(), material);
         }
 
         return material.getRef();

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