@needle-tools/engine 4.13.0-next.2d429c0 → 4.13.0-next.db5e54e

package/src/engine-components/ReflectionProbe.ts

@@ -137,7 +137,7 @@ export class ReflectionProbe extends Behaviour {
     // and some need reflection probe and some don't
     // we need to make sure we don't override the material but use a copy
 
-    private static _rendererMaterialsCache: Map<IRenderer, Array<{ material: Material, copy: Material }>> = new Map();
+    private static _rendererMaterialsCache: Map<IRenderer, Array<{ material: Material, copy: Material, originalVersion: number }>> = new Map();
 
     onSet(_rend: IRenderer) {
         if (disable) return;
@@ -171,15 +171,16 @@ export class ReflectionProbe extends Behaviour {
             let cached = rendererCache[i];
 
             // make sure we have the currently assigned material cached (and an up to date clone of that)
-            // TODO: this is causing problems with progressive textures sometimes (depending on the order) when the version changes and we re-create materials over and over. We might want to just set the material envmap instead of making a clone
+            // Compare against the stored original version, not the clone's version (which gets modified by needsUpdate)
+            // This prevents cloning materials every frame when onUnset restores the original material
             const isCachedInstance = material === cached?.copy;
-            const hasChanged = !cached || cached.material.uuid !== material.uuid || cached.copy.version !== material.version;
+            const hasChanged = !cached || cached.material.uuid !== material.uuid || cached.originalVersion !== material.version;
             if (!isCachedInstance && hasChanged) {
                 if (debug) {
                     let reason = "";
                     if (!cached) reason = "not cached";
                     else if (cached.material !== material) reason = "reference changed; cached instance?: " + isCachedInstance;
-                    else if (cached.copy.version !== material.version) reason = "version changed";
+                    else if (cached.originalVersion !== material.version) reason = "version changed";
                     console.warn("Cloning material", material.name, material.version, "Reason:", reason, "\n", material.uuid, "\n", cached?.copy.uuid, "\n", _rend.name);
                 }
 
@@ -189,11 +190,13 @@ export class ReflectionProbe extends Behaviour {
                 if (cached) {
                     cached.copy = clone;
                     cached.material = material;
+                    cached.originalVersion = material.version;
                 }
                 else {
                     cached = {
                         material: material,
-                        copy: clone
+                        copy: clone,
+                        originalVersion: material.version
                     };
                     rendererCache.push(cached);
                 }
@@ -213,9 +216,10 @@ export class ReflectionProbe extends Behaviour {
             const copy = cached?.copy;
 
             if ("envMap" in copy) {
-                // make sure the reflection probe is assigned
-                copy.envMap = this.texture;
-                copy.needsUpdate = true;
+                if (copy.envMap !== this.texture) {  // Only update if changed
+                    copy.envMap = this.texture;
+                    copy.needsUpdate = true;
+                }       
             }
 
             _rend.sharedMaterials[i] = copy;