Update viewer.js

viewer.js

@@ -2,7 +2,7 @@
 // viewer.js
 // ==============================
 
-let pc;            // PlayCanvas module
+let pc;            // will hold the PlayCanvas module once imported
 export let app = null;
 let cameraEntity   = null;
 let modelEntity    = null;
@@ -13,67 +13,82 @@ let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minPivotY, min
 let modelX, modelY, modelZ, modelScale, modelRotationX, modelRotationY, modelRotationZ;
 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;
 
+  // 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 config
+  // ─── 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 = parseFloat(config.modelX         || "0");
-  modelY = parseFloat(config.modelY         || "0");
-  modelZ = parseFloat(config.modelZ         || "0");
-  modelScale     = parseFloat(config.modelScale     || "1");
-  modelRotationX = parseFloat(config.modelRotationX || "0");
-  modelRotationY = parseFloat(config.modelRotationY || "0");
-  modelRotationZ = parseFloat(config.modelRotationZ || "0");
-
-  const camX      = parseFloat(config.cameraX      || "0");
-  const camY      = parseFloat(config.cameraY      || "2");
-  const camZ      = parseFloat(config.cameraZ      || "5");
-  const camXPhone = parseFloat(config.cameraXPhone || camX);
-  const camYPhone = parseFloat(config.cameraYPhone || camY);
-  const camZPhone = parseFloat(config.cameraZPhone || (camZ * 1.5));
-
-  chosenCameraX = isMobile ? camXPhone : camX;
-  chosenCameraY = isMobile ? camYPhone : camY;
-  chosenCameraZ = isMobile ? camZPhone : camZ;
-
-  // 2. Grab DOM
-  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);
-
-  // 3. Create <canvas>
-  let old = document.getElementById(canvasId);
-  if (old) old.remove();
-  const canvas = document.createElement('canvas');
-  canvas.id    = canvasId;
-  canvas.className = 'ply-canvas';
-  viewerContainer.insertBefore(canvas, progressDialog);
-
-  // 4. Wheel zoom
-  canvas.addEventListener('wheel', e => {
+  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;
+
+  // ─── 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 viewerContainerElem = document.getElementById('viewer-container-' + instanceId);
+
+  // ─── 3. Create a fresh <canvas> (removing any old one) ────────────────────────
+  let oldCanvas = document.getElementById(canvasId);
+  if (oldCanvas) {
+    oldCanvas.remove();
+  }
+  const newCanvas = document.createElement('canvas');
+  newCanvas.id = canvasId;
+  newCanvas.className = 'ply-canvas';
+  newCanvas.style.zIndex = "1";
+  viewerContainerElem.insertBefore(newCanvas, progressDialog);
+  const canvas = newCanvas;
+
+  // ─── 4. Add mouse‐wheel listener for zoom adjustments ────────────────────────
+  canvas.addEventListener('wheel', function(e) {
     if (cameraEntity && cameraEntity.script && cameraEntity.script.orbitCamera) {
-      const oc = cameraEntity.script.orbitCamera;
-      const sens = (cameraEntity.script.orbitCameraInputMouse?.distanceSensitivity) || 0.4;
+      const orbitCam = cameraEntity.script.orbitCamera;
+      const sensitivity = (cameraEntity.script.orbitCameraInputMouse && cameraEntity.script.orbitCameraInputMouse.distanceSensitivity) || 0.4;
+
       if (cameraEntity.camera.projection === pc.PROJECTION_PERSPECTIVE) {
-        oc.distance -= e.deltaY * 0.01 * sens * (oc.distance * 0.1);
+        orbitCam.distance -= e.deltaY * 0.01 * sensitivity * (orbitCam.distance * 0.1);
       } else {
-        oc.orthoHeight -= e.deltaY * 0.01 * sens * (oc.orthoHeight * 0.1);
+        orbitCam.orthoHeight -= e.deltaY * 0.01 * sensitivity * (orbitCam.orthoHeight * 0.1);
       }
       e.preventDefault();
       e.stopPropagation();
@@ -82,27 +97,31 @@ 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 device & app
-    const device = await pc.createGraphicsDevice(canvas, {
-      deviceTypes: ["webgl2"],
+    // ─── 6. Create a GraphicsDevice + AppOptions ────────────────────────────────
+    const deviceType = "webgl2";
+    const gfxOptions = {
+      deviceTypes: [deviceType],
       glslangUrl:  "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
       twgslUrl:    "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
       antialias:   false
-    });
+    };
+    const device = await pc.createGraphicsDevice(canvas, gfxOptions);
     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 = [
+    const createOptions = new pc.AppOptions();
+    createOptions.graphicsDevice = device;
+    createOptions.mouse = new pc.Mouse(canvas);
+    createOptions.touch = new pc.TouchDevice(canvas);
+
+    // ─── ADD: include physics systems for collision-based picking ───────────────
+    createOptions.componentSystems = [
       pc.RenderComponentSystem,
       pc.CameraComponentSystem,
       pc.LightComponentSystem,
@@ -111,130 +130,193 @@ export async function initializeViewer(config, instanceId) {
       pc.CollisionComponentSystem,
       pc.RigidbodyComponentSystem
     ];
-    opts.resourceHandlers = [
+    createOptions.resourceHandlers = [
       pc.TextureHandler,
       pc.ContainerHandler,
       pc.ScriptHandler,
       pc.GSplatHandler
     ];
 
-    app = new pc.Application(canvas, opts);
+    // ─── 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. Resize on window resize
+    // ─── 7. Handle window‐resize for the PlayCanvas canvas ─────────────────────
     const resizeCanvas = () => {
-      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. Load assets
+    // ─── 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"}),
-      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`},{ type: pc.TEXTURETYPE_RGBP, mipmaps: false })
+      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" }),
+      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 },
+        { type: pc.TEXTURETYPE_RGBP, mipmaps: false }
+      )
     };
-    const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
-    let lastProg = 0;
-    assets.model.on('load', () => progressDialog.style.display = 'none');
-    assets.model.on('error', e => {
-      console.error("Error loading PLY file:", e);
-      progressDialog.innerHTML = `<p style="color:red">Error loading model: ${e}</p>`;
+
+    const assetListLoader = new pc.AssetListLoader(Object.values(assets), app.assets);
+    let lastProgress = 0;
+
+    assets.model.on('load', () => {
+      progressDialog.style.display = 'none';
     });
-    const checkProg = () => {
+    assets.model.on('error', (err) => {
+      console.error("Error loading PLY file:", err);
+      progressDialog.innerHTML = <p style="color: red">Error loading model: ${err}</p>;
+    });
+
+    const checkProgress = () => {
       if (assets.model.resource) {
         progressIndicator.value = 100;
-        clearInterval(interval);
+        clearInterval(progressChecker);
         progressDialog.style.display = 'none';
       } else if (assets.model.loading) {
-        lastProg = Math.min(lastProg + 2, 90);
-        progressIndicator.value = lastProg;
+        lastProgress += 2;
+        if (lastProgress > 90) lastProgress = 90;
+        progressIndicator.value = lastProgress;
       }
     };
-    const interval = setInterval(checkProg, 100);
+    const progressChecker = setInterval(checkProgress, 100);
 
-    // 9. Build scene
-    loader.load(async () => {
+    // ─── 9. Once assets are loaded, build the scene ────────────────────────────
+    assetListLoader.load(async () => {
       app.start();
       app.scene.envAtlas = assets.hdr.resource;
 
-      // Model
+      // 9a. Create & position the model
       modelEntity = new pc.Entity('model');
-      modelEntity.addComponent('gsplat',{asset:assets.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);
 
-      // Light
-      const light = new pc.Entity('light');
-      light.addComponent('light',{ type:'directional', color:pc.Color.WHITE,
-        intensity:1, shadowType:pc.SHADOW_PCF3, castShadows:true });
-      app.root.addChild(light);
+      // 9b. Add a directional light
+      const dirLight = new pc.Entity('Cascaded Light');
+      dirLight.addComponent('light', {
+        type:           'directional',
+        color:          pc.Color.WHITE,
+        shadowBias:     0.3,
+        normalOffsetBias: 0.2,
+        intensity:      1.0,
+        soft:           true,
+        shadowResolution: 4096,
+        penumbraSize:   7,
+        penumbraFalloff: 1.5,
+        shadowSamples:  128,
+        shadowBlockerSamples: 16,
+        castShadows:    true,
+        shadowType:     pc.SHADOW_PCSS_32F,
+        shadowDistance: 1000
+      });
+      app.root.addChild(dirLight);
+      dirLight.setLocalEulerAngles(0, 0, 0);
 
-      // Galerie GLB
-      const gal = assets.galerie.resource.instantiateRenderEntity();
-      app.root.addChild(gal);
+      // 9c. Instantiate the GLB “gallery” if any
+      const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
+      app.root.addChild(galleryEntity);
 
-      // Camera
+      // 9d. Create & configure the camera + orbit‐camera scripts
       cameraEntity = new pc.Entity('camera');
-      cameraEntity.addComponent('camera',{
-        clearColor: config.canvas_background ? parseInt(config.canvas_background.substr(1,2),16)/255 : 0,
+      cameraEntity.addComponent('camera', {
+        clearColor: config.canvas_background
+          ? parseInt(config.canvas_background.substr(1, 2), 16) / 255
+          : 0,
         toneMapping: pc.TONEMAP_ACES
       });
+      // *** Set initial position/orientation from config immediately ***
       cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
       cameraEntity.lookAt(modelEntity.getPosition());
+
+      // Warn if camera is very far
+      const distanceCheck = new pc.Vec3().sub2(
+        cameraEntity.getPosition(),
+        modelEntity.getPosition()
+      ).length();
+      if (distanceCheck > 100) {
+        console.warn("Warning: Camera is far from model; it might not be visible");
+      }
+
       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
+      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
         }
       });
-      cameraEntity.script.create('orbitCameraInputMouse',{
-        attributes:{ orbitSensitivity:isMobile?0.6:0.3, distanceSensitivity:isMobile?0.5:0.4 }
+      cameraEntity.script.create('orbitCameraInputMouse', {
+        attributes: {
+          orbitSensitivity: isMobile ? 0.6 : 0.3,
+          distanceSensitivity: isMobile ? 0.5 : 0.4
+        }
       });
-      cameraEntity.script.create('orbitCameraInputTouch',{
-        attributes:{ orbitSensitivity:0.6, distanceSensitivity:0.5 }
+      // 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
+        }
       });
+
       app.root.addChild(cameraEntity);
 
-      // First‐frame reset
-      app.once('update', () => resetViewerCamera());
+      // ─── 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', () => {
-        const p = cameraEntity.getPosition();
-        if (p.y < minY) cameraEntity.setPosition(p.x, minY, p.z);
+      // 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);
+          }
+        }
       });
 
-      // Final resize
-      app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+      // 9f. Resize canvas one last time to fit container
+      app.resizeCanvas(viewerContainerElem.clientWidth, viewerContainerElem.clientHeight);
 
-      // Initialize tooltips
+      // ─── NEW: Load & initialize the tooltips module ──────────────────────
       try {
-        const tt = await import('./tooltips.js');
-        tt.initializeTooltips({
+        const tooltipsModule = await import('./tooltips.js');
+        tooltipsModule.initializeTooltips({
           app,
           cameraEntity,
           modelEntity,
           tooltipsUrl: config.tooltips_url,
           defaultVisible: !!config.showTooltipsDefault,
-          moveDuration: config.tooltipMoveDuration || 0.6
+          moveDuration: config.tooltipMoveDuration || 0.6  // optional smooth‐move duration
         });
       } catch (e) {
         console.error("Error loading tooltips.js:", e);
@@ -244,53 +326,85 @@ export async function initializeViewer(config, instanceId) {
       viewerInitialized = true;
     });
 
-  } catch (err) {
-    console.error("Error initializing PlayCanvas viewer:", err);
-    progressDialog.innerHTML = `<p style="color:red">${err.message}</p>`;
+  } catch (error) {
+    console.error("Error initializing PlayCanvas viewer:", error);
+    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 mp = modelEntity.getPosition();
-    const temp = new pc.Entity();
-    temp.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-    temp.lookAt(mp);
+    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);
 
-    const dist = new pc.Vec3().sub2(
-      new pc.Vec3(chosenCameraX,chosenCameraY,chosenCameraZ),
-      mp
+    // 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(mp);
+    cameraEntity.lookAt(modelPos);
 
-    orbitCam.pivotPoint = new pc.Vec3(mp.x,mp.y,mp.z);
-    orbitCam._distance       = dist;
-    orbitCam._targetDistance = dist;
+    orbitCam.pivotPoint = new pc.Vec3(modelPos.x, modelPos.y, modelPos.z);
+    orbitCam._targetDistance = distance;
+    orbitCam._distance       = distance;
 
-    const rot = temp.getRotation();
-    const fw = new pc.Vec3();
-    rot.transformVector(pc.Vec3.FORWARD, fw);
-    const yaw = Math.atan2(-fw.x,-fw.z) * pc.math.RAD_TO_DEG;
+    // 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 noYaw = new pc.Quat().mul2(yawQuat, rot);
-    const fny   = new pc.Vec3();
-    noYaw.transformVector(pc.Vec3.FORWARD, fny);
-    const pitch = Math.atan2(fny.y, -fny.z) * pc.math.RAD_TO_DEG;
+    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._yaw         = yaw;
     orbitCam._targetYaw   = yaw;
-    orbitCam._pitch       = pitch;
+    orbitCam._yaw         = yaw;
     orbitCam._targetPitch = pitch;
-    orbitCam._updatePosition();
+    orbitCam._pitch       = pitch;
+    if (typeof orbitCam._updatePosition === 'function') {
+      orbitCam._updatePosition();
+    }
 
-    temp.destroy();
-  } catch(e) {
-    console.error("Error resetting camera:", e);
+    tempEntity.destroy();
+  } catch (error) {
+    console.error("Error resetting camera:", error);
   }
 }
+
+/**
+ * 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;
+}