Update viewer.js

viewer.js

@@ -1,8 +1,7 @@
 // viewer.js
 // ==============================
-// Unified PlayCanvas viewer with robust PLY (GSplat), GLB, HDR, tooltips, and cross-platform camera/controls.
 
-let pc;
+let pc;            
 export let app = null;
 let cameraEntity = null;
 let modelEntity = null;
@@ -13,38 +12,36 @@ let chosenCameraX, chosenCameraY, chosenCameraZ;
 let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minPivotY, minY;
 let modelX, modelY, modelZ, modelScale, modelRotationX, modelRotationY, modelRotationZ;
 let plyUrl, glbUrl;
+let galleryEntity = null;
 
-// ----------- Main Viewer Init ----------- //
 export async function initializeViewer(config, instanceId) {
   if (viewerInitialized) return;
 
-  // -- Platform detection --
-  const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-  // -- Parse config --
   plyUrl = config.ply_url;
   glbUrl = config.glb_url;
-  minZoom     = parseFloat(config.minZoom  || "1");
-  maxZoom     = parseFloat(config.maxZoom  || "20");
-  minAngle    = parseFloat(config.minAngle || "-45");
-  maxAngle    = parseFloat(config.maxAngle || "90");
-  minAzimuth  = (config.minAzimuth !== undefined) ? parseFloat(config.minAzimuth) : -360;
-  maxAzimuth  = (config.maxAzimuth !== undefined) ? parseFloat(config.maxAzimuth) : 360;
-  minPivotY   = parseFloat(config.minPivotY  || "0");
-  minY        = (config.minY !== undefined) ? parseFloat(config.minY) : 0;
-
-  modelX         = (config.modelX !== undefined) ? parseFloat(config.modelX) : 0;
-  modelY         = (config.modelY !== undefined) ? parseFloat(config.modelY) : 0;
-  modelZ         = (config.modelZ !== undefined) ? parseFloat(config.modelZ) : 0;
-  modelScale     = (config.modelScale !== undefined) ? parseFloat(config.modelScale) : 1;
+  minZoom = parseFloat(config.minZoom || "1");
+  maxZoom = parseFloat(config.maxZoom || "20");
+  minAngle = parseFloat(config.minAngle || "-45");
+  maxAngle = parseFloat(config.maxAngle || "90");
+  minAzimuth = (config.minAzimuth !== undefined) ? parseFloat(config.minAzimuth) : -360;
+  maxAzimuth = (config.maxAzimuth !== undefined) ? parseFloat(config.maxAzimuth) : 360;
+  minPivotY = parseFloat(config.minPivotY || "0");
+  minY = (config.minY !== undefined) ? parseFloat(config.minY) : 0;
+
+  modelX = (config.modelX !== undefined) ? parseFloat(config.modelX) : 0;
+  modelY = (config.modelY !== undefined) ? parseFloat(config.modelY) : 0;
+  modelZ = (config.modelZ !== undefined) ? parseFloat(config.modelZ) : 0;
+  modelScale = (config.modelScale !== undefined) ? parseFloat(config.modelScale) : 1;
   modelRotationX = (config.modelRotationX !== undefined) ? parseFloat(config.modelRotationX) : 0;
   modelRotationY = (config.modelRotationY !== undefined) ? parseFloat(config.modelRotationY) : 0;
   modelRotationZ = (config.modelRotationZ !== undefined) ? parseFloat(config.modelRotationZ) : 0;
 
-  const cameraX      = (config.cameraX !== undefined) ? parseFloat(config.cameraX) : 0;
-  const cameraY      = (config.cameraY !== undefined) ? parseFloat(config.cameraY) : 2;
-  const cameraZ      = (config.cameraZ !== undefined) ? parseFloat(config.cameraZ) : 5;
+  const cameraX = (config.cameraX !== undefined) ? parseFloat(config.cameraX) : 0;
+  const cameraY = (config.cameraY !== undefined) ? parseFloat(config.cameraY) : 2;
+  const cameraZ = (config.cameraZ !== undefined) ? parseFloat(config.cameraZ) : 5;
   const cameraXPhone = (config.cameraXPhone !== undefined) ? parseFloat(config.cameraXPhone) : cameraX;
   const cameraYPhone = (config.cameraYPhone !== undefined) ? parseFloat(config.cameraYPhone) : cameraY;
   const cameraZPhone = (config.cameraZPhone !== undefined) ? parseFloat(config.cameraZPhone) : (cameraZ * 1.5);
@@ -53,27 +50,22 @@ export async function initializeViewer(config, instanceId) {
   chosenCameraY = isMobile ? cameraYPhone : cameraY;
   chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
 
-  // -- DOM elements --
-  const canvasId        = 'canvas-' + instanceId;
-  const progressDialog  = document.getElementById('progress-dialog-' + instanceId);
+  const canvasId = 'canvas-' + instanceId;
+  const progressDialog = document.getElementById('progress-dialog-' + instanceId);
   const progressIndicator = document.getElementById('progress-indicator-' + instanceId);
   const viewerContainer = document.getElementById('viewer-container-' + instanceId);
 
-  // -- Remove any previous canvas --
   let oldCanvas = document.getElementById(canvasId);
   if (oldCanvas) oldCanvas.remove();
 
-  // -- Create canvas --
   const canvas = document.createElement('canvas');
   canvas.id = canvasId;
   canvas.className = 'ply-canvas';
   canvas.style.width = "100%";
   canvas.style.height = "100%";
-  canvas.style.zIndex = "1";
   canvas.setAttribute('tabindex', '0');
   viewerContainer.insertBefore(canvas, progressDialog);
 
-  // -- Prevent touch issues on iOS/Safari --
   canvas.style.touchAction = "none";
   canvas.style.webkitTouchCallout = "none";
   canvas.addEventListener('gesturestart', e => e.preventDefault());
@@ -82,239 +74,139 @@ 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 });
 
