Update index_3.js

index_3.js

@@ -21,8 +21,7 @@
   let controlsInstance = null;
   let initialCameraPosition = null;
   let initialCameraRotation = null;
-  // We'll save the imported SPLAT module here so we can reuse it later.
-  let SPLAT = null;
+  let SPLAT = null; // Will store the imported SPLAT module
   
   // Generate a unique identifier for this widget instance.
   const instanceId = Math.random().toString(36).substr(2, 8);
@@ -37,50 +36,43 @@
   const minAzimuth = config.minAzimuth !== undefined ? parseFloat(config.minAzimuth) : -Infinity;
   const maxAzimuth = config.maxAzimuth !== undefined ? parseFloat(config.maxAzimuth) : Infinity;
 
-  // Read initial orbit parameters for desktop.
+  // Read initial orbit parameters.
   const initAlphaDesktop = config.initAlpha !== undefined ? parseFloat(config.initAlpha) : 0.5;
   const initBetaDesktop  = config.initBeta  !== undefined ? parseFloat(config.initBeta)  : 0.5;
   const initRadiusDesktop = config.initRadius !== undefined ? parseFloat(config.initRadius) : 5;
-  // Read initial orbit parameters for phone.
   const initAlphaPhone = config.initAlphaPhone !== undefined ? parseFloat(config.initAlphaPhone) : initAlphaDesktop;
   const initBetaPhone  = config.initBetaPhone  !== undefined ? parseFloat(config.initBetaPhone)  : initBetaDesktop;
   const initRadiusPhone = config.initRadiusPhone !== undefined ? parseFloat(config.initRadiusPhone) : initRadiusDesktop;
 
-  // Detect if the device is iOS.
+  // Detect device type.
   const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
-  // Also detect Android devices.
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
-  
-  // Choose the appropriate initial orbit values based on device type.
   const chosenInitAlpha = isMobile ? initAlphaPhone : initAlphaDesktop;
   const chosenInitBeta  = isMobile ? initBetaPhone  : initBetaDesktop;
   const chosenInitRadius = isMobile ? initRadiusPhone : initRadiusDesktop;
   
-  // Inject CSS styles into the document head.
-  // The container will be set to fill 100% of the parent block; its height will be explicitly updated in the script.
+  // Inject CSS styles.
   const styleEl = document.createElement('style');
   styleEl.textContent = `
-    /* Widget container styling - fill the entire parent block */
+    /* Widget container styling - height/width set to 100% (we will adjust height in script) */
     #ply-widget-container-${instanceId} {
       position: relative;
       width: 100%;
       height: 100%;
     }
-    /* When in fake fullscreen mode (iOS fallback) */
+    /* Fake fullscreen (for iOS) */
     #ply-widget-container-${instanceId}.fake-fullscreen {
       position: fixed !important;
       top: 0 !important;
       left: 0 !important;
       width: 100vw !important;
       height: 100vh !important;
-      padding-bottom: 0 !important;
       z-index: 9999 !important;
     }
     /* GIF Preview styling */
     #gif-preview-container-${instanceId} {
       position: absolute;
-      top: 0;
-      left: 0;
+      top: 0; left: 0;
       width: 100%;
       height: 100%;
       border: 1px solid #474558;
@@ -97,8 +89,7 @@
     #viewer-container-${instanceId} {
       display: none;
       position: absolute;
-      top: 0;
-      left: 0;
+      top: 0; left: 0;
       width: 100%;
       height: 100%;
       background: #FEFEFD;
@@ -113,25 +104,22 @@
       height: 100%;
       display: block;
     }
-    /* Progress dialog styling (as a centered div) */
+    /* Progress dialog styling */
     #progress-dialog-${instanceId} {
       position: absolute;
-      top: 50%;
-      left: 50%;
+      top: 50%; left: 50%;
       transform: translate(-50%, -50%);
-      border: none;
       background: rgba(255,255,255,0.9);
       padding: 20px;
       border-radius: 5px;
       z-index: 1000;
       display: none;
     }
-    /* Menu (instructions) content styling */
+    /* Menu content styling */
     #menu-content-${instanceId} {
       display: none;
       position: absolute;
-      top: 70px;
-      right: 15px;
+      top: 70px; right: 15px;
       background: #FFFEF4;
       border: 1px solid #474558;
       border-radius: 5px;
@@ -155,45 +143,22 @@
       align-items: center;
       justify-content: center;
     }
-    /* Positions: Close at top-left, fullscreen at top-right, help and reset buttons */
-    #close-btn-${instanceId} {
-      top: 17px;
-      left: 15px;
-      font-family: sans-serif;
-    }
-    #fullscreen-toggle-${instanceId} {
-      top: 17px;
-      right: 15px;
-    }
-    #help-toggle-${instanceId} {
-      top: 17px;
-      right: 70px;
-      font-size: 22px;
-    }
-    #reset-camera-btn-${instanceId} {
-      top: 17px;
-      right: 123px;
-      font-size: 22px;
-      line-height: normal;
-      padding: 0;
-    }
-    /* Adjust the reset icon position: move it slightly upward */
-    .reset-icon {
-      display: inline-block;
-      transform: translateY(-3px);
-    }
+    /* Button positions */
+    #close-btn-${instanceId} { top: 17px; left: 15px; }
+    #fullscreen-toggle-${instanceId} { top: 17px; right: 15px; }
+    #help-toggle-${instanceId} { top: 17px; right: 70px; font-size: 22px; }
+    #reset-camera-btn-${instanceId} { top: 17px; right: 123px; font-size: 22px; }
+    .reset-icon { display: inline-block; transform: translateY(-3px); }
   `;
   document.head.appendChild(styleEl);
   
