Update viewer.js

viewer.js

@@ -1,19 +1,18 @@
 // viewer.js
 
-let pc; // PlayCanvas
+let pc; // PlayCanvas, for GLB only
 export let app = null;
 let cameraEntity = null;
 let modelEntity = null;
 let viewerInitialized = false;
 let resizeObserver = null;
-let loadTimeout = null; // For iOS load fallback
 
-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 splatRenderer = null;
+let splatScene = null;
+let splatCamera = null;
+let splatControls = null;
+let splatFrame = null;
 
-// iOS detection
 function isIOS() {
   return /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
 }
@@ -26,82 +25,111 @@ export async function initializeViewer(config, instanceId) {
   if (viewerInitialized) return;
 
   // 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;
-  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;
-
-  const mobile = isIOS() || /Android/i.test(navigator.userAgent);
-  chosenCameraX = mobile ? cameraXPhone : cameraX;
-  chosenCameraY = mobile ? cameraYPhone : cameraY;
-  chosenCameraZ = mobile ? cameraZPhone : cameraZ;
-
-  // DOM
-  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.zIndex = "1";
-  viewerContainer.insertBefore(canvas, progressDialog);
-
-  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);
+  const plyUrl = config.ply_url;
+  const glbUrl = config.glb_url;
+
+  // Use SPLAT for PLY on iOS or if file is >40MB, PlayCanvas otherwise
+  let useSplat = false;
+  if (plyUrl && isIOS()) useSplat = true;
+
+  // --- SPLAT Renderer Fallback for PLY on iOS ---
+  if (useSplat && plyUrl) {
+    try {
+      logAndAlert('[viewer.js] Using SPLAT renderer for PLY on iOS.');
+      const SPLAT = await import("https://bilca-gsplat-library.static.hf.space/dist/index.js");
+      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);
+      const canvas = document.getElementById(canvasId);
+
+      progressDialog.style.display = 'block';
+
+      splatRenderer = new SPLAT.WebGLRenderer(canvas);
+      splatScene = new SPLAT.Scene();
+      splatCamera = new SPLAT.Camera();
+
+      // Camera/orbit config
+      const isMobile = isIOS() || /Android/i.test(navigator.userAgent);
+      const initAlpha = isMobile && config.initAlphaPhone ? parseFloat(config.initAlphaPhone) : parseFloat(config.initAlpha || 0.5);
+      const initBeta = isMobile && config.initBetaPhone ? parseFloat(config.initBetaPhone) : parseFloat(config.initBeta || 0.5);
+      const initRadius = isMobile && config.initRadiusPhone ? parseFloat(config.initRadiusPhone) : parseFloat(config.initRadius || 5);
+
+      splatControls = new SPLAT.OrbitControls(
+        splatCamera,
+        canvas,
+        0.5, 0.5, 5,
+        true,
+        new SPLAT.Vector3(),
+        initAlpha, initBeta, initRadius
+      );
+      splatControls.maxZoom = parseFloat(config.maxZoom || 20);
+      splatControls.minZoom = parseFloat(config.minZoom || 0);
+      splatControls.minAngle = parseFloat(config.minAngle || 0);
+      splatControls.maxAngle = parseFloat(config.maxAngle || 360);
+      splatControls.panSpeed = isMobile ? 0.5 : 1.2;
+
+      // Load PLY (with progress)
+      await SPLAT.PLYLoader.LoadAsync(
+        plyUrl,
+        splatScene,
+        (progress) => { progressIndicator.value = progress * 100; }
+      );
+      progressDialog.style.display = 'none';
+
+      // Render loop
+      function frame() {
+        splatControls.update();
+        splatRenderer.render(splatScene, splatCamera);
+        splatFrame = requestAnimationFrame(frame);
       }
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  }, { passive: false });
+      frame();
 
