Update viewer.js

viewer.js

@@ -11,38 +11,38 @@ 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;
+let sogsUrl, glbUrl, canvasBg;
 
 export async function initializeViewer(config, instanceId) {
   if (viewerInitialized) return;
 
-  // ==== MOBILE DETECTION EXACTLY AS IN PLY VIEWER ====
-  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
+  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-  // ==== ASSET URLS (SOGS/GSPLAT INSTEAD OF PLY) ====
-  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;
+  // 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;
   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;
+  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);
@@ -51,10 +51,10 @@ export async function initializeViewer(config, instanceId) {
   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);
 
   let oldCanvas = document.getElementById(canvasId);
   if (oldCanvas) oldCanvas.remove();
@@ -67,6 +67,9 @@ export async function initializeViewer(config, instanceId) {
   canvas.setAttribute('tabindex', '0');
   viewerContainer.insertBefore(canvas, progressDialog);
 
+  // Apply background color from config if present
+  canvas.style.background = canvasBg;
+
   canvas.style.touchAction = "none";
   canvas.style.webkitTouchCallout = "none";
   canvas.addEventListener('gesturestart', e => e.preventDefault());
@@ -75,22 +78,23 @@ export async function initializeViewer(config, instanceId) {
   canvas.addEventListener('dblclick', e => e.preventDefault());
   canvas.addEventListener('touchstart', e => { if (e.touches.length > 1) e.preventDefault(); }, { passive: false });
 
-  // Mouse wheel suppression to canvas only
+  // --- Mouse wheel suppression
   canvas.addEventListener('wheel', (e) => {
-    e.preventDefault();
+    e.preventDefault(); // Only block page scroll if mouse is over viewer
   }, { passive: false });
 
   progressDialog.style.display = 'block';
 
   if (!pc) {
-    pc = await import("https://esm.run/playcanvas");
+    pc = await import("https://cdn.jsdelivr.net/npm/playcanvas@latest/+esm"); // always use latest for SOGS/GSplat support
     window.pc = pc;
   }
 
-  // === EXACT iOS/Android/Windows HANDLING AS WORKING PLY VIEWER ===
+  // Create app and graphics device
   const device = await pc.createGraphicsDevice(canvas, {
-    glslangUrl: "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
-    twgslUrl: "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
+    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",
     antialias: false
   });
   device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
@@ -104,6 +108,7 @@ export async function initializeViewer(config, instanceId) {
     pc.CameraComponentSystem,
     pc.LightComponentSystem,
     pc.ScriptComponentSystem,
+    // "GSplat" component supports SOGS and GSplat
     pc.GSplatComponentSystem,
     pc.CollisionComponentSystem,
     pc.RigidbodyComponentSystem
@@ -112,6 +117,7 @@ export async function initializeViewer(config, instanceId) {
     pc.TextureHandler,
     pc.ContainerHandler,
     pc.ScriptHandler,
+    // GSplatHandler handles GSplat and SOGS
     pc.GSplatHandler
   ];
 
@@ -129,9 +135,9 @@ export async function initializeViewer(config, instanceId) {
   window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
   app.on('destroy', () => resizeObserver.disconnect());
 
-  // === SOGS (not PLY) asset ===
+  // Prepare asset loading (SOGS as 'gsplat')
   const assets = {
-    model: new pc.Asset('gsplat', 'gsplat', { url: sogsUrl }),
+    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 }),
   };
@@ -142,36 +148,42 @@ export async function initializeViewer(config, instanceId) {
     app.start();
     progressDialog.style.display = 'none';
 
-    // Add GSplat model
+    // Add SOGS model
     modelEntity = new pc.Entity('model');
-    modelEntity.addComponent('gsplat', { asset: assets.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 ---
+    // Add the GLB entity if provided
     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');
-    // Default background color (white) or config value
-    let bgColor = new pc.Color(1, 1, 1, 1);
-    if (config.canvas_background && /^#[A-Fa-f0-9]{6}$/.test(config.canvas_background)) {
-      let hex = config.canvas_background.replace("#", "");
-      bgColor = new pc.Color(
-        parseInt(hex.substr(0,2),16)/255,
-        parseInt(hex.substr(2,2),16)/255,
-        parseInt(hex.substr(4,2),16)/255
-      );
+    // 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: bgColor });
+    cameraEntity.addComponent('camera', { clearColor: new pc.Color(bg[0], bg[1], bg[2], bg[3]) });
     cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
     cameraEntity.lookAt(modelEntity.getPosition());
     cameraEntity.addComponent('script');
 
+    // Pass all attributes to Orbit Camera script
     cameraEntity.script.create('orbitCamera', {
       attributes: {
         focusEntity: modelEntity,
@@ -194,7 +206,7 @@ export async function initializeViewer(config, instanceId) {
 
     app.once('update', () => resetViewerCamera());
 
-    // Tooltips supported if tooltips_url set
+    // Tooltips support (optional)
     try {
       if (config.tooltips_url) {
         import('https://mikafil-viewer-sgos.static.hf.space/tooltips.js').then(tooltipsModule => {
@@ -214,6 +226,7 @@ export async function initializeViewer(config, instanceId) {
   });
 }
 
+// Resets the viewer camera (as in your PLY example)
 export function resetViewerCamera() {
   try {
     if (!cameraEntity || !modelEntity || !app) return;