-  // Create the widget container and set its inner HTML.
+  // Create widget container and inner HTML.
   const widgetContainer = document.createElement('div');
   widgetContainer.id = 'ply-widget-container-' + instanceId;
   widgetContainer.innerHTML = `
-    <!-- GIF Preview Container -->
     <div id="gif-preview-container-${instanceId}">
       <img id="preview-image-${instanceId}" alt="Preview" crossorigin="anonymous">
     </div>
-    <!-- Viewer Container -->
     <div id="viewer-container-${instanceId}">
       <canvas id="canvas-${instanceId}"></canvas>
       <div id="progress-dialog-${instanceId}">
@@ -209,15 +174,21 @@
     </div>
   `;
   scriptTag.parentNode.appendChild(widgetContainer);
-
-  // Ensure the widget container takes the full height of its parent.
+  
+  // Update widget container height based on its parent's height using ResizeObserver if available.
+  const parentElem = scriptTag.parentNode;
   function updateWidgetSize() {
-    const parentHeight = scriptTag.parentNode.offsetHeight;
-    // If the parent height is defined, use it; otherwise fall back to a default height.
-    widgetContainer.style.height = (parentHeight && parentHeight > 0) ? parentHeight + "px" : "300px";
+    const rect = parentElem.getBoundingClientRect();
+    // Set the widget's height to match the parent's height.
+    widgetContainer.style.height = rect.height ? rect.height + "px" : "300px";
   }
   updateWidgetSize();
-  window.addEventListener("resize", updateWidgetSize);
+  if (window.ResizeObserver) {
+    const observer = new ResizeObserver(() => updateWidgetSize());
+    observer.observe(parentElem);
+  } else {
+    window.addEventListener("resize", updateWidgetSize);
+  }
   
   // Grab element references.
   const gifPreview = document.getElementById('gif-preview-container-' + instanceId);
@@ -232,7 +203,7 @@
   const progressDialog = document.getElementById('progress-dialog-' + instanceId);
   const progressIndicator = document.getElementById('progress-indicator-' + instanceId);
   
-  // Set help instructions based on device type.
+  // Set help instructions.
   if (isMobile) {
     menuContent.innerHTML = `
       - Pour vous déplacer, glissez deux doigts sur l'écran.<br>
@@ -247,16 +218,13 @@
     `;
   }
   
-  // If a gif_url is provided, set the preview image.
-  // Otherwise, hide the preview container, show the viewer immediately,
-  // and hide the "close" button since there's no preview to return to.
+  // Handle preview display.
   if (gifUrl) {
     previewImage.src = gifUrl;
   } else {
     gifPreview.style.display = 'none';
     viewerContainer.style.display = 'block';
     closeBtn.style.display = 'none';
-    // Start the viewer immediately.
     initializeViewer();
   }
   
@@ -270,15 +238,12 @@
   }
   
   closeBtn.addEventListener('click', function() {
-    if (document.fullscreenElement === widgetContainer) {
-      if (document.exitFullscreen) {
-        document.exitFullscreen();
-      }
+    if (document.fullscreenElement === widgetContainer && document.exitFullscreen) {
+      document.exitFullscreen();
     }
     if (widgetContainer.classList.contains('fake-fullscreen')) {
       widgetContainer.classList.remove('fake-fullscreen');
       fullscreenToggle.textContent = '⇱';
-      // For fake-fullscreen, reset camera immediately.
       resetCamera();
     }
     viewerContainer.style.display = 'none';
@@ -291,7 +256,6 @@
         widgetContainer.classList.add('fake-fullscreen');
       } else {
         widgetContainer.classList.remove('fake-fullscreen');
-        // Reset camera when exiting fake-fullscreen.
         resetCamera();
       }
       fullscreenToggle.textContent = widgetContainer.classList.contains('fake-fullscreen') ? '⇲' : '⇱';
@@ -306,15 +270,12 @@
         } else if (widgetContainer.msRequestFullscreen) {
           widgetContainer.msRequestFullscreen();
         }
-      } else {
-        if (document.exitFullscreen) {
-          document.exitFullscreen();
-        }
+      } else if (document.exitFullscreen) {
+        document.exitFullscreen();
       }
     }
   });
   
