Cache Source instead of Texture instances in material system

aframevr · Feb 10, 2024 · 6744582 · 6744582
1 parent 18b25a0
commit 6744582
Show file tree

Hide file tree

Showing 8 changed files with 266 additions and 336 deletions.
diff --git a/src/components/material.js b/src/components/material.js
@@ -250,4 +250,13 @@ function parseBlending (blending) {
 function disposeMaterial (material, system) {
   material.dispose();
   system.unregisterMaterial(material);
+
+  // Dispose textures on this material
+  Object.keys(material)
+    .filter(function (propName) {
+      return material[propName] && material[propName].isTexture;
+    })
+    .forEach(function (mapName) {
+      material[mapName].dispose();
+    });
 }
diff --git a/src/core/shader.js b/src/core/shader.js
@@ -135,9 +135,6 @@ Shader.prototype = {
         color = new THREE.Color(value);
         return new THREE.Vector3(color.r, color.g, color.b);
       }
-      case 'map': {
-        return THREE.ImageUtils.loadTexture(value);
-      }
       default: {
         return value;
       }