-  progressDialog.style.display = 'block';
+      window.addEventListener("resize", () => {
+        splatRenderer.setSize(canvas.clientWidth, canvas.clientHeight);
+      });
+
+      viewerInitialized = true;
+      logAndAlert('[viewer.js] SPLAT viewer initialized!');
+      return; // Done, do not run PlayCanvas path
 
-  // PlayCanvas
-  if (!pc) {
-    pc = await import("https://esm.run/playcanvas");
-    window.pc = pc;
-    logAndAlert('[viewer.js] PlayCanvas module loaded.');
+    } catch (err) {
+      alert('[viewer.js] SPLAT loading error: ' + err.message);
+      return;
+    }
   }
 
+  // === PlayCanvas Path (GLB or non-iOS) ===
   try {
+    if (!pc) {
+      pc = await import("https://esm.run/playcanvas");
+      window.pc = pc;
+      logAndAlert('[viewer.js] PlayCanvas module loaded.');
+    }
+
+    // DOM
+    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.zIndex = "1";
+    viewerContainer.insertBefore(canvas, progressDialog);
+
+    progressDialog.style.display = 'block';
+
     logAndAlert('[viewer.js] Creating graphics device...');
     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,
-      preserveDrawingBuffer: isIOS() ? true : false,
+      preserveDrawingBuffer: false,
       alpha: false
     });
     logAndAlert('[viewer.js] Graphics device created!');
@@ -146,15 +174,11 @@ export async function initializeViewer(config, instanceId) {
     window.addEventListener('resize', () => {
       if (app) app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
     });
-    app.on('destroy', () => {
-      window.removeEventListener('resize', resizeCanvas);
-    });
 
-    // Assets
+    // Assets (GLB only)
     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 }),
+      orbit: new pc.Asset('script', 'script', { url: "https://mikafil-viewer-gs.static.hf.space/orbit-camera.js" }),
       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 })
