Update viewer.js

viewer.js

@@ -68,8 +68,22 @@ export async function initializeViewer(config, instanceId) {
   canvas.style.zIndex = "1";
   viewerContainer.insertBefore(canvas, progressDialog);
 
+  // --- PATCH: Prevent pinch/double-tap zoom for iOS (in addition to interface.js) ---
+  if (isIOS) {
+    canvas.style.touchAction = "none";
+    canvas.addEventListener('gesturestart', e => e.preventDefault());
+    canvas.addEventListener('gesturechange', e => e.preventDefault());
+    canvas.addEventListener('gestureend', e => e.preventDefault());
+    // Extra: prevent rubber-band scroll on iOS Safari inside canvas
+    canvas.addEventListener('touchmove', function(e) {
+      if (e.touches.length > 1) e.preventDefault();
+    }, { passive: false });
+  }
+  // --------------------------------------------------------------------------
+
   // 4. Wheel listener
   canvas.addEventListener('wheel', e => {
+    // Only prevent default if wheel is over canvas (don't scroll webpage)
     if (cameraEntity && cameraEntity.script && cameraEntity.script.orbitCamera) {
       const orbitCam = cameraEntity.script.orbitCamera;
       const sens = (cameraEntity.script.orbitCameraInputMouse?.distanceSensitivity) || 0.4;
@@ -148,13 +162,16 @@ export async function initializeViewer(config, instanceId) {
     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 }),
+      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 loader = new pc.AssetListLoader(Object.values(assets), app.assets);
+    // --- PATCH: PlayCanvas bug on iOS: forcibly wait for all assets before first render ---
+    let allLoaded = false;
+
+    const loader = new pc.AssetListLoader(Object.values(assets).filter(Boolean), app.assets);
     let lastProg = 0;
     assets.model.on('load', () => progressDialog.style.display = 'none');
     assets.model.on('error', err => {
@@ -173,6 +190,7 @@ export async function initializeViewer(config, instanceId) {
     }, 100);
 
     loader.load(async () => {
+      allLoaded = true;
       app.start();
       app.scene.envAtlas = assets.hdr.resource;
 
@@ -205,9 +223,11 @@ export async function initializeViewer(config, instanceId) {
       dirLight.setLocalEulerAngles(0, 0, 0);
       app.root.addChild(dirLight);
 
-      // Gallery GLB
+      // Gallery GLB (floor)
+      let galleryEntity = null;
       if (assets.galerie && assets.galerie.resource && assets.galerie.resource.instantiateRenderEntity) {
-        const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
+        galleryEntity = assets.galerie.resource.instantiateRenderEntity();
+        galleryEntity.enabled = true; // Ensure enabled at start
         app.root.addChild(galleryEntity);
       }
 
@@ -233,6 +253,7 @@ export async function initializeViewer(config, instanceId) {
           yawAngleMax: maxAzimuth,
           yawAngleMin: minAzimuth,
           minPivotY: minPivotY,
+          minY: minY,
           frameOnStart: false
         }
       });
@@ -253,6 +274,14 @@ export async function initializeViewer(config, instanceId) {
       });
       app.root.addChild(cameraEntity);
 
+      // --- iOS Black Screen Bug Fix: force at least one frame after all assets are loaded ---
+      // Wait for WebGL context to be ready before first render
+      app.once('frameupdate', () => {
+        if (!canvas.width || !canvas.height) {
+          app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+        }
+      });
+
       // Reset & constrain updates
       app.once('update', () => resetViewerCamera());
       app.on('update', dt => {
@@ -267,6 +296,10 @@ export async function initializeViewer(config, instanceId) {
       // Final resize
       app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
 
+      // --- Gallery GLB (floor) visibility bug on iPhone ---
+      // Defensive: never toggle galerie (floor) visibility on tooltip toggle!
+      // If you ever use tooltips code that disables/enables galleryEntity, remove it.
+
       // Tooltips
       try {
         const tooltipsModule = await import('./tooltips.js');
@@ -279,7 +312,7 @@ export async function initializeViewer(config, instanceId) {
           moveDuration: config.tooltipMoveDuration || 0.6
         });
       } catch (e) {
-        // Tooltips are optional
+        // Tooltips are optional; do nothing if failed
       }
 
       progressDialog.style.display = 'none';