Update viewer.js

viewer.js

@@ -11,94 +11,131 @@ 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 sogsUrl, glbUrl, canvasBg;
+let sogsUrl, glbUrl;
+
+function getColorFromHexOrString(value, fallback) {
+  if (!value) return fallback;
+  try {
+    // If value is hex (e.g. "#FFFFFF")
+    if (value.startsWith("#")) {
+      // Remove # and convert to rgb
+      let hex = value.replace("#", "");
+      if (hex.length === 3) {
+        hex = hex.split("").map((c) => c + c).join("");
+      }
+      if (hex.length !== 6) return fallback;
+      const num = parseInt(hex, 16);
+      return new pc.Color(
+        ((num >> 16) & 255) / 255,
+        ((num >> 8) & 255) / 255,
+        (num & 255) / 255
+      );
+    } else {
+      // Try parsing as CSS color string (not supported by pc.Color)
+      return fallback;
+    }
+  } catch {
+    return fallback;
+  }
+}
 
 export async function initializeViewer(config, instanceId) {
   if (viewerInitialized) return;
 
-  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
-  const isMobile = isIOS || /Android/i.test(navigator.userAgent);
-
-  // Parse config fields
-  sogsUrl   = config.sogs_json_url;
-  glbUrl    = config.glb_url;
-  canvasBg  = config.canvas_background || "#ffffff";
-  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;
+  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+  const isAndroid = /Android/i.test(navigator.userAgent);
+  const isMobile = isIOS || isAndroid;
+
+  sogsUrl = config.sogs_json_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);
+  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;
 
-  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 canvasId = "canvas-" + instanceId;
+  const progressDialog = document.getElementById("progress-dialog-" + instanceId);
+  const progressIndicator = document.getElementById("progress-indicator-" + instanceId);
+  const viewerContainer = document.getElementById("viewer-container-" + instanceId);
 
+  // Remove existing canvas if any
   let oldCanvas = document.getElementById(canvasId);
   if (oldCanvas) oldCanvas.remove();
 
-  const canvas = document.createElement('canvas');
+  const canvas = document.createElement("canvas");
   canvas.id = canvasId;
-  canvas.className = 'ply-canvas';
+  canvas.className = "ply-canvas";
   canvas.style.width = "100%";
   canvas.style.height = "100%";
-  canvas.setAttribute('tabindex', '0');
+  canvas.setAttribute("tabindex", "0");
   viewerContainer.insertBefore(canvas, progressDialog);
 
-  // Apply background color from config if present
-  canvas.style.background = canvasBg;
-
+  // Touch-action policies (for iOS and general mobile)
   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 });