@@ -163,87 +187,16 @@ export async function initializeViewer(config, instanceId) {
     const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
     let lastProg = 0;
 
-    // iOS PLY load timeout/fallback
-    if (isIOS()) {
-      // 90MB is a big PLY!
-      loadTimeout = setTimeout(() => {
-        alert("⚠️ 3D model loading is taking unusually long on your device. Large PLY files (>40MB) may exceed memory limits on iOS Safari and cannot be shown. Try a smaller model, or use a desktop browser for best results.");
-        progressDialog.innerHTML = `<p style="color:red">Loading failed or too slow. Try a smaller model, or use a desktop browser.</p>`;
-      }, 20000); // 20 seconds
-    }
-
-    assets.model.on('load', () => {
-      if (loadTimeout) { clearTimeout(loadTimeout); loadTimeout = null; }
-      progressDialog.style.display = 'none';
-      if (assets.model.resource && assets.model.resource._buffer) {
-        let buf = assets.model.resource._buffer;
-        logAndAlert(`[viewer.js] PLY/GSplat asset loaded! Buffer byteLength: ${buf.byteLength || buf.length || 'n/a'}`);
-      } else {
-        logAndAlert(`[viewer.js] PLY/GSplat asset loaded! [NO BUFFER?]`);
-      }
-    });
-
-    assets.model.on('error', err => {
-      if (loadTimeout) { clearTimeout(loadTimeout); loadTimeout = null; }
-      logAndAlert('[viewer.js] Error loading model: ' + 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);
-
     loader.load(async () => {
-      if (loadTimeout) { clearTimeout(loadTimeout); loadTimeout = null; }
       logAndAlert('[viewer.js] All assets loaded; starting app.');
       app.start();
       app.scene.envAtlas = assets.hdr.resource;
 
-      // Model entity
-      modelEntity = new pc.Entity('model');
-      try {
-        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);
-        logAndAlert('[viewer.js] Model entity added to scene!');
-      } catch (e) {
-        logAndAlert('[viewer.js] Error adding model entity: ' + e.message);
-      }
-
-      // 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
+      let galleryEntity = null;
       if (assets.galerie && assets.galerie.resource) {
         try {
-          const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
+          galleryEntity = assets.galerie.resource.instantiateRenderEntity();
           app.root.addChild(galleryEntity);
           logAndAlert('[viewer.js] GLB entity added to scene!');
         } catch (e) {
@@ -258,33 +211,27 @@ export async function initializeViewer(config, instanceId) {
           ? parseInt(config.canvas_background.substr(1, 2), 16) / 255
           : 0,
       });
-      cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-      cameraEntity.lookAt(modelEntity.getPosition());
+      cameraEntity.setPosition(0, 2, 5);
+      if (galleryEntity) cameraEntity.lookAt(galleryEntity.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,
+          focusEntity: galleryEntity,
+          distanceMax: 20,
+          distanceMin: 1,
+          pitchAngleMax: 90,
+          pitchAngleMin: -45,
           frameOnStart: false
         }
       });
       cameraEntity.script.create('orbitCameraInputMouse', {
         attributes: {
-          orbitSensitivity: mobile ? 0.6 : 0.3,
-          distanceSensitivity: mobile ? 0.5 : 0.4
+          orbitSensitivity: 0.3,
+          distanceSensitivity: 0.4
         }
       });
-      if (cameraEntity.script.orbitCameraInputMouse) {
-        cameraEntity.script.orbitCameraInputMouse.onMouseWheel = function() {};
-      }
       cameraEntity.script.create('orbitCameraInputTouch', {
         attributes: {
           orbitSensitivity: 0.6,
@@ -294,111 +241,44 @@ export async function initializeViewer(config, instanceId) {
       app.root.addChild(cameraEntity);
       logAndAlert('[viewer.js] Camera entity added to scene!');
 
-      // Reset & constrain updates
       app.once('update', () => {
         logAndAlert('[viewer.js] First app update! Resetting camera.');
-        resetViewerCamera();
       });
       app.on('update', dt => {
-        if (cameraEntity) {
-          const pos = cameraEntity.getPosition();
-          if (pos.y < minY) {
-            cameraEntity.setPosition(pos.x, minY, pos.z);
-          }
-        }
         if (!window._pcFirstUpdate) {
           window._pcFirstUpdate = true;
           logAndAlert('[viewer.js] Entered update/render loop!');
         }
       });
 
-      // Final resize
       app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-
-      // Tooltips
-      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 (e) {
-        console.error("Error loading tooltips.js:", e);
-      }
-
-      progressDialog.style.display = 'none';
       viewerInitialized = true;
+      progressDialog.style.display = 'none';
       logAndAlert('[viewer.js] Viewer fully initialized and running!');
     });
 
   } catch (error) {
-    if (loadTimeout) { clearTimeout(loadTimeout); loadTimeout = null; }
     logAndAlert("[viewer.js] Error initializing PlayCanvas viewer: " + error.message);
-    progressDialog.innerHTML = `<p style="color: red">Error loading viewer: ${error.message}</p>`;
+    const progressDialog = document.getElementById('progress-dialog-' + instanceId);
+    if (progressDialog) progressDialog.innerHTML = `<p style="color: red">Error loading viewer: ${error.message}</p>`;
   }
 }
 
 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;
-    orbitCam._updatePosition && orbitCam._updatePosition();
-
-    tempEnt.destroy();
-  } catch (e) {
-    console.error("Error resetting camera:", e);
-  }
+  // Not implemented for PlayCanvas path
 }
-
 export function cleanupViewer() {
   if (app) {
-    try {
-      app.destroy();
-    } catch {}
+    try { app.destroy(); } catch {}
     app = null;
   }
+  if (splatFrame) {
+    cancelAnimationFrame(splatFrame);
+    splatFrame = null;
+  }
   cameraEntity = null;
   modelEntity = null;
   viewerInitialized = false;
-
   if (resizeObserver) {
     resizeObserver.disconnect();
     resizeObserver = null;