Update viewer.js

viewer.js

@@ -8,6 +8,7 @@ export let app = null;
 let cameraEntity   = null;
 let modelEntity    = null;
 let viewerInitialized = false;
+let resizeObserver = null;
 
 let chosenCameraX, chosenCameraY, chosenCameraZ;
 let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minPivotY, minY;
@@ -26,19 +27,19 @@ export async function initializeViewer(config, instanceId) {
   // 1. Read config
   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;
@@ -55,7 +56,7 @@ export async function initializeViewer(config, instanceId) {
   chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
 
   // 2. Grab DOM
-  const canvasId = 'canvas-' + 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);
@@ -128,8 +129,19 @@ export async function initializeViewer(config, instanceId) {
     app.scene.exposure    = 0.5;
     app.scene.toneMapping = pc.TONEMAP_ACES;
 
+    // Attach ResizeObserver to keep canvas in sync with container size
+    resizeObserver = new ResizeObserver(entries => {
+      for (const entry of entries) {
+        const { width, height } = entry.contentRect;
+        if (app) {
+          app.resizeCanvas(width, height);
+        }
+      }
+    });
+    resizeObserver.observe(viewerContainer);
+
     window.addEventListener('resize', () => {
-      if (app) app.resizeCanvas(canvas.clientWidth, canvas.clientHeight);
+      if (app) app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
     });
     app.on('destroy', () => {
       window.removeEventListener('resize', resizeCanvas);
@@ -168,6 +180,7 @@ export async function initializeViewer(config, instanceId) {
       app.start();
       app.scene.envAtlas = assets.hdr.resource;
 
+      // Model entity
       modelEntity = new pc.Entity('model');
       modelEntity.addComponent('gsplat', { asset: assets.model });
       modelEntity.setLocalPosition(modelX, modelY, modelZ);
@@ -175,6 +188,7 @@ export async function initializeViewer(config, instanceId) {
       modelEntity.setLocalScale(modelScale, modelScale, modelScale);
       app.root.addChild(modelEntity);
 
+      // Light
       const dirLight = new pc.Entity('Cascaded Light');
       dirLight.addComponent('light', {
         type: 'directional',
@@ -192,12 +206,14 @@ export async function initializeViewer(config, instanceId) {
         shadowType: pc.SHADOW_PCSS_32F,
         shadowDistance: 1000
       });
-      app.root.addChild(dirLight);
       dirLight.setLocalEulerAngles(0, 0, 0);
+      app.root.addChild(dirLight);
 
+      // Gallery GLB
       const galleryEntity = assets.galerie.resource.instantiateRenderEntity();
       app.root.addChild(galleryEntity);
 
+      // Camera setup
       cameraEntity = new pc.Entity('camera');
       cameraEntity.addComponent('camera', {
         clearColor: config.canvas_background
@@ -240,16 +256,21 @@ export async function initializeViewer(config, instanceId) {
       });
       app.root.addChild(cameraEntity);
 
+      // Reset & constrain updates
       app.once('update', () => resetViewerCamera());
       app.on('update', dt => {
         if (cameraEntity) {
           const pos = cameraEntity.getPosition();
-          if (pos.y < minY) cameraEntity.setPosition(pos.x, minY, pos.z);
+          if (pos.y < minY) {
+            cameraEntity.setPosition(pos.x, minY, pos.z);
+          }
         }
       });
 
+      // Final resize
       app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
 
+      // Tooltips
       try {
         const tooltipsModule = await import('./tooltips.js');
         tooltipsModule.initializeTooltips({
@@ -322,10 +343,18 @@ export function resetViewerCamera() {
 
 export function cleanupViewer() {
   if (app) {
-    try { app.destroy(); } catch {}
+    try {
+      app.destroy();
+    } catch {}
     app = null;
   }
   cameraEntity = null;
   modelEntity  = null;
   viewerInitialized = false;
+
+  // Disconnect the ResizeObserver to avoid leaks
+  if (resizeObserver) {
+    resizeObserver.disconnect();
+    resizeObserver = null;
+  }
 }