-
-  // --- Mouse wheel suppression
-  canvas.addEventListener('wheel', (e) => {
-    e.preventDefault(); // Only block page scroll if mouse is over viewer
+  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';
+  // Prevent scrolling/zooming the page while interacting with canvas
+  canvas.addEventListener("wheel", (e) => {
+    e.preventDefault();
+  }, { passive: false });
+
+  progressDialog.style.display = "block";
 
   if (!pc) {
-    pc = await import("https://cdn.jsdelivr.net/npm/playcanvas@latest/+esm"); // always use latest for SOGS/GSplat support
+    pc = await import("https://esm.run/playcanvas");
     window.pc = pc;
   }
 
-  // Create app and graphics device
-  const device = await pc.createGraphicsDevice(canvas, {
-    deviceTypes: ["webgl2"],
-    glslangUrl: "https://mikafil-viewer-sgos.static.hf.space/static/lib/glslang/glslang.js",
-    twgslUrl:   "https://mikafil-viewer-sgos.static.hf.space/static/lib/twgsl/twgsl.js",
+  // Fix for iOS context loss / restore: Try to always use 'webgl2' and fall back if fails
+  let device;
+  let gfxOptions = {
+    deviceTypes: ["webgl2", "webgl1"],
+    glslangUrl: "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
+    twgslUrl: "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
     antialias: false
-  });
+  };
+
+  try {
+    device = await pc.createGraphicsDevice(canvas, gfxOptions);
+  } catch (e) {
+    // Fallback for strict iOS devices that might have context issues
+    gfxOptions.deviceTypes = ["webgl1"];
+    device = await pc.createGraphicsDevice(canvas, gfxOptions);
+  }
   device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
 
+  // App options: Always use canvas for input to avoid iOS weirdness
   const opts = new pc.AppOptions();
   opts.graphicsDevice = device;
   opts.mouse = new pc.Mouse(canvas);
@@ -108,7 +145,6 @@ export async function initializeViewer(config, instanceId) {
     pc.CameraComponentSystem,
     pc.LightComponentSystem,
     pc.ScriptComponentSystem,
-    // "GSplat" component supports SOGS and GSplat
     pc.GSplatComponentSystem,
     pc.CollisionComponentSystem,
     pc.RigidbodyComponentSystem
@@ -117,7 +153,6 @@ export async function initializeViewer(config, instanceId) {
     pc.TextureHandler,
     pc.ContainerHandler,
     pc.ScriptHandler,
-    // GSplatHandler handles GSplat and SOGS
     pc.GSplatHandler
   ];
 
@@ -125,6 +160,14 @@ export async function initializeViewer(config, instanceId) {
   app.setCanvasFillMode(pc.FILLMODE_NONE);
   app.setCanvasResolution(pc.RESOLUTION_AUTO);
 
+  // Set background color (from config if available)
+  let bgColor = new pc.Color(1, 1, 1, 1); // Default: white
+  if (config.canvas_background) {
+    const bgCol = getColorFromHexOrString(config.canvas_background, null);
+    if (bgCol) bgColor = bgCol;
+  }
+
+  // Use ResizeObserver to track viewerContainer size
   resizeObserver = new ResizeObserver(entries => {
     entries.forEach(entry => {
       app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
@@ -132,59 +175,51 @@ export async function initializeViewer(config, instanceId) {
   });
   resizeObserver.observe(viewerContainer);
 
-  window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
-  app.on('destroy', () => resizeObserver.disconnect());
+  // Additional resize handler for global changes
+  window.addEventListener("resize", () => {
+    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+  });
+  app.on("destroy", () => resizeObserver.disconnect());
 
-  // Prepare asset loading (SOGS as 'gsplat')
+  // Load assets: SOGS model (meta.json) and GLB (if any)
   const assets = {
-    sogs: new pc.Asset('gsplat', 'gsplat', { url: sogsUrl }),
-    orbit: new pc.Asset('script', 'script', { url: "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js" }),
-    glb: new pc.Asset('glb', 'container', { url: glbUrl }),
+    sogs: new pc.Asset("sogs", "gsplat", { url: sogsUrl }),
+    orbit: new pc.Asset("script", "script", { url: "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js" }),
+    glb: new pc.Asset("glb", "container", { url: glbUrl })
   };
   for (const key in assets) app.assets.add(assets[key]);
 
   const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
   loader.load(() => {
     app.start();
-    progressDialog.style.display = 'none';
+    progressDialog.style.display = "none";
 
-    // Add SOGS model
-    modelEntity = new pc.Entity('model');
-    modelEntity.addComponent('gsplat', { asset: assets.sogs });
+    // Add SOGS/GSplat model entity
+    modelEntity = new pc.Entity("model");
+    modelEntity.addComponent("gsplat", { asset: assets.sogs });
     modelEntity.setLocalPosition(modelX, modelY, modelZ);
     modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
     modelEntity.setLocalScale(modelScale, modelScale, modelScale);
     app.root.addChild(modelEntity);
 
-    // Add the GLB entity if provided
+    // Optionally add GLB entity
     if (assets.glb && assets.glb.resource && assets.glb.resource.instantiateRenderEntity) {
       const glbEntity = assets.glb.resource.instantiateRenderEntity();
       app.root.addChild(glbEntity);
     }
 
-    // CAMERA
-    cameraEntity = new pc.Entity('camera');
-    // Support background color
-    let bg = [1, 1, 1, 1];
-    if (canvasBg && /^#?[0-9a-f]{6,8}$/i.test(canvasBg.replace("#", ""))) {
-      // convert hex color to [r,g,b,a]
-      let hex = canvasBg.replace("#", "");
-      if (hex.length === 6) hex += "FF";
-      const num = parseInt(hex, 16);
-      bg = [
-        ((num >> 24) & 0xFF) / 255,
-        ((num >> 16) & 0xFF) / 255,
-        ((num >> 8)  & 0xFF) / 255,
-        (num & 0xFF) / 255
-      ];
-    }
-    cameraEntity.addComponent('camera', { clearColor: new pc.Color(bg[0], bg[1], bg[2], bg[3]) });
+    // Set up camera entity and orbit controls
+    cameraEntity = new pc.Entity("camera");
+    cameraEntity.addComponent("camera", {
+      clearColor: bgColor,
+      clearColorBuffer: true,
+      // toneMapping: pc.TONEMAP_ACES, // optionally for realistic look
+    });
     cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
     cameraEntity.lookAt(modelEntity.getPosition());
-    cameraEntity.addComponent('script');
+    cameraEntity.addComponent("script");
 
-    // Pass all attributes to Orbit Camera script
-    cameraEntity.script.create('orbitCamera', {
+    cameraEntity.script.create("orbitCamera", {
       attributes: {
         focusEntity: modelEntity,
         inertiaFactor: 0.2,
@@ -198,18 +233,18 @@ export async function initializeViewer(config, instanceId) {
         frameOnStart: false
       }
     });
-    cameraEntity.script.create('orbitCameraInputMouse');
-    cameraEntity.script.create('orbitCameraInputTouch');
+    cameraEntity.script.create("orbitCameraInputMouse");
+    cameraEntity.script.create("orbitCameraInputTouch");
     app.root.addChild(cameraEntity);
 
     app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
 
-    app.once('update', () => resetViewerCamera());
+    app.once("update", () => resetViewerCamera());
 
-    // Tooltips support (optional)
+    // Tooltips support
     try {
       if (config.tooltips_url) {
-        import('https://mikafil-viewer-sgos.static.hf.space/tooltips.js').then(tooltipsModule => {
+        import("https://mikafil-viewer-sgos.static.hf.space/tooltips.js").then(tooltipsModule => {
           tooltipsModule.initializeTooltips({
             app,
             cameraEntity,
@@ -218,7 +253,7 @@ export async function initializeViewer(config, instanceId) {
             defaultVisible: !!config.showTooltipsDefault,
             moveDuration: config.tooltipMoveDuration || 0.6
           });
-        }).catch(e => {});
+        }).catch(() => {});
       }
     } catch (e) {}
 
@@ -226,7 +261,6 @@ export async function initializeViewer(config, instanceId) {
   });
 }
 
-// Resets the viewer camera (as in your PLY example)
 export function resetViewerCamera() {
   try {
     if (!cameraEntity || !modelEntity || !app) return;
@@ -248,7 +282,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();
@@ -261,10 +295,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;
     if (orbitCam._updatePosition) orbitCam._updatePosition();
 
     tempEnt.destroy();