Update viewer.js

viewer.js

@@ -1,7 +1,7 @@
 // viewer.js
 // ==============================
 
-let pc;            
+let pc;
 export let app = null;
 let cameraEntity = null;
 let modelEntity = null;
@@ -25,25 +25,25 @@ export async function initializeViewer(config, instanceId) {
   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;
+  minAzimuth = parseFloat(config.minAzimuth || "-360");
+  maxAzimuth = 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);
+  minY = parseFloat(config.minY || "0");
+
+  modelX = parseFloat(config.modelX || "0");
+  modelY = parseFloat(config.modelY || "0");
+  modelZ = parseFloat(config.modelZ || "0");
+  modelScale = parseFloat(config.modelScale || "1");
+  modelRotationX = parseFloat(config.modelRotationX || "0");
+  modelRotationY = parseFloat(config.modelRotationY || "0");
+  modelRotationZ = parseFloat(config.modelRotationZ || "0");
+
+  const cameraX = parseFloat(config.cameraX || "0");
+  const cameraY = parseFloat(config.cameraY || "2");
+  const cameraZ = parseFloat(config.cameraZ || "5");
+  const cameraXPhone = parseFloat(config.cameraXPhone || cameraX);
+  const cameraYPhone = parseFloat(config.cameraYPhone || cameraY);
+  const cameraZPhone = parseFloat(config.cameraZPhone || (cameraZ * 1.5));
 
   chosenCameraX = isMobile ? cameraXPhone : cameraX;
   chosenCameraY = isMobile ? cameraYPhone : cameraY;
@@ -62,19 +62,10 @@ export async function initializeViewer(config, instanceId) {
   canvas.className = 'ply-canvas';
   canvas.style.width = "100%";
   canvas.style.height = "100%";
+  canvas.style.touchAction = "none";
   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;
@@ -122,17 +113,27 @@ export async function initializeViewer(config, instanceId) {
   window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
   app.on('destroy', () => resizeObserver.disconnect());
 
+  if (isIOS) {
+    const originalRequest = pc.Http.request;
+    pc.Http.request = function(options) {
+      if (options && options.url.endsWith('.ply')) options.responseType = 'arraybuffer';
+      return originalRequest.call(this, options);
+    };
+  }
+
   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 })
+    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 loader = new pc.AssetListLoader(Object.values(assets), app.assets);
-  loader.load(() => {
+  loader.load(async () => {
     app.start();
-    progressDialog.style.display = 'none';
+    app.scene.envAtlas = assets.hdr.resource;
 
     modelEntity = new pc.Entity('model');
     modelEntity.addComponent('gsplat', { asset: assets.model });
@@ -141,28 +142,67 @@ export async function initializeViewer(config, instanceId) {
     modelEntity.setLocalScale(modelScale, modelScale, modelScale);
     app.root.addChild(modelEntity);
 
+    if (assets.galerie && assets.galerie.resource) {
+      const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
+      app.root.addChild(galleryEntity);
+    }
+
     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
+        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');
-    cameraEntity.script.create('orbitCameraInputTouch');
+    cameraEntity.script.create('orbitCameraInputMouse', { attributes: { orbitSensitivity: isMobile ? 0.6 : 0.3 } });
+    cameraEntity.script.create('orbitCameraInputTouch', { attributes: { orbitSensitivity: 0.6 } });
     app.root.addChild(cameraEntity);
 
-    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+    app.once('update', () => resetViewerCamera());
+    app.on('update', () => {
+      const pos = cameraEntity.getPosition();
+      if (pos.y < minY) cameraEntity.setPosition(pos.x, minY, pos.z);
+    });
+
+    try {
+      const tooltipsModule = await import('./tooltips.js');
+      tooltipsModule.initializeTooltips({
+        app, cameraEntity, modelEntity,
+        tooltipsUrl: config.tooltips_url,
+        defaultVisible: !!config.showTooltipsDefault,
+        moveDuration: config.tooltipMoveDuration || 0.6
+      });
+    } catch {}
+
+    progressDialog.style.display = 'none';
     viewerInitialized = true;
   });
 }
 
 export function resetViewerCamera() {
   if (!cameraEntity || !modelEntity || !app) return;
-  const orbitCam = cameraEntity.script.orbitCamera;
-  if (orbitCam) orbitCam.reset();
+  cameraEntity.script.orbitCamera.reset();
+}
+
+export function cleanupViewer() {
+  if (app) app.destroy();
+  app = null;
+  cameraEntity = null;
+  modelEntity = null;
+  viewerInitialized = false;
+  if (resizeObserver) resizeObserver.disconnect();
+  resizeObserver = null;
 }