Update viewer.js

viewer.js

@@ -1,7 +1,7 @@
 // viewer.js
 // ==============================
 
-let pc;            // PlayCanvas module (will be loaded dynamically)
+let pc;            // will hold the PlayCanvas module once imported
 export let app = null;
 let cameraEntity   = null;
 let modelEntity    = null;
@@ -13,10 +13,12 @@ let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minPivotY, min
 let modelX, modelY, modelZ, modelScale, modelRotationX, modelRotationY, modelRotationZ;
 let plyUrl, glbUrl;
 
+/**
+ * initializeViewer(config, instanceId)
+ */
 export async function initializeViewer(config, instanceId) {
   if (viewerInitialized) return;
 
-  // Device detection
   const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
@@ -64,29 +66,9 @@ export async function initializeViewer(config, instanceId) {
   canvas.id = canvasId;
   canvas.className = 'ply-canvas';
   canvas.style.zIndex = "1";
-  canvas.style.width = "100%";
-  canvas.style.height = "100%";
-  canvas.setAttribute('tabindex', '0');
   viewerContainer.insertBefore(canvas, progressDialog);
 
-  // Remove touch-action/pointer-events from overlays if present (to not block iOS events)
-  // (This is safe as overlays/panels should not interfere with viewer canvas input)
-  if (viewerContainer.style.touchAction) viewerContainer.style.touchAction = "";
-  if (viewerContainer.style.pointerEvents) viewerContainer.style.pointerEvents = "";
-  if (canvas.style.pointerEvents) canvas.style.pointerEvents = "";
-
-  // Prevent iOS Safari zoom gesture conflicts
-  canvas.style.touchAction = "none";
-  canvas.style.webkitTouchCallout = "none";
-  canvas.addEventListener('gesturestart', e => e.preventDefault());
-  canvas.addEventListener('gesturechange', e => e.preventDefault());
-  canvas.addEventListener('gestureend', e => e.preventDefault());
-  canvas.addEventListener('dblclick', e => e.preventDefault());
-  canvas.addEventListener('touchstart', function(e) {
-    if (e.touches.length > 1) e.preventDefault();
-  }, { passive: false });
-
-  // 4. Wheel/zoom listener (desktop)
+  // 4. Wheel listener
   canvas.addEventListener('wheel', e => {
     if (cameraEntity && cameraEntity.script && cameraEntity.script.orbitCamera) {
       const orbitCam = cameraEntity.script.orbitCamera;
@@ -101,213 +83,194 @@ export async function initializeViewer(config, instanceId) {
     }
   }, { passive: false });
 
-  // Show loading
   progressDialog.style.display = 'block';
 
-  // 5. Import PlayCanvas if not present
+  // 5. Import PlayCanvas
   if (!pc) {
     pc = await import("https://esm.run/playcanvas");
     window.pc = pc;
   }
 
-  // 6. Setup device & app
-  const device = await pc.createGraphicsDevice(canvas, {
-    deviceTypes: ["webgl2"],
-    glslangUrl:  "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
-    twgslUrl:    "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
-    antialias:   false
-  });
-  device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
-
-  const opts = new pc.AppOptions();
-  opts.graphicsDevice = device;
-  // Attach input to document.body (not canvas) for iOS and match PlayCanvas example!
-  opts.mouse = new pc.Mouse(document.body);
-  opts.touch = new pc.TouchDevice(document.body);
-  opts.componentSystems = [
-    pc.RenderComponentSystem,
-    pc.CameraComponentSystem,
-    pc.LightComponentSystem,
-    pc.ScriptComponentSystem,
-    pc.GSplatComponentSystem,
-    pc.CollisionComponentSystem,
-    pc.RigidbodyComponentSystem
-  ];
-  opts.resourceHandlers = [
-    pc.TextureHandler,
-    pc.ContainerHandler,
-    pc.ScriptHandler,
-    pc.GSplatHandler
-  ];
-
-  app = new pc.Application(canvas, opts);
-  app.setCanvasFillMode(pc.FILLMODE_NONE);
-  app.setCanvasResolution(pc.RESOLUTION_AUTO);
-
-  // Attach ResizeObserver to keep canvas in sync with container size
-  resizeObserver = new ResizeObserver(entries => {
-    for (const entry of entries) {
-      const { width, height } = entry.contentRect;
-      if (app) {
-        app.resizeCanvas(width, height);
+  try {
+    // 6. Setup device & app
+    const device = await pc.createGraphicsDevice(canvas, {
+      deviceTypes: ["webgl2"],
+      glslangUrl:  "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
+      twgslUrl:    "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
+      antialias:   false
+    });
+    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
+    ];
+    opts.resourceHandlers = [
+      pc.TextureHandler,
+      pc.ContainerHandler,
+      pc.ScriptHandler,
+      pc.GSplatHandler
+    ];
+
+    app = new pc.Application(canvas, opts);
+    app.setCanvasFillMode(pc.FILLMODE_NONE);
+    app.setCanvasResolution(pc.RESOLUTION_AUTO);
+
+    // Attach ResizeObserver to keep canvas in sync with container size
+    resizeObserver = new ResizeObserver(entries => {
+      for (const entry of entries) {
+        const { width, height } = entry.contentRect;
+        if (app) {
+          app.resizeCanvas(width, height);
+        }
       }
-    }
-  });
-  resizeObserver.observe(viewerContainer);
-
-  window.addEventListener('resize', () => {
-    if (app) app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-  });
+    });
+    resizeObserver.observe(viewerContainer);
 
-  app.on('destroy', () => {
-    if (resizeObserver) resizeObserver.disconnect();
-    resizeObserver = null;
-  });
-
-  // --- iOS-specific fix: robust binary loader for PLY ---
-  // If window.PLY_FORCE_ARRAYBUFFER is set, override asset loader for PLY
-  if (window.PLY_FORCE_ARRAYBUFFER) {
-    const origRequest = pc.Http.request;
-    pc.Http.request = function(options) {
-      if (options && options.url && (options.url.endsWith('.ply') || options.responseType === 'gsplat')) {
-        options.responseType = 'arraybuffer';
-      }
-      return origRequest.call(this, options);
-    };
-  }
+    window.addEventListener('resize', () => {
+      if (app) app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+    });
 
-  // 7. Asset loading (progress bar)
-  const assets = {
-    model: new pc.Asset('gsplat', 'gsplat', { url: plyUrl }),
-    orbit: new pc.Asset('script', 'script', { url: "https://mikafil-viewer-gs.static.hf.space/orbit-camera.js" }),
-    galerie: new pc.Asset('galerie', 'container', { url: glbUrl }),
-    hdr: new pc.Asset('hdr', 'texture', {
-      url: "https://huggingface.co/datasets/bilca/ply_files/resolve/main/galeries/blanc.png"
-    }, { type: pc.TEXTURETYPE_RGBP, mipmaps: false })
-  };
-
-  let lastProg = 0;
-  assets.model.on('load', () => { progressDialog.style.display = 'none'; });
-  assets.model.on('error', err => {
-    progressDialog.innerHTML = `<p style="color: red">Error loading model: ${err}</p>`;
-  });
-
-  const progCheck = setInterval(() => {
-    if (assets.model.resource) {
-      progressIndicator.value = 100;
-      clearInterval(progCheck);
-      progressDialog.style.display = 'none';
-    } else if (assets.model.loading) {
-      lastProg = Math.min(lastProg + 2, 90);
-      progressIndicator.value = lastProg;
-    }
-  }, 100);
-
-  // Wait for PlayCanvas app and input to be ready, then load assets
-  const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
-  loader.load(async () => {
-    app.start();
-    app.scene.envAtlas = assets.hdr.resource;
-
-    // Main model entity
-    modelEntity = new pc.Entity('model');
-    modelEntity.addComponent('gsplat', { asset: assets.model });
-    modelEntity.setLocalPosition(modelX, modelY, modelZ);
-    modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
-    modelEntity.setLocalScale(modelScale, modelScale, modelScale);
-    app.root.addChild(modelEntity);
-
-    // Light
-    const dirLight = new pc.Entity('Cascaded Light');
-    dirLight.addComponent('light', {
-      type: 'directional',
-      color: pc.Color.WHITE,
-      shadowBias: 0.3,
-      normalOffsetBias: 0.2,
-      intensity: 1.0,
-      soft: true,
-      shadowResolution: 4096,
-      penumbraSize: 7,
-      penumbraFalloff: 1.5,
-      shadowSamples: 128,
-      shadowBlockerSamples: 16,
-      castShadows: true,
-      shadowType: pc.SHADOW_PCSS_32F,
-      shadowDistance: 1000
+    app.on('destroy', () => {
+      window.removeEventListener('resize', resizeCanvas);
     });
-    dirLight.setLocalEulerAngles(0, 0, 0);
-    app.root.addChild(dirLight);
 
-    // Gallery GLB (optional)
-    if (assets.galerie && assets.galerie.resource && assets.galerie.resource.instantiateRenderEntity) {
-      const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
-      app.root.addChild(galleryEntity);
-    }
+    // 7. Assets
+    const assets = {
+      model: new pc.Asset('gsplat', 'gsplat', { url: plyUrl }),
+      orbit: new pc.Asset('script', 'script', { url: "https://mikafil-viewer-gs.static.hf.space/orbit-camera.js" }),
+      galerie: new pc.Asset('galerie', 'container', { url: glbUrl }),
+      hdr: new pc.Asset('hdr', 'texture', {
+        url: "https://huggingface.co/datasets/bilca/ply_files/resolve/main/galeries/blanc.png"
+      }, { type: pc.TEXTURETYPE_RGBP, mipmaps: false })
+    };
 
-    // Camera setup
-    cameraEntity = new pc.Entity('camera');
-    cameraEntity.addComponent('camera', {
-      clearColor: config.canvas_background
-        ? new pc.Color(
-            parseInt(config.canvas_background.substr(1, 2), 16) / 255,
-            parseInt(config.canvas_background.substr(3, 2), 16) / 255,
-            parseInt(config.canvas_background.substr(5, 2), 16) / 255,
-            1
-          )
-        : new pc.Color(0.2, 0.2, 0.2, 1)
-    });
-    cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-    cameraEntity.lookAt(modelEntity.getPosition());
-
-    cameraEntity.addComponent('script');
-    cameraEntity.script.create('orbitCamera', {
-      attributes: {
-        inertiaFactor: 0.2,
-        focusEntity: modelEntity,
-        distanceMax: maxZoom,
-        distanceMin: minZoom,
-        pitchAngleMax: maxAngle,
-        pitchAngleMin: minAngle,
-        yawAngleMax: maxAzimuth,
-        yawAngleMin: minAzimuth,
-        minPivotY: minPivotY,
-        minY: minY,
-        frameOnStart: false
-      }
+    const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
+    let lastProg = 0;
+    assets.model.on('load', () => progressDialog.style.display = 'none');
+    assets.model.on('error', err => {
+      progressDialog.innerHTML = `<p style="color: red">Error loading model: ${err}</p>`;
     });
-    cameraEntity.script.create('orbitCameraInputMouse', {
-      attributes: {
-        orbitSensitivity: isMobile ? 0.6 : 0.3,
-        distanceSensitivity: isMobile ? 0.5 : 0.4
+
+    const progCheck = setInterval(() => {
+      if (assets.model.resource) {
+        progressIndicator.value = 100;
+        clearInterval(progCheck);
+        progressDialog.style.display = 'none';
+      } else if (assets.model.loading) {
+        lastProg = Math.min(lastProg + 2, 90);
+        progressIndicator.value = lastProg;
       }
-    });
-    cameraEntity.script.create('orbitCameraInputTouch', {
-      attributes: {
-        orbitSensitivity: 0.6,
-        distanceSensitivity: 0.5
+    }, 100);
+
+    loader.load(async () => {
+      app.start();
+      app.scene.envAtlas = assets.hdr.resource;
+
+      // Model entity
+      modelEntity = new pc.Entity('model');
+      modelEntity.addComponent('gsplat', { asset: assets.model });
+      modelEntity.setLocalPosition(modelX, modelY, modelZ);
+      modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
+      modelEntity.setLocalScale(modelScale, modelScale, modelScale);
+      app.root.addChild(modelEntity);
+
+      // Light
+      const dirLight = new pc.Entity('Cascaded Light');
+      dirLight.addComponent('light', {
+        type: 'directional',
+        color: pc.Color.WHITE,
+        shadowBias: 0.3,
+        normalOffsetBias: 0.2,
+        intensity: 1.0,
+        soft: true,
+        shadowResolution: 4096,
+        penumbraSize: 7,
+        penumbraFalloff: 1.5,
+        shadowSamples: 128,
+        shadowBlockerSamples: 16,
+        castShadows: true,
+        shadowType: pc.SHADOW_PCSS_32F,
+        shadowDistance: 1000
+      });
+      dirLight.setLocalEulerAngles(0, 0, 0);
+      app.root.addChild(dirLight);
+
+      // Gallery GLB
+      if (assets.galerie && assets.galerie.resource && assets.galerie.resource.instantiateRenderEntity) {
+        const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
+        app.root.addChild(galleryEntity);
       }
-    });
-    app.root.addChild(cameraEntity);
 
-    // On first update, reset camera to proper config
-    app.once('update', () => { resetViewerCamera(); });
-
-    // Clamp Y so camera never goes below floor
-    app.on('update', dt => {
-      if (cameraEntity) {
-        const pos = cameraEntity.getPosition();
-        if (pos.y < minY) cameraEntity.setPosition(pos.x, minY, pos.z);
+      // Camera setup
+      cameraEntity = new pc.Entity('camera');
+      cameraEntity.addComponent('camera', {
+        clearColor: config.canvas_background
+          ? parseInt(config.canvas_background.substr(1, 2), 16) / 255
+          : 0
+      });
+      cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+      cameraEntity.lookAt(modelEntity.getPosition());
+
+      cameraEntity.addComponent('script');
+      cameraEntity.script.create('orbitCamera', {
+        attributes: {
+          inertiaFactor: 0.2,
+          focusEntity: modelEntity,
+          distanceMax: maxZoom,
+          distanceMin: minZoom,
+          pitchAngleMax: maxAngle,
+          pitchAngleMin: minAngle,
+          yawAngleMax: maxAzimuth,
+          yawAngleMin: minAzimuth,
+          minPivotY: minPivotY,
+          frameOnStart: false
+        }
+      });
+      cameraEntity.script.create('orbitCameraInputMouse', {
+        attributes: {
+          orbitSensitivity: isMobile ? 0.6 : 0.3,
+          distanceSensitivity: isMobile ? 0.5 : 0.4
+        }
+      });
+      if (cameraEntity.script.orbitCameraInputMouse) {
+        cameraEntity.script.orbitCameraInputMouse.onMouseWheel = function() {};
       }
-    });
-
-    // Final resize
-    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-
-    // Tooltips
-    if (config.tooltips_url) {
+      cameraEntity.script.create('orbitCameraInputTouch', {
+        attributes: {
+          orbitSensitivity: 0.6,
+          distanceSensitivity: 0.5
+        }
+      });
+      app.root.addChild(cameraEntity);
+
+      // Reset & constrain updates
+      app.once('update', () => resetViewerCamera());
+      app.on('update', dt => {
+        if (cameraEntity) {
+          const pos = cameraEntity.getPosition();
+          if (pos.y < minY) {
+            cameraEntity.setPosition(pos.x, minY, pos.z);
+          }
+        }
+      });
+
+      // Final resize
+      app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+
+      // Tooltips
       try {
         const tooltipsModule = await import('./tooltips.js');
-        await tooltipsModule.initializeTooltips({
+        tooltipsModule.initializeTooltips({
           app,
           cameraEntity,
           modelEntity,
@@ -315,12 +278,17 @@ export async function initializeViewer(config, instanceId) {
           defaultVisible: !!config.showTooltipsDefault,
           moveDuration: config.tooltipMoveDuration || 0.6
         });
-      } catch (e) {/* Fail quietly */}
-    }
+      } catch (e) {
+        // Tooltips are optional
+      }
+
+      progressDialog.style.display = 'none';
+      viewerInitialized = true;
+    });
 
-    // Ready!
-    viewerInitialized = true;
-  });
+  } catch (error) {
+    progressDialog.innerHTML = `<p style="color: red">Error loading viewer: ${error && error.message ? error.message : error}</p>`;
+  }
 }
 
 export function resetViewerCamera() {
@@ -364,7 +332,9 @@ export function resetViewerCamera() {
     if (orbitCam._updatePosition) orbitCam._updatePosition();
 
     tempEnt.destroy();
-  } catch (e) {/* Fail quietly */}
+  } catch (e) {
+    // Silent fail: resetting camera should never crash app
+  }
 }
 
 export function cleanupViewer() {
@@ -377,6 +347,8 @@ export function cleanupViewer() {
   cameraEntity = null;
   modelEntity  = null;
   viewerInitialized = false;
+
+  // Disconnect the ResizeObserver to avoid leaks
   if (resizeObserver) {
     resizeObserver.disconnect();
     resizeObserver = null;