Update viewer.js

viewer.js

@@ -1,6 +1,23 @@
 // viewer.js
 // ==============================
 
+// --- Patch all window.Image to force crossOrigin="anonymous" ---
+(function() {
+  const OriginalImage = window.Image;
+  window.Image = function(...args) {
+    const img = new OriginalImage(...args);
+    img.crossOrigin = "anonymous";
+    // Optionally log image loading for debugging
+    img.onload = function() {
+      console.log("[VIEWER DEBUG] Image loaded:", img.src, "crossOrigin:", img.crossOrigin);
+    };
+    img.onerror = function(e) {
+      console.error("[VIEWER DEBUG] Image load error:", img.src, e);
+    };
+    return img;
+  };
+})();
+
 let pc;
 export let app = null;
 let cameraEntity = null;
@@ -17,56 +34,6 @@ let sogsUrl, glbUrl;
 console.log("%c[VIEWER DEBUG] User Agent:", "color: #0074D9;", navigator.userAgent);
 console.log("%c[VIEWER DEBUG] Page:", "color: #0074D9;", location.href);
 
-// --- Monkeypatch Image to log src and crossOrigin ---
-(function() {
-  const OriginalImage = window.Image;
-  window.Image = function(...args) {
-    const img = new OriginalImage(...args);
-    const origSetAttribute = img.setAttribute;
-    img.setAttribute = function(name, value) {
-      if (name === "crossOrigin") {
-        console.log("%c[VIEWER DEBUG] setAttribute crossOrigin:", "color: orange;", value, img.src);
-      }
-      return origSetAttribute.apply(this, arguments);
-    };
-    Object.defineProperty(img, "src", {
-      set(value) {
-        console.log("%c[VIEWER DEBUG] Setting img.src:", "color: orange;", value, "crossOrigin:", img.crossOrigin);
-        origSetAttribute.call(img, "src", value);
-      }
-    });
-    img.onload = function() {
-      console.log("%c[VIEWER DEBUG] Image loaded:", "color: orange;", img.src, "crossOrigin:", img.crossOrigin);
-    };
-    img.onerror = function(e) {
-      console.error("%c[VIEWER DEBUG] Image load error:", "color: orange;", img.src, e);
-    };
-    return img;
-  };
-})();
-
-// --- Monkeypatch WebGL texImage2D for detailed logging ---
-(function() {
-  const orig = WebGLRenderingContext.prototype.texImage2D;
-  WebGLRenderingContext.prototype.texImage2D = function() {
-    try {
-      console.log("%c[VIEWER DEBUG] texImage2D called with:", "color: #FF4136;", arguments);
-      return orig.apply(this, arguments);
-    } catch (e) {
-      console.error("%c[VIEWER DEBUG] texImage2D ERROR:", "color: #FF4136;", e, arguments);
-      throw e;
-    }
-  };
-})();
-
-// --- Global error logging ---
-window.addEventListener("error", function(e) {
-  if (e.message && /insecure|taint|cross-origin/i.test(e.message)) {
-    alert("[VIEWER] WebGL/CORS error: " + e.message);
-    console.error("%c[VIEWER DEBUG] Global error:", "color: #FF4136;", e);
-  }
-});
-
 export async function initializeViewer(config, instanceId) {
   if (viewerInitialized) return;
 
@@ -135,23 +102,6 @@ export async function initializeViewer(config, instanceId) {
     window.pc = pc;
   }
 
-  if (pc && pc.TextureHandler) {
-    const origLoad = pc.TextureHandler.prototype.load;
-    pc.TextureHandler.prototype.load = function(url, callback, asset) {
-      // Use our own image loader
-      const img = new window.Image();
-      img.crossOrigin = "anonymous";
-      img.onload = function() {
-        callback(null, img);
-      };
-      img.onerror = function(err) {
-        callback(err || new Error("Image load failed"), null);
-      };
-      img.src = url;
-    };
-    console.log("[VIEWER DEBUG] Patched pc.TextureHandler to force crossOrigin=anonymous on all images");
-  }
-
   // Create app first
   const device = await pc.createGraphicsDevice(canvas, {
     deviceTypes: ["webgl2"],