Update viewer.js

viewer.js

@@ -1,301 +1,174 @@
 // viewer.js
 // ==============================
 
-let pc;
+let pc;            
 export let app = null;
 let cameraEntity = null;
 let modelEntity = null;
 let viewerInitialized = false;
 let resizeObserver = null;
-let galleryEntity = null;
 
 let chosenCameraX, chosenCameraY, chosenCameraZ;
 let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minPivotY, minY;
 let modelX, modelY, modelZ, modelScale, modelRotationX, modelRotationY, modelRotationZ;
 let plyUrl, glbUrl;
 
-// Utility: log and alert (for iPhone debug)
-function safeLog(msg) {
-  if (typeof msg !== 'string') {
-    try { msg = JSON.stringify(msg); } catch {}
-  }
-  console.log(msg);
-  try { alert(msg); } catch {}
-}
-
 export async function initializeViewer(config, instanceId) {
-  if (viewerInitialized) {
-    safeLog("Viewer already initialized");
-    return;
+  if (viewerInitialized) return;
+
+  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
+  const isMobile = isIOS || /Android/i.test(navigator.userAgent);
+
+  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;
+  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 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);
+
+  chosenCameraX = isMobile ? cameraXPhone : cameraX;
+  chosenCameraY = isMobile ? cameraYPhone : cameraY;
+  chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
+
+  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);
+
+  let oldCanvas = document.getElementById(canvasId);
+  if (oldCanvas) oldCanvas.remove();
+
+  const canvas = document.createElement('canvas');
+  canvas.id = canvasId;
+  canvas.className = 'ply-canvas';
+  canvas.style.width = "100%";
+  canvas.style.height = "100%";
+  canvas.setAttribute('tabindex', '0');
+  viewerContainer.insertBefore(canvas, progressDialog);
+
+  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', e => { if (e.touches.length > 1) e.preventDefault(); }, { passive: false });
+
+  progressDialog.style.display = 'block';
+
+  if (!pc) {
+    pc = await import("https://esm.run/playcanvas");
+    window.pc = pc;
   }
 
-  try {
-    const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
-    const isMobile = isIOS || /Android/i.test(navigator.userAgent);
-
-    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;
-    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 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);
-
-    chosenCameraX = isMobile ? cameraXPhone : cameraX;
-    chosenCameraY = isMobile ? cameraYPhone : cameraY;
-    chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
-
-    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);
-
-    let oldCanvas = document.getElementById(canvasId);
-    if (oldCanvas) oldCanvas.remove();
-
-    const canvas = document.createElement('canvas');
-    canvas.id = canvasId;
-    canvas.className = 'ply-canvas';
-    canvas.style.width = "100%";
-    canvas.style.height = "100%";
-    canvas.setAttribute('tabindex', '0');
-    viewerContainer.insertBefore(canvas, progressDialog);
-
-    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', e => { if (e.touches.length > 1) e.preventDefault(); }, { passive: false });
-
-    progressDialog.style.display = 'block';
-
-    if (!pc) {
-      try {
-        pc = await import("https://esm.run/playcanvas");
-        window.pc = pc;
-        safeLog("PlayCanvas loaded!");
-      } catch (e) {
-        safeLog("PlayCanvas import failed: " + e);
-        throw e;
-      }
-    }
-
-    let device;
-    try {
-      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
-      });
-    } catch (e) {
-      safeLog("createGraphicsDevice failed: " + e);
-      throw e;
-    }
-    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);
-      });
-    });
-    resizeObserver.observe(viewerContainer);
-
-    window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
-    app.on('destroy', () => resizeObserver.disconnect());
-
-    // --- Assets: Add GLB and HDR support ---
-    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 })
-    };
-    const assetArray = Object.values(assets).filter(a => !!a);
-
-    const loader = new pc.AssetListLoader(assetArray, app.assets);
-
-    // Asset error handling
-    assets.model.on('error', err => {
-      safeLog("GSplat model failed: " + err);
-    });
-    if (assets.galerie) {
-      assets.galerie.on('error', err => {
-        safeLog("GLB failed: " + err);
-      });
-    }
-    assets.hdr.on('error', err => {
-      safeLog("HDR failed: " + err);
+  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);
     });