-  // Listen for native fullscreen changes. When exiting fullscreen, reset camera.
   document.addEventListener('fullscreenchange', function() {
     if (document.fullscreenElement === widgetContainer) {
       fullscreenToggle.textContent = '⇲';
@@ -331,30 +292,22 @@
   
   // --- Camera Reset Function ---
   function resetCamera() {
-    console.log("Resetting camera to initial position.");
+    console.log("Resetting camera.");
     if (cameraInstance && initialCameraPosition && initialCameraRotation) {
-      // Reset camera position and rotation.
       cameraInstance.position = initialCameraPosition.clone();
       cameraInstance.rotation = initialCameraRotation.clone();
       if (typeof cameraInstance.update === 'function') {
         cameraInstance.update();
       }
-      // Dispose of the current controls.
       if (controlsInstance && typeof controlsInstance.dispose === 'function') {
         controlsInstance.dispose();
       }
-      // Re-create OrbitControls with the original chosen parameters.
       controlsInstance = new SPLAT.OrbitControls(
         cameraInstance,
         canvas,
-        0.5,  // default alpha fallback
-        0.5,  // default beta fallback
-        5,    // default radius fallback
-        true,
+        0.5, 0.5, 5, true,
         new SPLAT.Vector3(),
-        chosenInitAlpha,
-        chosenInitBeta,
-        chosenInitRadius
+        chosenInitAlpha, chosenInitBeta, chosenInitRadius
       );
       controlsInstance.maxZoom = maxZoom;
       controlsInstance.minZoom = minZoom;
@@ -367,21 +320,17 @@
     }
   }
   
-  // Modified reset button now calls the resetCamera function.
-  resetCameraBtn.addEventListener('click', async function() {
+  resetCameraBtn.addEventListener('click', function() {
     console.log("Reset camera button clicked.");
     resetCamera();
   });
   
-  // --- Add keydown listener to exit fullscreen with Esc (or Echap) ---
   document.addEventListener('keydown', function(e) {
     if (e.key === 'Escape' || e.key === 'Esc') {
       let wasFullscreen = false;
-      if (document.fullscreenElement === widgetContainer) {
+      if (document.fullscreenElement === widgetContainer && document.exitFullscreen) {
         wasFullscreen = true;
-        if (document.exitFullscreen) {
-          document.exitFullscreen();
-        }
+        document.exitFullscreen();
       }
       if (widgetContainer.classList.contains('fake-fullscreen')) {
         wasFullscreen = true;
@@ -396,34 +345,24 @@
   
   // --- Initialize the 3D PLY Viewer ---
   async function initializeViewer() {
-    // Import SPLAT and store it globally.
     SPLAT = await import("https://bilca-gsplat-library.static.hf.space/dist/index.js");
     progressDialog.style.display = 'block';
     const renderer = new SPLAT.WebGLRenderer(canvas);
     const scene = new SPLAT.Scene();
-
-    // Construct the camera.
     const camera = new SPLAT.Camera();
     
-    // Construct OrbitControls with the chosen initial orbit parameters.
     controlsInstance = new SPLAT.OrbitControls(
       camera,
       canvas,
-      0.5, // default alpha fallback
-      0.5, // default beta fallback
-      5,   // default radius fallback
-      true,
+      0.5, 0.5, 5, true,
       new SPLAT.Vector3(),
-      chosenInitAlpha,
-      chosenInitBeta,
-      chosenInitRadius
+      chosenInitAlpha, chosenInitBeta, chosenInitRadius
     );
-  
+    
     cameraInstance = camera;
-    // Save the initial camera state (after controls are created)
     initialCameraPosition = camera.position.clone();
     initialCameraRotation = camera.rotation.clone();
-  
+    
     canvas.style.background = "#FEFEFD";
     controlsInstance.maxZoom = maxZoom;
     controlsInstance.minZoom = minZoom;
@@ -432,38 +371,31 @@
     controlsInstance.minAzimuth = minAzimuth;
     controlsInstance.maxAzimuth = maxAzimuth;
     controlsInstance.panSpeed = isMobile ? 0.5 : 1.2;
-  
     controlsInstance.update();
-  
+    
     try {
       await SPLAT.PLYLoader.LoadAsync(
         plyUrl,
         scene,
-        (progress) => {
-          progressIndicator.value = progress * 100;
-        }
+        (progress) => { progressIndicator.value = progress * 100; }
       );
       progressDialog.style.display = 'none';
     } catch (error) {
       console.error("Error loading PLY file:", error);
       progressDialog.innerHTML = `<p style="color: red">Error loading model: ${error.message}</p>`;
     }
-  
+    
     const frame = () => {
       controlsInstance.update();
       renderer.render(scene, camera);
       requestAnimationFrame(frame);
     };
-  
+    
     const handleResize = () => {
       renderer.setSize(canvas.clientWidth, canvas.clientHeight);
     };
-  
     handleResize();
     window.addEventListener("resize", handleResize);
     requestAnimationFrame(frame);
   }
-  
-  // If a gif_url exists, the viewer is started on preview click;
-  // otherwise, it was already started above.
 })();