Update viewer.js

viewer.js

@@ -1,6 +1,7 @@
 // viewer.js
-// Modern PlayCanvas GSplat/SOGS Viewer
-let pc;            
+// ==============================
+
+let pc;
 export let app = null;
 let cameraEntity = null;
 let modelEntity = null;
@@ -10,56 +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, canvasBg;
 
-// Main SOGS meta.json URL
-let sogsUrl;
-
-// == MAIN ENTRY POINT ==
 export async function initializeViewer(config, instanceId) {
   if (viewerInitialized) return;
 
-  // --- PlayCanvas: dynamically import from esm.run ---
-  if (!pc) {
-    try {
-      pc = await import("https://esm.run/playcanvas");
-      window.pc = pc; // for debugging
-    } catch (e) {
-      alert('Failed to load PlayCanvas engine from esm.run: ' + e);
-      return;
-    }
-  }
-
-  // -- Device type detection --
   const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-  // -- Get config values --
-  sogsUrl = config.sogs_json_url;
-  if (!sogsUrl) {
-    alert('Missing SOGS (meta.json) URL in config.sogs_json_url.');
-    return;
-  }
-
-  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);
@@ -68,16 +51,14 @@ export async function initializeViewer(config, instanceId) {
   chosenCameraY = isMobile ? cameraYPhone : cameraY;
   chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
 
-  // -- DOM Elements --
-  const canvasId = 'canvas-' + instanceId;
-  const progressDialog = document.getElementById('progress-dialog-' + 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 old canvas if any
   let oldCanvas = document.getElementById(canvasId);
   if (oldCanvas) oldCanvas.remove();
 
-  // Create and add canvas
   const canvas = document.createElement('canvas');
   canvas.id = canvasId;
   canvas.className = 'ply-canvas';
@@ -85,6 +66,10 @@ export async function initializeViewer(config, instanceId) {
   canvas.style.height = "100%";
   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());
@@ -92,48 +77,51 @@ export async function initializeViewer(config, instanceId) {
   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 });
-  canvas.addEventListener('wheel', (e) => { e.preventDefault(); }, { passive: false });
+
+  // --- Mouse wheel suppression
+  canvas.addEventListener('wheel', (e) => {
+    e.preventDefault(); // Only block page scroll if mouse is over viewer
+  }, { passive: false });
 
   progressDialog.style.display = 'block';
 
-  // --- PlayCanvas Graphics Device ---
-  let device;
-  try {
-    device = await pc.createGraphicsDevice(canvas, {
-      deviceTypes: ["webgl2"],
-      antialias: false,
-      glslangUrl: "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
-      twgslUrl: "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js"
-    });
-    device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
-  } catch (e) {
-    alert('Failed to create PlayCanvas GraphicsDevice: ' + e);
-    return;
+  if (!pc) {
+    pc = await import("https://cdn.jsdelivr.net/npm/playcanvas@latest/+esm"); // always use latest for SOGS/GSplat support
+    window.pc = pc;
   }
 
-  // --- PlayCanvas AppBase (modern) ---
-  let appOpts = new pc.AppOptions();
-  appOpts.graphicsDevice = device;
-  appOpts.mouse = new pc.Mouse(canvas);
-  appOpts.touch = new pc.TouchDevice(canvas);
-  appOpts.componentSystems = [
+  // 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",
+    antialias: false
+  });
+  device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
+
+  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
+    // "GSplat" component supports SOGS and GSplat
+    pc.GSplatComponentSystem,
+    pc.CollisionComponentSystem,
+    pc.RigidbodyComponentSystem
   ];
-  appOpts.resourceHandlers = [
+  opts.resourceHandlers = [
     pc.TextureHandler,
     pc.ContainerHandler,
     pc.ScriptHandler,
+    // GSplatHandler handles GSplat and SOGS
     pc.GSplatHandler
   ];
 
-  app = new pc.AppBase(canvas);
-  app.init(appOpts);
-
-  // Fill/resize
+  app = new pc.Application(canvas, opts);
   app.setCanvasFillMode(pc.FILLMODE_NONE);
   app.setCanvasResolution(pc.RESOLUTION_AUTO);
 
@@ -147,11 +135,11 @@ export async function initializeViewer(config, instanceId) {
   window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
   app.on('destroy', () => resizeObserver.disconnect());
 
-  // --- Assets: GSplat model + orbit camera script ---
+  // Prepare asset loading (SOGS as 'gsplat')
   const assets = {
-    model: new pc.Asset('gsplat', 'gsplat', { url: sogsUrl }),
-    orbit: new pc.Asset('orbit', 'script', { url: "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js" })
-    // Optionally add others if needed
+    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 }),
   };
   for (const key in assets) app.assets.add(assets[key]);
 
@@ -160,22 +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);
 
-    // --- Camera ---
+    // 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');
-    cameraEntity.addComponent('camera', {
-      clearColor: new pc.Color(1, 1, 1, 1)
-    });
+    // 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]) });
     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,
@@ -195,12 +203,13 @@ export async function initializeViewer(config, instanceId) {
     app.root.addChild(cameraEntity);
 
     app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+
     app.once('update', () => resetViewerCamera());
 
-    // --- Tooltips (optional) ---
+    // Tooltips support (optional)
     try {
       if (config.tooltips_url) {
-        import('./tooltips.js').then(tooltipsModule => {
+        import('https://mikafil-viewer-sgos.static.hf.space/tooltips.js').then(tooltipsModule => {
           tooltipsModule.initializeTooltips({
             app,
             cameraEntity,
@@ -217,7 +226,7 @@ export async function initializeViewer(config, instanceId) {
   });
 }
 
-// --- Reset camera helper ---
+// Resets the viewer camera (as in your PLY example)
 export function resetViewerCamera() {
   try {
     if (!cameraEntity || !modelEntity || !app) return;
@@ -239,7 +248,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();
@@ -252,10 +261,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();