Update viewer.js

viewer.js

@@ -1,52 +1,48 @@
 // viewer.js
 // ==============================
-// viewer.js
-// ==============================
+// (Space B: iPhone/desktop/Android compatible, matches Space A + minimal iOS fix)
 
-// -- Module/global state --
-let pc; // PlayCanvas module
+let pc;            // PlayCanvas module
 export let app = null;
-let cameraEntity = null;
-let modelEntity = null;
+let cameraEntity   = null;
+let modelEntity    = null;
 let viewerInitialized = false;
-let resizeObserver = 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;
 
-/**
- * initializeViewer(config, instanceId)
- */
 export async function initializeViewer(config, instanceId) {
   if (viewerInitialized) return;
 
-  // Device detection (match Space A)
-  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+  // Detect iOS/mobile for camera parameters and debug alert
+  const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-  // 1. Read config (match Space A variable names/behavior)
+  // 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;
+  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);
@@ -55,27 +51,23 @@ export async function initializeViewer(config, instanceId) {
   chosenCameraY = isMobile ? cameraYPhone : cameraY;
   chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
 
-  // 2. Grab DOM
-  const canvasId = 'canvas-' + instanceId;
-  const progressDialog = document.getElementById('progress-dialog-' + instanceId);
+  // 2. DOM references
+  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>
+  // 3. Canvas creation (replace old if present)
   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";
-  // --- Space A style: block, 100% size for iOS layout bugs ---
-  canvas.style.display = "block";
-  canvas.style.width = "100%";
-  canvas.style.height = "100%";
   viewerContainer.insertBefore(canvas, progressDialog);
 
-  // 4. Wheel listener
-  canvas.addEventListener('wheel', e => {
+  // 4. Mouse wheel (zoom) handler
+  canvas.addEventListener('wheel', function(e) {
     if (cameraEntity && cameraEntity.script && cameraEntity.script.orbitCamera) {
       const orbitCam = cameraEntity.script.orbitCamera;
       const sens = (cameraEntity.script.orbitCameraInputMouse?.distanceSensitivity) || 0.4;
@@ -91,28 +83,31 @@ export async function initializeViewer(config, instanceId) {
 
   progressDialog.style.display = 'block';
 
-  // 5. Import PlayCanvas
+  // 5. Load PlayCanvas module if needed
   if (!pc) {
     pc = await import("https://esm.run/playcanvas");
     window.pc = pc;
   }
 
-  // -- Defer creation of app until all assets are loaded (Space A pattern) --
   try {
-    // 6. Robust WebGL2 → WebGL1 fallback (for iPhone)
+    // 6. Setup graphics device (WebGL2 → WebGL1 fallback for iPhone)
     async function getGraphicsDevice(preferWebgl2 = true) {
       const baseOpts = {
-        glslangUrl: "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
-        twgslUrl: "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
-        antialias: false
+        glslangUrl:  "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
+        twgslUrl:    "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
+        antialias:   false
       };
       try {
-        return await pc.createGraphicsDevice(canvas, {
+        const dev = await pc.createGraphicsDevice(canvas, {
           ...baseOpts,
           deviceTypes: preferWebgl2 ? ["webgl2"] : ["webgl1"]
         });
+        // Optionally alert for iPhone debug
+        // if (isIOS) alert(preferWebgl2 ? "WebGL2 context OK" : "WebGL1 context OK");
+        return dev;
       } catch (err) {
         if (preferWebgl2) {
+          // if (isIOS) alert("WebGL2 unavailable; falling back to WebGL1");
           return getGraphicsDevice(false);
         }
         throw err;
@@ -122,7 +117,42 @@ export async function initializeViewer(config, instanceId) {
     const device = await getGraphicsDevice(true);
     device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
 
-    // -- Asset declaration: match structure/order to Space A --
+    // Use the *Space A* method: AppBase + .init(options)
+    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
+    ];
+    opts.resourceHandlers = [
+      pc.TextureHandler,
+      pc.ContainerHandler,
+      pc.ScriptHandler,
+      pc.GSplatHandler
+    ];
+
+    app = new pc.AppBase(canvas);
+    app.init(opts);
+    app.setCanvasFillMode(pc.FILLMODE_NONE);
+    app.setCanvasResolution(pc.RESOLUTION_AUTO);
+    app.scene.exposure = 0.5;
+    app.scene.toneMapping = pc.TONEMAP_ACES;
+
+    // 7. Resize logic (like Space A)
+    function resize() {
+      if (app) {
+        app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+      }
+    }
+    window.addEventListener('resize', resize);
+    app.on('destroy', () => window.removeEventListener('resize', resize));
+
+    // 8. 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" }),
@@ -132,17 +162,18 @@ export async function initializeViewer(config, instanceId) {
       }, { type: pc.TEXTURETYPE_RGBP, mipmaps: false })
     };
 
-    const loader = new pc.AssetListLoader(Object.values(assets), pc.app && pc.app.assets ? pc.app.assets : undefined);
+    const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
     let lastProg = 0;
 
-    assets.model.on('load', () => {
+    assets.model.on('load', function() {
       progressDialog.style.display = 'none';
     });
-    assets.model.on('error', err => {
+    assets.model.on('error', function(err) {
       progressDialog.innerHTML = `<p style="color: red">Error loading model: ${err}</p>`;
+      console.error("Error loading PLY file:", err);
     });
 
-    const progCheck = setInterval(() => {
+    const progCheck = setInterval(function() {
       if (assets.model.resource) {
         progressIndicator.value = 100;
         clearInterval(progCheck);
@@ -153,56 +184,12 @@ export async function initializeViewer(config, instanceId) {
       }
     }, 100);
 
-    // -- Load all assets, then initialize the App (Space A sequence) --
-    loader.load(async () => {
-      // -- AppOptions: match Space A (do not add extra physics/collision if not used) --
-      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
-      ];
-      opts.resourceHandlers = [
-        pc.TextureHandler,
-        pc.ContainerHandler,
-        pc.ScriptHandler,
-        pc.GSplatHandler
-      ];
-
-      // -- Actually create and start the App --
-      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;
-
-      // -- Resize observer (Space A logic) --
-      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', () => {
-        window.removeEventListener('resize', resizeCanvas);
-      });
+    loader.load(function() {
+      app.start();
 
-      // -- Load HDR environment --
       app.scene.envAtlas = assets.hdr.resource;
 
-      // -- Build the scene graph --
+      // Model
       modelEntity = new pc.Entity('model');
       modelEntity.addComponent('gsplat', { asset: assets.model });
       modelEntity.setLocalPosition(modelX, modelY, modelZ);
@@ -210,7 +197,7 @@ export async function initializeViewer(config, instanceId) {
       modelEntity.setLocalScale(modelScale, modelScale, modelScale);
       app.root.addChild(modelEntity);
 
-      // Directional light (same as Space A)
+      // Light
       const dirLight = new pc.Entity('Cascaded Light');
       dirLight.addComponent('light', {
         type: 'directional',
@@ -228,30 +215,23 @@ export async function initializeViewer(config, instanceId) {
         shadowType: pc.SHADOW_PCSS_32F,
         shadowDistance: 1000
       });
-      dirLight.setLocalEulerAngles(0, 0, 0);
       app.root.addChild(dirLight);
+      dirLight.setLocalEulerAngles(0, 0, 0);
 
-      // Gallery container (GLB)
-      if (assets.galerie && assets.galerie.resource && assets.galerie.resource.instantiateRenderEntity) {
-        const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
-        app.root.addChild(galleryEntity);
-      }
+      // Gallery (GLB)
+      const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
+      app.root.addChild(galleryEntity);
 
-      // Camera entity (Space A logic, with true color init)
+      // Camera
       cameraEntity = new pc.Entity('camera');
-      // Color: set to black by default unless config.canvas_background is hex
-      let clearColor = new pc.Color(0, 0, 0);
-      if (config.canvas_background && config.canvas_background[0] === "#") {
-        // #RRGGBB
-        const hex = config.canvas_background;
-        clearColor = new pc.Color(
-          parseInt(hex.substr(1, 2), 16) / 255,
-          parseInt(hex.substr(3, 2), 16) / 255,
-          parseInt(hex.substr(5, 2), 16) / 255
-        );
-      }
       cameraEntity.addComponent('camera', {
-        clearColor: clearColor,
+        clearColor: config.canvas_background
+          ? new pc.Color(
+              parseInt(config.canvas_background.substr(1, 2), 16) / 255,
+              parseInt(config.canvas_background.substr(3, 2), 16) / 255,
+              parseInt(config.canvas_background.substr(5, 2), 16) / 255
+            )
+          : new pc.Color(0, 0, 0),
         toneMapping: pc.TONEMAP_ACES
       });
       cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
@@ -289,8 +269,24 @@ export async function initializeViewer(config, instanceId) {
       });
       app.root.addChild(cameraEntity);
 
-      // -- Per-frame update guard for minY (same as Space A) --
-      app.on('update', dt => {
+      // Initial camera reset
+      setTimeout(function() {
+        if (cameraEntity && cameraEntity.script && cameraEntity.script.orbitCamera) {
+          const modelPos = modelEntity.getPosition();
+          const camPos = cameraEntity.getPosition();
+          const distanceVec = new pc.Vec3();
+          distanceVec.sub2(camPos, modelPos);
+          const distance = distanceVec.length();
+          cameraEntity.script.orbitCamera.pivotPoint.copy(modelPos);
+          cameraEntity.script.orbitCamera.distance = distance;
+          if (typeof cameraEntity.script.orbitCamera._removeInertia === 'function') {
+            cameraEntity.script.orbitCamera._removeInertia();
+          }
+        }
+      }, 100);
+
+      // Per-frame Y guard (for camera)
+      app.on('update', function(dt) {
         if (cameraEntity) {
           const pos = cameraEntity.getPosition();
           if (pos.y < minY) {
@@ -299,92 +295,82 @@ export async function initializeViewer(config, instanceId) {
         }
       });
 
-      // -- Camera reset on first frame --
-      app.once('update', () => resetViewerCamera());
-
-      // -- Insert iOS-only first-draw debug popup (one-shot) --
-      if (isIOS) {
-        let iosAlertShown = false;
-        app.on('frameend', () => {
-          if (!iosAlertShown) {
-            iosAlertShown = true;
-            alert('First draw call reached (iOS)');
-          }
+      // Initial resize
+      resize();
+
+      // Tooltips support (optional)
+      if (config.tooltips_url) {
+        import('./tooltips.js').then(tooltipsModule => {
+          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);
         });
       }
 
-      // -- Start PlayCanvas app last --
-      app.start();
+      viewerInitialized = true;
 
-      // -- Tooltips support, try/catch required (unchanged) --
-      try {
-        const tooltipsModule = await import('./tooltips.js');
-        tooltipsModule.initializeTooltips({
-          app,
-          cameraEntity,
-          modelEntity,
-          tooltipsUrl: config.tooltips_url,
-          defaultVisible: !!config.showTooltipsDefault,
-          moveDuration: config.tooltipMoveDuration || 0.6
+      // Debug: show an alert on iPhone only on first frame rendered
+      if (isIOS) {
+        let firstDraw = true;
+        app.on('frameend', function() {
+          if (firstDraw) {
+            alert("First draw call reached (iOS)");
+            firstDraw = false;
+          }
         });
-      } catch (e) {
-        // Silent fail: tooltips are optional
       }
-
-      progressDialog.style.display = 'none';
-      viewerInitialized = true;
     });
 
   } catch (error) {
     progressDialog.innerHTML = `<p style="color: red">Error loading viewer: ${error.message}</p>`;
+    console.error("Error initializing PlayCanvas viewer:", error);
   }
 }
 
 // -----------------------------------------------------------------------------
-// resetViewerCamera / cleanupViewer remain UNCHANGED
-// -----------------------------------------------------------------------------
+// resetViewerCamera: (unchanged; matches Space A)
 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();
-
+    const tempEntity = new pc.Entity();
+    tempEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+    tempEntity.lookAt(modelPos);
+    const distance = 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;
+    orbitCam._targetDistance = distance;
+    orbitCam._distance = distance;
+    const rotation = tempEntity.getRotation();
+    const tempForward = new pc.Vec3();
+    rotation.transformVector(pc.Vec3.FORWARD, tempForward);
+    const yaw = Math.atan2(-tempForward.x, -tempForward.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;
-
+    const rotWithoutYaw = new pc.Quat().mul2(yawQuat, rotation);
+    const forwardWithoutYaw = new pc.Vec3();
+    rotWithoutYaw.transformVector(pc.Vec3.FORWARD, forwardWithoutYaw);
+    const pitch = Math.atan2(forwardWithoutYaw.y, -forwardWithoutYaw.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) {}
+    if (typeof orbitCam._updatePosition === 'function') {
+      orbitCam._updatePosition();
+    }
+    tempEntity.destroy();
+  } catch (e) {
+    console.error("Error resetting camera:", e);
+  }
 }
 
 export function cleanupViewer() {
@@ -395,11 +381,6 @@ export function cleanupViewer() {
     app = null;
   }
   cameraEntity = null;
-  modelEntity = null;
+  modelEntity  = null;
   viewerInitialized = false;
-
-  if (resizeObserver) {
-    resizeObserver.disconnect();
-    resizeObserver = null;
-  }
 }