-  // -- Custom wheel for orbit on desktop (works with PlayCanvas + pointer capture) --
-  canvas.addEventListener('wheel', e => {
-    if (cameraEntity && cameraEntity.script && cameraEntity.script.orbitCamera) {
-      const orbitCam = cameraEntity.script.orbitCamera;
-      const sens = (cameraEntity.script.orbitCameraInputMouse?.distanceSensitivity) || 0.4;
-      if (cameraEntity.camera.projection === pc.PROJECTION_PERSPECTIVE) {
-        orbitCam.distance -= e.deltaY * 0.01 * sens * (orbitCam.distance * 0.1);
-      } else {
-        orbitCam.orthoHeight -= e.deltaY * 0.01 * sens * (orbitCam.orthoHeight * 0.1);
-      }
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  }, { passive: false });
-
-  // -- Show progress dialog --
   progressDialog.style.display = 'block';
 
-  // -- Import PlayCanvas if not loaded --
   if (!pc) {
     pc = await import("https://esm.run/playcanvas");
     window.pc = pc;
   }
 
-  try {
-    // -- Create graphics device and 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
+  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(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);
+
+  resizeObserver = new ResizeObserver(entries => {
+    entries.forEach(entry => {
+      app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
     });
-    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);
-
-    // -- Resize observer --
-    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);
-    });
-
-    app.on('destroy', () => {
-      if (resizeObserver) resizeObserver.disconnect();
-    });
-
-    // -- Asset setup --
-    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: glbUrl ? new pc.Asset('galerie', 'container', { url: glbUrl }) : null,
-      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 })
-    };
-
-    // Remove nulls for AssetListLoader
-    const loadAssets = Object.values(assets).filter(a => !!a);
-
-    const loader = new pc.AssetListLoader(loadAssets, 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>`;
-    });
-
-    // Progress bar animation (optional, can customize)
-    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);
-
-    // -- Asset loading --
-    loader.load(async () => {
-      app.start();
-
-      // -- Set HDR env if available --
-      if (assets.hdr && assets.hdr.resource) {
-        app.scene.envAtlas = assets.hdr.resource;
-      }
+  });
+  resizeObserver.observe(viewerContainer);
+
+  window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
+  app.on('destroy', () => resizeObserver.disconnect());
+
+  // --- NEW: Add GLB and HDR asset ---
+  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: glbUrl ? new pc.Asset('galerie', 'container', { url: glbUrl }) : null,
+    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 })
+  };
+  // filter out nulls for loader
+  const assetArray = Object.values(assets).filter(a => !!a);
+
+  const loader = new pc.AssetListLoader(assetArray, app.assets);
+  loader.load(async () => {
+    app.start();
+    progressDialog.style.display = 'none';
+
+    // HDR environment
+    if (assets.hdr && assets.hdr.resource) {
+      app.scene.envAtlas = assets.hdr.resource;
+    }
 
-      // -- PLY Model Entity (GSplat) --
-      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);
-
-      // -- GLB Gallery --
-      if (assets.galerie && assets.galerie.resource && assets.galerie.resource.instantiateRenderEntity) {
-        const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
-        app.root.addChild(galleryEntity);
-      }
+    // Model
+    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);
+
+    // GLB gallery
+    if (assets.galerie && assets.galerie.resource && assets.galerie.resource.instantiateRenderEntity) {
+      galleryEntity = assets.galerie.resource.instantiateRenderEntity();
+      app.root.addChild(galleryEntity);
+    }
 
-      // -- Directional Light --
-      const dirLight = new pc.Entity('DirLight');
-      dirLight.addComponent('light', {
-        type: 'directional',
-        color: pc.Color.WHITE,
-        shadowBias: 0.3,
-        normalOffsetBias: 0.2,
-        intensity: 1.0,
-        soft: true,
-        shadowResolution: 2048,
-        penumbraSize: 7,
-        penumbraFalloff: 1.5,
-        shadowSamples: 64,
-        shadowBlockerSamples: 8,
-        castShadows: true,
-        shadowType: pc.SHADOW_PCSS_32F,
-        shadowDistance: 1000
-      });
-      dirLight.setLocalEulerAngles(45, 30, 0);
-      app.root.addChild(dirLight);
-
-      // -- 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: {
-          focusEntity: modelEntity,
-          inertiaFactor: 0.2,
-          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
-        }
-      });
-      cameraEntity.script.create('orbitCameraInputTouch', {
-        attributes: {
-          orbitSensitivity: 0.6,
-          distanceSensitivity: 0.5
-        }
-      });
-      app.root.addChild(cameraEntity);
-
-      // -- Fix for camera reset/orbit camera initial state --
-      app.once('update', () => resetViewerCamera());
-
-      // -- Enforce minY (avoid camera below floor) --
-      app.on('update', dt => {
-        if (cameraEntity) {
-          const pos = cameraEntity.getPosition();
-          if (pos.y < minY) {
-            cameraEntity.setPosition(pos.x, minY, pos.z);
-          }
-        }
-      });
-
-      // -- Tooltips (if tooltips.js and tooltips_url provided) --
-      try {
-        if (config.tooltips_url) {
-          const tooltipsModule = await import('./tooltips.js');
-          tooltipsModule.initializeTooltips({
-            app,
-            cameraEntity,
-            modelEntity,
-            tooltipsUrl: config.tooltips_url,
-            defaultVisible: !!config.showTooltipsDefault,
-            moveDuration: config.tooltipMoveDuration || 0.6
-          });
-        }
-      } catch (e) {
-        // Tooltips optional, fail silently
+    // Camera
+    cameraEntity = new pc.Entity('camera');
+    cameraEntity.addComponent('camera', { clearColor: 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: {
+        focusEntity: modelEntity, 
+        inertiaFactor: 0.2, 
+        distanceMax: maxZoom, 
+        distanceMin: minZoom,
+        pitchAngleMax: maxAngle, 
+        pitchAngleMin: minAngle, 
+        yawAngleMax: maxAzimuth,
+        yawAngleMin: minAzimuth,
+        minPivotY: minPivotY,
+        frameOnStart: false
       }
-
-      // -- Final canvas resize --
-      app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-
-      // -- Hide progress --
-      progressDialog.style.display = 'none';
-      viewerInitialized = true;
     });
+    cameraEntity.script.create('orbitCameraInputMouse');
+    cameraEntity.script.create('orbitCameraInputTouch');
+    app.root.addChild(cameraEntity);
+
+    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+
+    // Use Script B's camera reset logic after everything is ready
+    app.once('update', () => resetViewerCamera());
+
+    // Tooltips (if config.tooltips_url and tooltips.js available)
+    try {
+      if (config.tooltips_url) {
+        const tooltipsModule = await import('./tooltips.js');
+        tooltipsModule.initializeTooltips({
+          app,
+          cameraEntity,
+          modelEntity,
+          tooltipsUrl: config.tooltips_url,
+          defaultVisible: !!config.showTooltipsDefault,
+          moveDuration: config.tooltipMoveDuration || 0.6
+        });
+      }
+    } catch (e) {
+      // Tooltips optional, fail silently
+    }
 
-  } catch (error) {
-    progressDialog.innerHTML = `<p style="color: red">Error loading viewer: ${error && error.message ? error.message : error}</p>`;
-  }
+    viewerInitialized = true;
+  });
 }
 
-// ----------- Camera Reset ----------- //
 export function resetViewerCamera() {
   try {
     if (!cameraEntity || !modelEntity || !app) return;
@@ -361,14 +253,13 @@ export function resetViewerCamera() {
   }
 }
 
-// ----------- Cleanup ----------- //
 export function cleanupViewer() {
   if (app) {
     try { app.destroy(); } catch {}
     app = null;
   }
   cameraEntity = null;
-  modelEntity = null;
+  modelEntity  = null;
   viewerInitialized = false;
   if (resizeObserver) {
     resizeObserver.disconnect();