Update viewer.js

viewer.js

@@ -15,30 +15,37 @@ let plyUrl, glbUrl;
 
 /**
  * initializeViewer(config, instanceId)
+ *
+ * - Dynamically imports PlayCanvas (once).
+ * - Creates a new <canvas id="canvas-<instanceId>"> inside the viewer container.
+ * - Sets up lights, model loading, camera + orbit controls, HDR, etc.
+ * - Exposes app, cameraEntity, modelEntity, so that interface.js can resize or reset.
+ * - Imports & initializes tooltip hotspots from tooltips.js.
  */
 export async function initializeViewer(config, instanceId) {
   if (viewerInitialized) return;
 
-  // Device detection
+  // Detect device type again (for camera coordinates & input sensitivity)
   const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-  // 1. Read all config values
+  // ─── 1. Read all relevant config values ───────────────────────────────────────
   plyUrl = config.ply_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;
+
+  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;
@@ -54,27 +61,30 @@ export async function initializeViewer(config, instanceId) {
   chosenCameraY = isMobile ? cameraYPhone : cameraY;
   chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
 
-  // 2. Grab DOM elements
-  const canvasId = 'canvas-' + instanceId;
-  const progressDialog    = document.getElementById('progress-dialog-' + instanceId);
+  // ─── 2. Grab DOM elements inside interface.js’s container ─────────────────────
+  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 viewerContainerElem = document.getElementById('viewer-container-' + instanceId);
 
-  // 3. Create <canvas>
+  // ─── 3. Create a fresh <canvas> (removing any old one) ────────────────────────
   let oldCanvas = document.getElementById(canvasId);
-  if (oldCanvas) oldCanvas.remove();
+  if (oldCanvas) {
+    oldCanvas.remove();
+  }
   const newCanvas = document.createElement('canvas');
   newCanvas.id = canvasId;
   newCanvas.className = 'ply-canvas';
   newCanvas.style.zIndex = "1";
-  viewerContainer.insertBefore(newCanvas, progressDialog);
+  viewerContainerElem.insertBefore(newCanvas, progressDialog);
   const canvas = newCanvas;
 
-  // 4. Wheel-zoom listener
+  // ─── 4. Add mouse‐wheel listener for zoom adjustments ────────────────────────
   canvas.addEventListener('wheel', function(e) {
     if (cameraEntity && cameraEntity.script && cameraEntity.script.orbitCamera) {
       const orbitCam = cameraEntity.script.orbitCamera;
       const sensitivity = (cameraEntity.script.orbitCameraInputMouse && cameraEntity.script.orbitCameraInputMouse.distanceSensitivity) || 0.4;
+
       if (cameraEntity.camera.projection === pc.PROJECTION_PERSPECTIVE) {
         orbitCam.distance -= e.deltaY * 0.01 * sensitivity * (orbitCam.distance * 0.1);
       } else {
@@ -87,14 +97,14 @@ export async function initializeViewer(config, instanceId) {
 
   progressDialog.style.display = 'block';
 
-  // 5. Import PlayCanvas
+  // ─── 5. Import PlayCanvas (only once) ─────────────────────────────────────────
   if (!pc) {
     pc = await import("https://esm.run/playcanvas");
     window.pc = pc;
   }
 
   try {
-    // 6. Create graphics device & app
+    // ─── 6. Create a GraphicsDevice + AppOptions ────────────────────────────────
     const deviceType = "webgl2";
     const gfxOptions = {
       deviceTypes: [deviceType],
@@ -110,7 +120,7 @@ export async function initializeViewer(config, instanceId) {
     createOptions.mouse = new pc.Mouse(canvas);
     createOptions.touch = new pc.TouchDevice(canvas);
 
-    // Physics & collision for picking
+    // ─── ADD: include physics systems for collision-based picking ───────────────
     createOptions.componentSystems = [
       pc.RenderComponentSystem,
       pc.CameraComponentSystem,
@@ -127,60 +137,69 @@ export async function initializeViewer(config, instanceId) {
       pc.GSplatHandler
     ];
 
+    // ─── REPLACED: use pc.Application (instead of deprecated / removed AppBase) ──
     app = new pc.Application(canvas, createOptions);
+
+    // Configure application
     app.setCanvasFillMode(pc.FILLMODE_NONE);
     app.setCanvasResolution(pc.RESOLUTION_AUTO);
     app.scene.exposure    = 0.5;
     app.scene.toneMapping = pc.TONEMAP_ACES;
 
-    // 7. Window resize → resizeCanvas
+    // ─── 7. Handle window‐resize for the PlayCanvas canvas ─────────────────────
     const resizeCanvas = () => {
-      if (app) app.resizeCanvas(canvas.clientWidth, canvas.clientHeight);
+      if (app) {
+        app.resizeCanvas(canvas.clientWidth, canvas.clientHeight);
+      }
     };
     window.addEventListener('resize', resizeCanvas);
     app.on('destroy', () => {
       window.removeEventListener('resize', resizeCanvas);
     });
 
-    // 8. Assets: PLY, orbit-camera.js, GLB, HDR
+    // ─── 8. Declare assets: PLY + orbit‐camera.js + GLB + HDR ───────────────────
     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" }),
+      orbit: new pc.Asset('script', 'script', { url: "./orbit-camera.js" }),
       galerie: new pc.Asset('galerie', 'container', { url: glbUrl }),
       hdr: new pc.Asset(
         'hdr',
         'texture',
-        { url: `https://huggingface.co/datasets/bilca/ply_files/resolve/main/galeries/blanc.png` },
+        { 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);
+    const assetListLoader = new pc.AssetListLoader(Object.values(assets), app.assets);
     let lastProgress = 0;
 
-    assets.model.on('load', () => { progressDialog.style.display = 'none'; });
-    assets.model.on('error', err => {
+    assets.model.on('load', () => {
+      progressDialog.style.display = 'none';
+    });
+    assets.model.on('error', (err) => {
       console.error("Error loading PLY file:", err);
-      progressDialog.innerHTML = `<p style="color: red">Error loading model: ${err}</p>`;
+      progressDialog.innerHTML = <p style="color: red">Error loading model: ${err}</p>;
     });
 
-    const progressChecker = setInterval(() => {
+    const checkProgress = () => {
       if (assets.model.resource) {
         progressIndicator.value = 100;
         clearInterval(progressChecker);
         progressDialog.style.display = 'none';
       } else if (assets.model.loading) {
-        lastProgress = Math.min(lastProgress + 2, 90);
+        lastProgress += 2;
+        if (lastProgress > 90) lastProgress = 90;
         progressIndicator.value = lastProgress;
       }
-    }, 100);
+    };
+    const progressChecker = setInterval(checkProgress, 100);
 
-    // 9. Build scene when loaded
-    loader.load(async () => {
+    // ─── 9. Once assets are loaded, build the scene ────────────────────────────
+    assetListLoader.load(async () => {
       app.start();
       app.scene.envAtlas = assets.hdr.resource;
 
-      // a) Model entity
+      // 9a. Create & position the model
       modelEntity = new pc.Entity('model');
       modelEntity.addComponent('gsplat', { asset: assets.model });
       modelEntity.setLocalPosition(modelX, modelY, modelZ);
@@ -188,7 +207,7 @@ export async function initializeViewer(config, instanceId) {
       modelEntity.setLocalScale(modelScale, modelScale, modelScale);
       app.root.addChild(modelEntity);
 
-      // b) Light
+      // 9b. Add a directional light
       const dirLight = new pc.Entity('Cascaded Light');
       dirLight.addComponent('light', {
         type:           'directional',
@@ -209,11 +228,11 @@ export async function initializeViewer(config, instanceId) {
       app.root.addChild(dirLight);
       dirLight.setLocalEulerAngles(0, 0, 0);
 
-      // c) GLB gallery
+      // 9c. Instantiate the GLB “gallery” if any
       const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
       app.root.addChild(galleryEntity);
 
-      // d) Camera + orbit scripts
+      // 9d. Create & configure the camera + orbit‐camera scripts
       cameraEntity = new pc.Entity('camera');
       cameraEntity.addComponent('camera', {
         clearColor: config.canvas_background
@@ -221,14 +240,16 @@ export async function initializeViewer(config, instanceId) {
           : 0,
         toneMapping: pc.TONEMAP_ACES
       });
+      // *** Set initial position/orientation from config immediately ***
       cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
       cameraEntity.lookAt(modelEntity.getPosition());
 
-      const distCheck = new pc.Vec3().sub2(
+      // Warn if camera is very far
+      const distanceCheck = new pc.Vec3().sub2(
         cameraEntity.getPosition(),
         modelEntity.getPosition()
       ).length();
-      if (distCheck > 100) {
+      if (distanceCheck > 100) {
         console.warn("Warning: Camera is far from model; it might not be visible");
       }
 
@@ -253,6 +274,7 @@ export async function initializeViewer(config, instanceId) {
           distanceSensitivity: isMobile ? 0.5 : 0.4
         }
       });
+      // Disable default onMouseWheel in orbitCameraInputMouse so we handle it ourselves
       if (cameraEntity.script.orbitCameraInputMouse) {
         cameraEntity.script.orbitCameraInputMouse.onMouseWheel = function() {};
       }
@@ -265,13 +287,15 @@ export async function initializeViewer(config, instanceId) {
 
       app.root.addChild(cameraEntity);
 
-      // Reset camera once before first frame
-      app.once('update', () => {
+      // ─── NEW: Ensure camera is reset on the first frame ───────────────────────
+      app.once('update', function() {
+        // Call existing resetViewerCamera() so that pivot, yaw/pitch, and distance get  
+        // recalculated correctly before the first render.
         resetViewerCamera();
       });
 
-      // Constrain Y
-      app.on('update', dt => {
+      // 9e. Constrain camera’s Y so it never dips below minY
+      app.on('update', function(dt) {
         if (cameraEntity) {
           const pos = cameraEntity.getPosition();
           if (pos.y < minY) {
@@ -280,19 +304,19 @@ export async function initializeViewer(config, instanceId) {
         }
       });
 
-      // Final canvas resize
-      app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+      // 9f. Resize canvas one last time to fit container
+      app.resizeCanvas(viewerContainerElem.clientWidth, viewerContainerElem.clientHeight);
 
-      // Tooltips module
+      // ─── NEW: Load & initialize the tooltips module ──────────────────────
       try {
         const tooltipsModule = await import('./tooltips.js');
         tooltipsModule.initializeTooltips({
           app,
           cameraEntity,
           modelEntity,
-          tooltipsUrl: config.points_url,
-          defaultVisible: !!config.showPointsDefault,
-          moveDuration: config.tooltipMoveDuration || 0.6
+          tooltipsUrl: config.tooltips_url,
+          defaultVisible: !!config.showTooltipsDefault,
+          moveDuration: config.tooltipMoveDuration || 0.6  // optional smooth‐move duration
         });
       } catch (e) {
         console.error("Error loading tooltips.js:", e);
@@ -304,8 +328,83 @@ export async function initializeViewer(config, instanceId) {
 
   } catch (error) {
     console.error("Error initializing PlayCanvas viewer:", error);
-    progressDialog.innerHTML = `<p style="color: red">Error loading viewer: ${error.message}</p>`;
+    progressDialog.innerHTML = <p style="color: red">Error loading viewer: ${error.message}</p>;
+  }
+}
+
+/**
+ * resetViewerCamera()
+ *
+ * Re‐centers the camera on the model, using the chosenCameraXYZ from config.
+ * Exactly the same math as in the old index.js‘s resetCamera().
+ */
+export function resetViewerCamera() {
+  try {
+    if (!cameraEntity || !modelEntity || !app) return;
+    const orbitCam = cameraEntity.script.orbitCamera;
+    if (!orbitCam) return;
+
+    const modelPos = modelEntity.getPosition();
+    // Create a temporary entity at chosenCameraX,Y,Z to compute yaw/pitch
+    const tempEntity = new pc.Entity();
+    tempEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+    tempEntity.lookAt(modelPos);
+
+    // Compute distance
+    const distance = new pc.Vec3().sub2(
+      new pc.Vec3(chosenCameraX, chosenCameraY, chosenCameraZ),
+      modelPos
+    ).length();
+
+    // Reposition camera
+    cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+    cameraEntity.lookAt(modelPos);
+
+    orbitCam.pivotPoint = new pc.Vec3(modelPos.x, modelPos.y, modelPos.z);
+    orbitCam._targetDistance = distance;
+    orbitCam._distance       = distance;
+
+    // Compute yaw & pitch from the “tempEntity”
+    const rotation = tempEntity.getRotation();
+    const tempForward = new pc.Vec3();
+    rotation.transformVector(pc.Vec3.FORWARD, tempForward);
+
+    const yaw = Math.atan2(-tempForward.x, -tempForward.z) * pc.math.RAD_TO_DEG;
+    const yawQuat = new pc.Quat().setFromEulerAngles(0, -yaw, 0);
+    const rotWithoutYaw = new pc.Quat().mul2(yawQuat, rotation);
+    const forwardWithoutYaw = new pc.Vec3();
+    rotWithoutYaw.transformVector(pc.Vec3.FORWARD, forwardWithoutYaw);
+    const pitch = Math.atan2(forwardWithoutYaw.y, -forwardWithoutYaw.z) * pc.math.RAD_TO_DEG;
+
+    orbitCam._targetYaw   = yaw;
+    orbitCam._yaw         = yaw;
+    orbitCam._targetPitch = pitch;
+    orbitCam._pitch       = pitch;
+    if (typeof orbitCam._updatePosition === 'function') {
+      orbitCam._updatePosition();
+    }
+
+    tempEntity.destroy();
+  } catch (error) {
+    console.error("Error resetting camera:", error);
   }
 }
 
-// ... resetViewerCamera() and cleanupViewer() unchanged ...
+/**
+ * cleanupViewer()
+ *
+ * Destroys the PlayCanvas app (if it exists) and clears references.  Called when the user clicks “X”.
+ */
+export function cleanupViewer() {
+  if (app) {
+    try {
+      app.destroy();
+    } catch (e) {
+      console.error("Error destroying PlayCanvas app:", e);
+    }
+    app = null;
+  }
+  cameraEntity   = null;
+  modelEntity    = null;
+  viewerInitialized = false;
+}