Update viewer.js

viewer.js

@@ -1,68 +1,65 @@
 // viewer.js
+// ==============================
 
-let pc; // PlayCanvas
+let pc;            // will hold the PlayCanvas module once imported
 export let app = null;
-let cameraEntity = null;
-let modelEntity = 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;
 
-// iOS detection
-function isIOS() {
-  return /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
-}
-function logAndAlert(msg) {
-  console.log(msg);
-  if (isIOS()) alert(msg);
-}
-
+/**
+ * initializeViewer(config, instanceId)
+ */
 export async function initializeViewer(config, instanceId) {
   if (viewerInitialized) return;
 
-  // Config
+  const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+  const isMobile = isIOS || /Android/i.test(navigator.userAgent);
+
+  // 1. Read 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);
+  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;
+
+  // 2. Grab 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);
+  const viewerContainer   = document.getElementById('viewer-container-' + instanceId);
 
+  // 3. Create <canvas>
   let oldCanvas = document.getElementById(canvasId);
   if (oldCanvas) oldCanvas.remove();
   const canvas = document.createElement('canvas');
@@ -71,6 +68,7 @@ export async function initializeViewer(config, instanceId) {
   canvas.style.zIndex = "1";
   viewerContainer.insertBefore(canvas, progressDialog);
 
+  // 4. Wheel listener
   canvas.addEventListener('wheel', e => {
     if (cameraEntity && cameraEntity.script && cameraEntity.script.orbitCamera) {
       const orbitCam = cameraEntity.script.orbitCamera;
@@ -87,24 +85,20 @@ export async function initializeViewer(config, instanceId) {
 
   progressDialog.style.display = 'block';
 
-  // PlayCanvas
+  // 5. Import PlayCanvas
   if (!pc) {
     pc = await import("https://esm.run/playcanvas");
     window.pc = pc;
-    logAndAlert('[viewer.js] PlayCanvas module loaded.');
   }
 
   try {
-    logAndAlert('[viewer.js] Creating graphics device...');
+    // 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,
-      preserveDrawingBuffer: isIOS() ? true : false,
-      alpha: false
+      glslangUrl:  "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
+      twgslUrl:    "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
+      antialias:   false
     });
-    logAndAlert('[viewer.js] Graphics device created!');
     device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
 
     const opts = new pc.AppOptions();
@@ -130,9 +124,10 @@ export async function initializeViewer(config, instanceId) {
     app = new pc.Application(canvas, opts);
     app.setCanvasFillMode(pc.FILLMODE_NONE);
     app.setCanvasResolution(pc.RESOLUTION_AUTO);
+    //app.scene.exposure    = 0.5;
+    //app.scene.toneMapping = pc.TONEMAP_ACES;
 
-    logAndAlert('[viewer.js] PlayCanvas application created!');
-
+    // Attach ResizeObserver to keep canvas in sync with container size
     resizeObserver = new ResizeObserver(entries => {
       for (const entry of entries) {
         const { width, height } = entry.contentRect;
@@ -150,7 +145,7 @@ export async function initializeViewer(config, instanceId) {
       window.removeEventListener('resize', resizeCanvas);
     });
 
-    // Assets
+    // 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" }),
@@ -162,30 +157,9 @@ 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('load', () => progressDialog.style.display = 'none');
     assets.model.on('error', err => {
-      if (loadTimeout) { clearTimeout(loadTimeout); loadTimeout = null; }
-      logAndAlert('[viewer.js] Error loading model: ' + err);
+      console.error("Error loading PLY file:", err);
       progressDialog.innerHTML = <p style="color: red">Error loading model: ${err}</p>;
     });
 
@@ -201,23 +175,16 @@ export async function initializeViewer(config, instanceId) {
     }, 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);
-      }
+      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');
@@ -241,15 +208,8 @@ export async function initializeViewer(config, instanceId) {
       app.root.addChild(dirLight);
 
       // Gallery GLB
-      if (assets.galerie && assets.galerie.resource) {
-        try {
-          const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
-          app.root.addChild(galleryEntity);
-          logAndAlert('[viewer.js] GLB entity added to scene!');
-        } catch (e) {
-          logAndAlert('[viewer.js] Error adding GLB entity: ' + e.message);
-        }
-      }
+      const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
+      app.root.addChild(galleryEntity);
 
       // Camera setup
       cameraEntity = new pc.Entity('camera');
@@ -257,6 +217,7 @@ export async function initializeViewer(config, instanceId) {
         clearColor: config.canvas_background
           ? parseInt(config.canvas_background.substr(1, 2), 16) / 255
           : 0,
+        //toneMapping: pc.TONEMAP_ACES
       });
       cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
       cameraEntity.lookAt(modelEntity.getPosition());
@@ -278,8 +239,8 @@ export async function initializeViewer(config, instanceId) {
       });
       cameraEntity.script.create('orbitCameraInputMouse', {
         attributes: {
-          orbitSensitivity: mobile ? 0.6 : 0.3,
-          distanceSensitivity: mobile ? 0.5 : 0.4
+          orbitSensitivity: isMobile ? 0.6 : 0.3,
+          distanceSensitivity: isMobile ? 0.5 : 0.4
         }
       });
       if (cameraEntity.script.orbitCameraInputMouse) {
@@ -292,13 +253,9 @@ 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.once('update', () => resetViewerCamera());
       app.on('update', dt => {
         if (cameraEntity) {
           const pos = cameraEntity.getPosition();
@@ -306,10 +263,6 @@ export async function initializeViewer(config, instanceId) {
             cameraEntity.setPosition(pos.x, minY, pos.z);
           }
         }
-        if (!window._pcFirstUpdate) {
-          window._pcFirstUpdate = true;
-          logAndAlert('[viewer.js] Entered update/render loop!');
-        }
       });
 
       // Final resize
@@ -332,12 +285,10 @@ export async function initializeViewer(config, instanceId) {
 
       progressDialog.style.display = 'none';
       viewerInitialized = true;
-      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);
+    console.error("Error initializing PlayCanvas viewer:", error);
     progressDialog.innerHTML = <p style="color: red">Error loading viewer: ${error.message}</p>;
   }
 }
@@ -363,7 +314,7 @@ export function resetViewerCamera() {
 
     orbitCam.pivotPoint = modelPos.clone();
     orbitCam._targetDistance = dist;
-    orbitCam._distance = dist;
+    orbitCam._distance       = dist;
 
     const rot = tempEnt.getRotation();
     const fwd = new pc.Vec3();
@@ -376,10 +327,10 @@ export function resetViewerCamera() {
     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._targetYaw   = yaw;
+    orbitCam._yaw         = yaw;
     orbitCam._targetPitch = pitch;
-    orbitCam._pitch = pitch;
+    orbitCam._pitch       = pitch;
     orbitCam._updatePosition && orbitCam._updatePosition();
 
     tempEnt.destroy();
@@ -396,9 +347,10 @@ export function cleanupViewer() {
     app = null;
   }
   cameraEntity = null;
-  modelEntity = null;
+  modelEntity  = null;
   viewerInitialized = false;
 
+  // Disconnect the ResizeObserver to avoid leaks
   if (resizeObserver) {
     resizeObserver.disconnect();
     resizeObserver = null;