Update viewer.js

viewer.js

@@ -165,7 +165,7 @@ export async function initializeViewer(config, instanceId) {
       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 }
       )
     };
@@ -178,7 +178,7 @@ export async function initializeViewer(config, instanceId) {
     });
     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 checkProgress = () => {
@@ -255,59 +255,32 @@ export async function initializeViewer(config, instanceId) {
 
       cameraEntity.addComponent('script');
       cameraEntity.script.create('orbitCamera', {
-        attributes: {
-          inertiaFactor: 0.2,
-          focusEntity:   modelEntity,
-          distanceMax:   maxZoom,
-          distanceMin:   minZoom,
-          pitchAngleMax: maxAngle,
-          pitchAngleMin: minAngle,
-          yawAngleMax:   maxAzimuth,
-          yawAngleMin:   minAzimuth,
-          minPivotY:     minPivotY,
-          frameOnStart:  false
-        }
+        attributes: { inertiaFactor: 0.2, focusEntity: modelEntity, distanceMax: maxZoom, distanceMin: minZoom, pitchAngleMax: maxAngle, pitchAngleMin: minAngle, yawAngleMax: maxAzimuth, yawAngleMin: minAzimuth, minPivotY, frameOnStart: false }
       });
       cameraEntity.script.create('orbitCameraInputMouse', {
-        attributes: {
-          orbitSensitivity: isMobile ? 0.6 : 0.3,
-          distanceSensitivity: isMobile ? 0.5 : 0.4
-        }
+        attributes: { orbitSensitivity: isMobile ? 0.6 : 0.3, 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() {};
       }
       cameraEntity.script.create('orbitCameraInputTouch', {
-        attributes: {
-          orbitSensitivity: 0.6,
-          distanceSensitivity: 0.5
-        }
+        attributes: { orbitSensitivity: 0.6, distanceSensitivity: 0.5 }
       });
-
       app.root.addChild(cameraEntity);
 
-      // ─── 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();
-      });
+      // Ensure camera is reset on the first frame
+      app.once('update', () => resetViewerCamera());
 
-      // 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) {
-            cameraEntity.setPosition(pos.x, minY, pos.z);
-          }
-        }
+      // Constrain camera’s Y so it never dips below minY
+      app.on('update', dt => {
+        const pos = cameraEntity.getPosition();
+        if (pos.y < minY) cameraEntity.setPosition(pos.x, minY, pos.z);
       });
 
-      // 9f. Resize canvas one last time to fit container
+      // Final resize
       app.resizeCanvas(viewerContainerElem.clientWidth, viewerContainerElem.clientHeight);
 
-      // ─── NEW: Load & initialize the tooltips module ──────────────────────
+      // Initialize tooltips
       try {
         const tooltipsModule = await import('./tooltips.js');
         tooltipsModule.initializeTooltips({
@@ -316,7 +289,7 @@ export async function initializeViewer(config, instanceId) {
           modelEntity,
           tooltipsUrl: config.tooltips_url,
           defaultVisible: !!config.showTooltipsDefault,
-          moveDuration: config.tooltipMoveDuration || 0.6  // optional smooth‐move duration
+          moveDuration: config.tooltipMoveDuration || 0.6
         });
       } catch (e) {
         console.error("Error loading tooltips.js:", e);
@@ -328,15 +301,14 @@ 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>`;
   }
-}
+}  // ← Added this closing brace to balance initializeViewer
 
 /**
  * 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 {
@@ -345,18 +317,15 @@ export function resetViewerCamera() {
     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);
 
@@ -364,7 +333,6 @@ export function resetViewerCamera() {
     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);
@@ -393,7 +361,7 @@ export function resetViewerCamera() {
 /**
  * cleanupViewer()
  *
- * Destroys the PlayCanvas app (if it exists) and clears references.  Called when the user clicks “X”.
+ * Destroys the PlayCanvas `app` and clears references.
  */
 export function cleanupViewer() {
   if (app) {
@@ -407,4 +375,4 @@ export function cleanupViewer() {
   cameraEntity   = null;
   modelEntity    = null;
   viewerInitialized = false;
-}
+}