Update viewer.js

viewer.js

@@ -1,283 +1,246 @@
 // viewer.js
-// ==============================
+// Modern PlayCanvas 2.8.1+ with SOGS/GSplat
+import * as pc from 'https://cdn.jsdelivr.net/npm/playcanvas@2.8.1/build/playcanvas.module.js';
 
-let pc;
 export let app = null;
 let cameraEntity = null;
 let modelEntity = null;
 let viewerInitialized = false;
 let resizeObserver = null;
 
+// Camera and model params
 let chosenCameraX, chosenCameraY, chosenCameraZ;
 let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minPivotY, minY;
 let modelX, modelY, modelZ, modelScale, modelRotationX, modelRotationY, modelRotationZ;
-let sogsJsonUrl;
 
 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);
-
-  sogsJsonUrl = config.sogs_json_url;
-  if (!sogsJsonUrl) {
-    alert('Missing config.sogs_json_url for SOGS/webp loading.');
-    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;
-  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);
-
-  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);
-
-  let oldCanvas = document.getElementById(canvasId);
-  if (oldCanvas) oldCanvas.remove();
-
-  const canvas = document.createElement('canvas');
-  canvas.id = canvasId;
-  canvas.className = 'ply-canvas';
-  canvas.style.width = "100%";
-  canvas.style.height = "100%";
-  canvas.setAttribute('tabindex', '0');
-  viewerContainer.insertBefore(canvas, progressDialog);
-
-  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 });
-  canvas.addEventListener('wheel', (e) => { e.preventDefault(); }, { passive: false });
-
-  progressDialog.style.display = 'block';
-
-  if (!pc) {
-    pc = await import("https://cdn.jsdelivr.net/npm/playcanvas/build/playcanvas.module.min.js");
-    window.pc = pc;
-  }
-
-  // Create PlayCanvas app
-  const device = await pc.createGraphicsDevice(canvas, {
-    deviceTypes: ["webgl2"],
-    glslangUrl: "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
-    twgslUrl: "https://playcanvas.vercel.app/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.CollisionComponentSystem,
-    pc.RigidbodyComponentSystem
-  ];
-  opts.resourceHandlers = [
-    pc.TextureHandler,
-    pc.ContainerHandler,
-    pc.ScriptHandler
-  ];
-
-  app = new pc.Application(canvas, opts);
-  app.setCanvasFillMode(pc.FILLMODE_NONE);
-  app.setCanvasResolution(pc.RESOLUTION_AUTO);
-
-  resizeObserver = new ResizeObserver(entries => {
-    entries.forEach(entry => {
-      app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
-    });
-  });
-  resizeObserver.observe(viewerContainer);
-
-  window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
-  app.on('destroy', () => resizeObserver.disconnect());
-
-  // Load orbit camera scripts and gsplat script
-  const orbitAsset = new pc.Asset('orbit', 'script', { url: "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js" });
-  app.assets.add(orbitAsset);
-  const gsplatAsset = new pc.Asset('gsplat', 'script', { url: "https://mikafil-viewer-sgos.static.hf.space/gsplat.js" }); // If using relative URL
-
-  app.assets.add(gsplatAsset);
-
-  // Fetch SOGS meta.json and webp textures
-  let sogsData, sogsTextures = {};
-  try {
-    const jsonResp = await fetch(sogsJsonUrl);
-    sogsData = await jsonResp.json();
-
-    // Parse meta to get file list
-    let meta = sogsData;
-    let filesSet = new Set();
-    if (meta.means && meta.means.files) meta.means.files.forEach(f => filesSet.add(f));
-    if (meta.scales && meta.scales.files) meta.scales.files.forEach(f => filesSet.add(f));
-    if (meta.quats && meta.quats.files) meta.quats.files.forEach(f => filesSet.add(f));
-    if (meta.sh0 && meta.sh0.files) meta.sh0.files.forEach(f => filesSet.add(f));
-
-    // For each, fetch as a Texture
-    let baseUrl = sogsJsonUrl.split('/').slice(0, -1).join('/');
-    for (let fname of filesSet) {
-      let url = fname.startsWith('http') ? fname : `${baseUrl}/${fname}`;
-      // Use PlayCanvas Texture Asset
-      sogsTextures[fname] = await new Promise((resolve, reject) => {
-        const asset = new pc.Asset(fname, 'texture', { url });
-        app.assets.add(asset);
-        asset.ready(() => resolve(asset.resource));
-        asset.on('error', reject);
-        app.assets.load(asset);
-      });
+    if (viewerInitialized) return;
+
+    // Params
+    const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
+    const isMobile = isIOS || /Android/i.test(navigator.userAgent);
+
+    // URLs and config
+    const sogsUrl = config.sogs_json_url;
+    if (!sogsUrl) {
+        alert('Missing SOGS (meta.json) URL in config.sogs_json_url.');
+        return;
     }
-  } catch (e) {
-    progressDialog.style.display = 'none';
-    alert("Failed to load SOGS JSON/images: " + e.message);
-    throw e;
-  }
-
-  // Continue after both scripts loaded
-  orbitAsset.ready(() => {
-    gsplatAsset.ready(() => {
-      app.start();
-      progressDialog.style.display = 'none';
-
-      // Add GSplat entity and script
-      modelEntity = new pc.Entity('model');
-      modelEntity.addComponent('script');
-      modelEntity.script.create('gsplat', {
-        attributes: {
-          sogsData: sogsData,
-          textures: sogsTextures
-        }
-      });
-
-      modelEntity.setLocalPosition(modelX, modelY, modelZ);
-      modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
-      modelEntity.setLocalScale(modelScale, modelScale, modelScale);
-      app.root.addChild(modelEntity);
-
-      // Camera entity
-      cameraEntity = new pc.Entity('camera');
-      cameraEntity.addComponent('camera', { clearColor: new pc.Color(1, 1, 1, 1) });
-      cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-      cameraEntity.lookAt(modelEntity.getPosition());
-      cameraEntity.addComponent('script');
-      cameraEntity.script.create('orbitCamera', {
-        attributes: {
-          focusEntity: modelEntity,
-          inertiaFactor: 0.2,
-          distanceMax: maxZoom,
-          distanceMin: minZoom,
-          pitchAngleMax: maxAngle,
-          pitchAngleMin: minAngle,
-          yawAngleMax: maxAzimuth,
-          yawAngleMin: minAzimuth,
-          minY: minY,
-          frameOnStart: false
-        }
-      });
-      cameraEntity.script.create('orbitCameraInputMouse');
-      cameraEntity.script.create('orbitCameraInputTouch');
-      app.root.addChild(cameraEntity);
-
-      app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-      app.once('update', () => resetViewerCamera());
-
-      // Optional: tooltips
-      try {
-        if (config.tooltips_url) {
-          import('https://mikafil-viewer-sgos.static.hf.space/tooltips.js').then(tooltipsModule => {
-            tooltipsModule.initializeTooltips({
-              app,
-              cameraEntity,
-              modelEntity,
-              tooltipsUrl: config.tooltips_url,
-              defaultVisible: !!config.showTooltipsDefault,
-              moveDuration: config.tooltipMoveDuration || 0.6
-            });
-          }).catch(e => {});
-        }
-      } catch (e) {}
-
-      viewerInitialized = true;
+
+    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);
+
+    chosenCameraX = isMobile ? cameraXPhone : cameraX;
+    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);
+
+    // 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';
+    canvas.style.width = "100%";
+    canvas.style.height = "100%";
+    canvas.setAttribute('tabindex', '0');
+    viewerContainer.insertBefore(canvas, progressDialog);
+    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 });
+    canvas.addEventListener('wheel', (e) => { e.preventDefault(); }, { passive: false });
+
+    progressDialog.style.display = 'block';
+
+    // --- PlayCanvas Graphics Device ---
+    const 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);
+
+    // --- PlayCanvas AppBase (modern, 2.8.1+) ---
+    const appOpts = new pc.AppOptions();
+    appOpts.graphicsDevice = device;
+    appOpts.mouse = new pc.Mouse(canvas);
+    appOpts.touch = new pc.TouchDevice(canvas);
+    appOpts.componentSystems = [
+        pc.RenderComponentSystem,
+        pc.CameraComponentSystem,
+        pc.LightComponentSystem,
+        pc.ScriptComponentSystem,
+        pc.GSplatComponentSystem
+    ];
+    appOpts.resourceHandlers = [
+        pc.TextureHandler,
+        pc.ContainerHandler,
+        pc.ScriptHandler,
+        pc.GSplatHandler
+    ];
+
+    app = new pc.AppBase(canvas);
+    app.init(appOpts);
+
+    // Fill/resize
+    app.setCanvasFillMode(pc.FILLMODE_NONE);
+    app.setCanvasResolution(pc.RESOLUTION_AUTO);
+
+    resizeObserver = new ResizeObserver(entries => {
+        entries.forEach(entry => {
+            app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
+        });
+    });
+    resizeObserver.observe(viewerContainer);
+
+    window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
+    app.on('destroy', () => resizeObserver.disconnect());
+
+    // --- ASSETS (GSplat + Orbit camera) ---
+    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 other assets here if you want
+    };
+    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';
+
+        // --- Add GSplat Model ---
+        modelEntity = new pc.Entity('model');
+        modelEntity.addComponent('gsplat', { asset: assets.model });
+        modelEntity.setLocalPosition(modelX, modelY, modelZ);
+        modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
+        modelEntity.setLocalScale(modelScale, modelScale, modelScale);
+        app.root.addChild(modelEntity);
+
+        // --- Camera ---
+        cameraEntity = new pc.Entity('camera');
+        cameraEntity.addComponent('camera', {
+            clearColor: new pc.Color(1, 1, 1, 1)
+        });
+        cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+        cameraEntity.lookAt(modelEntity.getPosition());
+        cameraEntity.addComponent('script');
+        cameraEntity.script.create('orbitCamera', {
+            attributes: {
+                focusEntity: modelEntity,
+                inertiaFactor: 0.2,
+                distanceMax: maxZoom,
+                distanceMin: minZoom,
+                pitchAngleMax: maxAngle,
+                pitchAngleMin: minAngle,
+                yawAngleMax: maxAzimuth,
+                yawAngleMin: minAzimuth,
+                minY: minY,
+                frameOnStart: false
+            }
+        });
+        cameraEntity.script.create('orbitCameraInputMouse');
+        cameraEntity.script.create('orbitCameraInputTouch');
+        app.root.addChild(cameraEntity);
+
+        app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+        app.once('update', () => resetViewerCamera());
+
+        // --- Tooltips ---
+        try {
+            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 => {});
+            }
+        } catch (e) {}
+
+        viewerInitialized = true;
     });
-    app.assets.load(gsplatAsset);
-  });
-  app.assets.load(orbitAsset);
 }
 
 // Reset camera helper
 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();
-
-    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;
-    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;
-
-    orbitCam._targetYaw   = yaw;
-    orbitCam._yaw         = yaw;
-    orbitCam._targetPitch = pitch;
-    orbitCam._pitch       = pitch;
-    if (orbitCam._updatePosition) orbitCam._updatePosition();
-
-    tempEnt.destroy();
-  } catch (e) {}
+    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();
+
+        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;
+        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;
+
+        orbitCam._targetYaw = yaw;
+        orbitCam._yaw = yaw;
+        orbitCam._targetPitch = pitch;
+        orbitCam._pitch = pitch;
+        if (orbitCam._updatePosition) orbitCam._updatePosition();
+
+        tempEnt.destroy();
+    } catch (e) {
+        // Silent fail
+    }
 }