Update viewer.js

viewer.js

@@ -1,6 +1,3 @@
-// viewer.js
-// ==============================
-
 let pc;
 export let app = null;
 let cameraEntity = null;
@@ -13,27 +10,37 @@ let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minPivotY, min
 let modelX, modelY, modelZ, modelScale, modelRotationX, modelRotationY, modelRotationZ;
 let sogsUrl, glbUrl, canvasBg;
 
-// Helper: Convert #RRGGBB[AA] to [r,g,b,a]
-function hexToRgba(hex) {
+function hexToRgbaArray(hex) {
+  try {
     hex = hex.replace("#", "");
     if (hex.length === 6) hex += "FF";
+    if (hex.length !== 8) return [1, 1, 1, 1];
     const num = parseInt(hex, 16);
     return [
-        ((num >> 24) & 0xFF) / 255,
-        ((num >> 16) & 0xFF) / 255,
-        ((num >> 8)  & 0xFF) / 255,
-        (num & 0xFF) / 255
+      ((num >> 24) & 0xFF) / 255,
+      ((num >> 16) & 0xFF) / 255,
+      ((num >> 8)  & 0xFF) / 255,
+      (num & 0xFF) / 255
     ];
+  } catch (e) {
+    alert("hexToRgbaArray error: " + e);
+    return [1, 1, 1, 1];
+  }
 }
 
 export async function initializeViewer(config, instanceId) {
-    if (viewerInitialized) return;
+  alert("initializeViewer: start");
+
+  if (viewerInitialized) {
+    alert("Already initialized!");
+    return;
+  }
 
-    // Robust device detection
-    const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
-    const isMobile = isIOS || /Android/i.test(navigator.userAgent);
+  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+  const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-    // Parse config fields
+  try {
+    // Parse config
     sogsUrl   = config.sogs_json_url;
     glbUrl    = config.glb_url;
     canvasBg  = config.canvas_background || "#ffffff";
@@ -81,7 +88,9 @@ export async function initializeViewer(config, instanceId) {
     canvas.setAttribute('tabindex', '0');
     viewerContainer.insertBefore(canvas, progressDialog);
 
+    // Apply background color from config if present
     canvas.style.background = canvasBg;
+
     canvas.style.touchAction = "none";
     canvas.style.webkitTouchCallout = "none";
     canvas.addEventListener('gesturestart', e => e.preventDefault());
@@ -90,208 +99,270 @@ export async function initializeViewer(config, instanceId) {
     canvas.addEventListener('dblclick', e => e.preventDefault());
     canvas.addEventListener('touchstart', e => { if (e.touches.length > 1) e.preventDefault(); }, { passive: false });
 
-    // Block wheel scroll
+    // --- Mouse wheel suppression
     canvas.addEventListener('wheel', (e) => {
-        e.preventDefault();
+      e.preventDefault(); // Only block page scroll if mouse is over viewer
     }, { passive: false });
 
-    progressDialog.style.display = 'block';
+    if (progressDialog) progressDialog.style.display = 'block';
+
+    alert("Canvas created. Loading PlayCanvas...");
 
     if (!pc) {
-        pc = await import("https://cdn.jsdelivr.net/npm/playcanvas@latest/+esm"); // PlayCanvas up-to-date
-        window.pc = pc;
+      pc = await import("https://cdn.jsdelivr.net/npm/playcanvas@latest/+esm");
+      window.pc = pc;
+      alert("PlayCanvas imported.");
     }
 
-    // === GRAPHICS DEVICE: Use robust fallback for iOS WebGL2 quirks ===
-    let device = null;
-    let lastError = null;
+    // Create app and graphics device
+    let device;
     try {
-        device = await pc.createGraphicsDevice(canvas, {
-            deviceTypes: ["webgl2", "webgl1"], // Fallback to WebGL1 if needed
-            glslangUrl: "https://mikafil-viewer-sgos.static.hf.space/static/lib/glslang/glslang.js",
-            twgslUrl:   "https://mikafil-viewer-sgos.static.hf.space/static/lib/twgsl/twgsl.js",
-            antialias: false
-        });
+      device = await pc.createGraphicsDevice(canvas, {
+        deviceTypes: ["webgl2", "webgl1"],
+        glslangUrl: "https://mikafil-viewer-sgos.static.hf.space/static/lib/glslang/glslang.js",
+        twgslUrl:   "https://mikafil-viewer-sgos.static.hf.space/static/lib/twgsl/twgsl.js",
+        antialias: false
+      });
+      device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
+      alert("Graphics device created.");
     } catch (e) {
-        lastError = e;
-    }
-    // Fallback: forcibly try WebGL1 if WebGL2 fails (especially for older iOS)
-    if (!device) {
-        try {
-            device = await pc.createGraphicsDevice(canvas, {
-                deviceTypes: ["webgl1"],
-                glslangUrl: "https://mikafil-viewer-sgos.static.hf.space/static/lib/glslang/glslang.js",
-                twgslUrl:   "https://mikafil-viewer-sgos.static.hf.space/static/lib/twgsl/twgsl.js",
-                antialias: false
-            });
-        } catch (e) {
-            progressDialog.style.display = 'none';
-            progressIndicator.value = 0;
-            progressIndicator.removeAttribute('max');
-            if (window.confirm("WebGL failed to initialize. Your browser/device may not support it. Reload?")) location.reload();
-            throw new Error("Failed to create WebGL context: " + (lastError || e));
-        }
+      alert("Graphics device error: " + e);
+      throw e;
     }
-    device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
 
     const opts = new pc.AppOptions();
     opts.graphicsDevice = device;
     opts.mouse = new pc.Mouse(canvas);
     opts.touch = new pc.TouchDevice(canvas);
     opts.componentSystems = [
-        pc.RenderComponentSystem,
-        pc.CameraComponentSystem,
-        pc.LightComponentSystem,
-        pc.ScriptComponentSystem,
-        pc.GSplatComponentSystem,
-        pc.CollisionComponentSystem,
-        pc.RigidbodyComponentSystem
+      pc.RenderComponentSystem,
+      pc.CameraComponentSystem,
+      pc.LightComponentSystem,
+      pc.ScriptComponentSystem,
+      pc.GSplatComponentSystem,
+      pc.CollisionComponentSystem,
+      pc.RigidbodyComponentSystem
     ];
     opts.resourceHandlers = [
-        pc.TextureHandler,
-        pc.ContainerHandler,
-        pc.ScriptHandler,
-        pc.GSplatHandler
+      pc.TextureHandler,
+      pc.ContainerHandler,
+      pc.ScriptHandler,
+      pc.GSplatHandler
     ];
 
     app = new pc.Application(canvas, opts);
     app.setCanvasFillMode(pc.FILLMODE_NONE);
     app.setCanvasResolution(pc.RESOLUTION_AUTO);
 
-    // --- Resize observer robust for iOS/Android window resize ---
+    alert("App created.");
+
+    // Resizing
     resizeObserver = new ResizeObserver(entries => {
-        entries.forEach(entry => {
-            app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
-        });
+      entries.forEach(entry => {
+        try {
+          app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
+        } catch (e) { alert("resizeCanvas error: " + e); }
+      });
     });
     resizeObserver.observe(viewerContainer);
 
-    window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
+    window.addEventListener('resize', () => {
+      try {
+        app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+      } catch (e) { alert("resizeCanvas error: " + e); }
+    });
     app.on('destroy', () => resizeObserver.disconnect());
 
-    // --- Asset loading: SOGS (gsplat) as model, Orbit script, optional GLB ---
+    // Prepare asset loading (SOGS as 'gsplat')
     const assets = {
-        sogs: new pc.Asset('gsplat', 'gsplat', { url: sogsUrl }),
-        orbit: new pc.Asset('script', 'script', { url: "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js" }),
-        glb: new pc.Asset('glb', 'container', { url: glbUrl }),
+      sogs: new pc.Asset('gsplat', 'gsplat', { url: sogsUrl }),
+      orbit: new pc.Asset('script', 'script', { url: "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js" }),
+      glb: new pc.Asset('glb', 'container', { url: glbUrl }),
     };
     for (const key in assets) app.assets.add(assets[key]);
 
+    // Individual asset error listeners
+    assets.sogs.on('error', (err) => { alert("SOGS asset error: " + err); });
+    assets.orbit.on('error', (err) => { alert("Orbit-camera.js asset error: " + err); });
+    if (assets.glb) assets.glb.on('error', (err) => { alert("GLB asset error: " + err); });
+
+    assets.sogs.ready(() => { alert("SOGS asset ready."); });
+    assets.orbit.ready(() => { alert("orbit-camera.js asset ready."); });
+    if (assets.glb) assets.glb.ready(() => { alert("GLB asset ready."); });
+
     const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
 
+    loader.on('error', (err) => { alert("Asset loader error: " + err); });
+
     loader.load(() => {
+      alert("All assets loaded. Starting app...");
+
+      try {
         app.start();
-        progressDialog.style.display = 'none';
+      } catch (e) {
+        alert("app.start() error: " + e);
+        throw e;
+      }
+
+      if (progressDialog) progressDialog.style.display = 'none';
 
-        // --- Add SOGS Model
+      // Add SOGS model
+      try {
         modelEntity = new pc.Entity('model');
         modelEntity.addComponent('gsplat', { asset: assets.sogs });
         modelEntity.setLocalPosition(modelX, modelY, modelZ);
         modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
         modelEntity.setLocalScale(modelScale, modelScale, modelScale);
         app.root.addChild(modelEntity);
-
-        // --- Add GLB entity if present
+        alert("Model entity added!");
+      } catch (e) {
+        alert("Model entity error: " + e);
+        throw e;
+      }
+
+      // Add the GLB entity if provided
+      try {
         if (assets.glb && assets.glb.resource && assets.glb.resource.instantiateRenderEntity) {
-            const glbEntity = assets.glb.resource.instantiateRenderEntity();
-            app.root.addChild(glbEntity);
+          const glbEntity = assets.glb.resource.instantiateRenderEntity();
+          app.root.addChild(glbEntity);
+          alert("GLB entity added.");
         }
+      } catch (e) {
+        alert("GLB entity error: " + e);
+      }
 
-        // --- Camera
+      // CAMERA
+      try {
         cameraEntity = new pc.Entity('camera');
-        // Set clearColor
+        // Support background color
         let bg = [1, 1, 1, 1];
         if (canvasBg && /^#?[0-9a-f]{6,8}$/i.test(canvasBg.replace("#", ""))) {
-            bg = hexToRgba(canvasBg);
+          bg = hexToRgbaArray(canvasBg);
         }
         cameraEntity.addComponent('camera', { clearColor: new pc.Color(bg[0], bg[1], bg[2], bg[3]) });
         cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
         cameraEntity.lookAt(modelEntity.getPosition());
         cameraEntity.addComponent('script');
 
+        // Pass all attributes to Orbit Camera script
         cameraEntity.script.create('orbitCamera', {
-            attributes: {
-                focusEntity: modelEntity,
-                inertiaFactor: 0.2,
-                distanceMax: maxZoom,
-                distanceMin: minZoom,
-                pitchAngleMax: maxAngle,
-                pitchAngleMin: minAngle,
-                yawAngleMax: maxAzimuth,
-                yawAngleMin: minAzimuth,
-                minY: minY,
-                frameOnStart: false
-            }
+          attributes: {
+            focusEntity: modelEntity,
+            inertiaFactor: 0.2,
+            distanceMax: maxZoom,
+            distanceMin: minZoom,
+            pitchAngleMax: maxAngle,
+            pitchAngleMin: minAngle,
+            yawAngleMax: maxAzimuth,
+            yawAngleMin: minAzimuth,
+            minY: minY,
+            frameOnStart: false
+          }
         });
         cameraEntity.script.create('orbitCameraInputMouse');
         cameraEntity.script.create('orbitCameraInputTouch');
         app.root.addChild(cameraEntity);
 
+        alert("Camera added.");
+      } catch (e) {
+        alert("Camera error: " + e);
+      }
+
+      try {
         app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+        alert("resizeCanvas called.");
+      } catch (e) {
+        alert("resizeCanvas error: " + e);
+      }
+
+      try {
         app.once('update', () => resetViewerCamera());
+        alert("resetViewerCamera scheduled.");
+      } catch (e) {
+        alert("resetViewerCamera schedule error: " + e);
+      }
+
+      // Tooltips support (optional)
+      try {
+        if (config.tooltips_url) {
+          import('https://mikafil-viewer-sgos.static.hf.space/tooltips.js').then(tooltipsModule => {
+            tooltipsModule.initializeTooltips({
+              app,
+              cameraEntity,
+              modelEntity,
+              tooltipsUrl: config.tooltips_url,
+              defaultVisible: !!config.showTooltipsDefault,
+              moveDuration: config.tooltipMoveDuration || 0.6
+            });
+            alert("Tooltips loaded.");
+          }).catch(e => { alert("Tooltips module error: " + e); });
+        }
+      } catch (e) {
+        alert("Tooltips try-catch error: " + e);
+      }
 
-        // --- Tooltips support (optional)
-        try {
-            if (config.tooltips_url) {
-                import('https://mikafil-viewer-sgos.static.hf.space/tooltips.js').then(tooltipsModule => {
-                    tooltipsModule.initializeTooltips({
-                        app,
-                        cameraEntity,
-                        modelEntity,
-                        tooltipsUrl: config.tooltips_url,
-                        defaultVisible: !!config.showTooltipsDefault,
-                        moveDuration: config.tooltipMoveDuration || 0.6
-                    });
-                }).catch(e => {});
-            }
-        } catch (e) {}
-
-        viewerInitialized = true;
+      viewerInitialized = true;
+      alert("Viewer initialized success!");
     });
+
+    alert("Asset loader started.");
+  } catch (e) {
+    alert("Main try-catch error: " + e);
+    throw e;
+  }
 }
 
+// Resets the viewer camera (as in your PLY example)
 export function resetViewerCamera() {
-    try {
-        if (!cameraEntity || !modelEntity || !app) return;
-        const orbitCam = cameraEntity.script.orbitCamera;
-        if (!orbitCam) return;
-
-        const modelPos = modelEntity.getPosition();
-        const tempEnt = new pc.Entity();
-        tempEnt.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-        tempEnt.lookAt(modelPos);
-
-        const dist = new pc.Vec3().sub2(
-            new pc.Vec3(chosenCameraX, chosenCameraY, chosenCameraZ),
-            modelPos
-        ).length();
-
-        cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-        cameraEntity.lookAt(modelPos);
-
-        orbitCam.pivotPoint = modelPos.clone();
-        orbitCam._targetDistance = dist;
-        orbitCam._distance       = dist;
-
-        const rot = tempEnt.getRotation();
-        const fwd = new pc.Vec3();
-        rot.transformVector(pc.Vec3.FORWARD, fwd);
-
-        const yaw = Math.atan2(-fwd.x, -fwd.z) * pc.math.RAD_TO_DEG;
-        const yawQuat = new pc.Quat().setFromEulerAngles(0, -yaw, 0);
-        const rotNoYaw = new pc.Quat().mul2(yawQuat, rot);
-        const fNoYaw = new pc.Vec3();
-        rotNoYaw.transformVector(pc.Vec3.FORWARD, fNoYaw);
-        const pitch = Math.atan2(fNoYaw.y, -fNoYaw.z) * pc.math.RAD_TO_DEG;
-
-        orbitCam._targetYaw   = yaw;
-        orbitCam._yaw         = yaw;
-        orbitCam._targetPitch = pitch;
-        orbitCam._pitch       = pitch;
-        if (orbitCam._updatePosition) orbitCam._updatePosition();
-
-        tempEnt.destroy();
-    } catch (e) {
-        // Silent fail
+  alert("resetViewerCamera called.");
+  try {
+    if (!cameraEntity || !modelEntity || !app) {
+      alert("resetViewerCamera: cameraEntity/modelEntity/app not ready");
+      return;
     }
+    const orbitCam = cameraEntity.script.orbitCamera;
+    if (!orbitCam) {
+      alert("resetViewerCamera: orbitCam missing");
+      return;
+    }
+
+    const modelPos = modelEntity.getPosition();
+    const tempEnt = new pc.Entity();
+    tempEnt.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+    tempEnt.lookAt(modelPos);
+
+    const dist = new pc.Vec3().sub2(
+      new pc.Vec3(chosenCameraX, chosenCameraY, chosenCameraZ),
+      modelPos
+    ).length();
+
+    cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+    cameraEntity.lookAt(modelPos);
+
+    orbitCam.pivotPoint = modelPos.clone();
+    orbitCam._targetDistance = dist;
+    orbitCam._distance       = dist;
+
+    const rot = tempEnt.getRotation();
+    const fwd = new pc.Vec3();
+    rot.transformVector(pc.Vec3.FORWARD, fwd);
+
+    const yaw = Math.atan2(-fwd.x, -fwd.z) * pc.math.RAD_TO_DEG;
+    const yawQuat = new pc.Quat().setFromEulerAngles(0, -yaw, 0);
+    const rotNoYaw = new pc.Quat().mul2(yawQuat, rot);
+    const fNoYaw = new pc.Vec3();
+    rotNoYaw.transformVector(pc.Vec3.FORWARD, fNoYaw);
+    const pitch = Math.atan2(fNoYaw.y, -fNoYaw.z) * pc.math.RAD_TO_DEG;
+
+    orbitCam._targetYaw   = yaw;
+    orbitCam._yaw         = yaw;
+    orbitCam._targetPitch = pitch;
+    orbitCam._pitch       = pitch;
+    if (orbitCam._updatePosition) orbitCam._updatePosition();
+
+    tempEnt.destroy();
+    alert("resetViewerCamera: success");
+  } catch (e) {
+    alert("resetViewerCamera: error: " + e);
+  }
 }