-
-    loader.load(async () => {
-      safeLog("Assets loaded, starting app...");
-      app.start();
-      progressDialog.style.display = 'none';
-
-      // Add GSplat (PLY) first
-      try {
-        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);
-        safeLog("PLY/GSplat added");
-      } catch (e) {
-        safeLog("Failed to add PLY/GSplat: " + e);
-      }
-
-      // Then add GLB gallery (if available)
-      try {
-        if (assets.galerie && assets.galerie.resource && assets.galerie.resource.instantiateRenderEntity) {
-          galleryEntity = assets.galerie.resource.instantiateRenderEntity();
-          app.root.addChild(galleryEntity);
-          safeLog("GLB gallery added to scene");
-        } else if (assets.galerie) {
-          safeLog("GLB asset loaded, but no instantiateRenderEntity");
-        }
-      } catch (e) {
-        safeLog("Failed to add GLB gallery: " + e);
+  });
+  resizeObserver.observe(viewerContainer);
+
+  window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
+  app.on('destroy', () => resizeObserver.disconnect());
+
+  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" }),
+  };
+
+  const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
+  loader.load(() => {
+    app.start();
+    progressDialog.style.display = 'none';
+
+    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);
+
+    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, frameOnStart: false
       }
+    });
+    cameraEntity.script.create('orbitCameraInputMouse');
+    cameraEntity.script.create('orbitCameraInputTouch');
+    app.root.addChild(cameraEntity);
 
-      // Set HDR environment (after app.start)
-      try {
-        if (assets.hdr && assets.hdr.resource) {
-          app.scene.envAtlas = assets.hdr.resource;
-          safeLog("HDR environment applied");
-        }
-      } catch (e) {
-        safeLog("Failed to set HDR environment: " + e);
-      }
+    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
 
-      // Camera
-      try {
-        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
-          }
-        });
-        cameraEntity.script.create('orbitCameraInputMouse');
-        cameraEntity.script.create('orbitCameraInputTouch');
-        app.root.addChild(cameraEntity);
-        safeLog("Camera set up");
-      } catch (e) {
-        safeLog("Failed to set up camera: " + e);
-      }
+    // Use Script B's robust camera reset logic after everything is ready
+    app.once('update', () => resetViewerCamera());
 
-      app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-
-      // Use Script B's robust camera reset logic after everything is ready
-      app.once('update', () => {
-        try {
-          resetViewerCamera();
-          safeLog("Camera reset after init");
-        } catch (e) {
-          safeLog("Camera reset failed: " + e);
-        }
-      });
-
-      // 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
-          });
-          safeLog("Tooltips loaded and initialized");
-        }
-      } catch (e) {
-        safeLog("Tooltips load/init error: " + e);
-      }
-
-      viewerInitialized = true;
-      safeLog("Viewer initialized OK");
-    });
-  } catch (err) {
-    safeLog("Fatal init error: " + err);
-    const progressDialog = document.getElementById('progress-dialog-' + instanceId);
-    if (progressDialog) {
-      progressDialog.innerHTML = `<p style="color: red">Error loading viewer: ${err && err.message ? err.message : err}</p>`;
-    }
-  }
+    viewerInitialized = true;
+  });
 }
 
-// Camera reset logic from Script B
+// --------- This is the only modification (Script B logic) ---------
 export function resetViewerCamera() {
   try {
-    if (!cameraEntity || !modelEntity || !app) {
-      safeLog("resetViewerCamera: missing entity or app");
-      return;
-    }
+    if (!cameraEntity || !modelEntity || !app) return;
     const orbitCam = cameraEntity.script.orbitCamera;
-    if (!orbitCam) {
-      safeLog("resetViewerCamera: orbitCamera script missing");
-      return;
-    }
+    if (!orbitCam) return;
 
     const modelPos = modelEntity.getPosition();
     const tempEnt = new pc.Entity();
@@ -332,28 +205,7 @@ export function resetViewerCamera() {
     if (orbitCam._updatePosition) orbitCam._updatePosition();
 
     tempEnt.destroy();
-    safeLog("Camera reset complete");
   } catch (e) {
-    safeLog("resetViewerCamera exception: " + e);
     // Silent fail
   }
 }
-
-export function cleanupViewer() {
-  try {
-    if (app) {
-      try { app.destroy(); } catch (e) { safeLog("App destroy error: " + e); }
-      app = null;
-    }
-    cameraEntity = null;
-    modelEntity  = null;
-    viewerInitialized = false;
-    if (resizeObserver) {
-      resizeObserver.disconnect();
-      resizeObserver = null;
-    }
-    safeLog("Viewer cleaned up");
-  } catch (e) {
-    safeLog("cleanupViewer error: " + e);
-  }
-}