Update interface.js

interface.js

@@ -80,8 +80,8 @@ const currentScriptTag = document.currentScript;
   widgetContainer.style.paddingBottom = aspectPercent;
   widgetContainer.setAttribute('data-original-aspect', aspectPercent);
 
-  // Add the 3D-viewer HTML + 📍 toggle + tooltip markup
-  widgetContainer.innerHTML = `
+  // Add the 3D-viewer HTML + ⦿ toggle + tooltip + help HTML
+  widgetContainer.innerHTML = 
     <div id="viewer-container-${instanceId}" class="viewer-container">
       <div id="progress-dialog-${instanceId}" class="progress-dialog">
         <progress id="progress-indicator-${instanceId}" max="100" value="0"></progress>
@@ -91,21 +91,22 @@ const currentScriptTag = document.currentScript;
       <button id="reset-camera-btn-${instanceId}" class="widget-button reset-camera-btn">
         <span class="reset-icon">⟲</span>
       </button>
-      <button id="points-toggle-${instanceId}" class="widget-button points-toggle">⦿</button>
+      <button id="tooltips-toggle-${instanceId}" class="widget-button tooltips-toggle">⦿</button>
       <div id="menu-content-${instanceId}" class="menu-content">
         <span id="help-close-${instanceId}" class="help-close">×</span>
         <div class="help-text"></div>
       </div>
     </div>
-    <div id="point-tooltip" class="point-tooltip" style="display: none;">
-      <div class="point-tooltip-content">
-        <span id="point-tooltip-close" class="point-tooltip-close">×</span>
-        <div id="point-tooltip-text" class="point-tooltip-text"></div>
-        <img id="point-tooltip-image" class="point-tooltip-image" src="" alt="" style="display: none;" />
+    <div id="tooltip-panel" class="tooltip-panel" style="display: none;">
+      <div class="tooltip-content">
+        <span id="tooltip-close" class="tooltip-close">×</span>
+        <div id="tooltip-text" class="tooltip-text"></div>
+        <img id="tooltip-image" class="tooltip-image" src="" alt="" style="display: none;" />
       </div>
     </div>
-  `;
+  ;
 
+  // Append the widget container immediately after the <script> tag
   scriptTag.parentNode.appendChild(widgetContainer);
 
   // ─── 6. Grab references to new DOM elements ──────────────────────────────────
@@ -114,51 +115,63 @@ const currentScriptTag = document.currentScript;
   const helpToggle          = document.getElementById('help-toggle-' + instanceId);
   const helpCloseBtn        = document.getElementById('help-close-' + instanceId);
   const resetCameraBtn      = document.getElementById('reset-camera-btn-' + instanceId);
-  const pointsToggleBtn     = document.getElementById('points-toggle-' + instanceId);
+  const tooltipsToggleBtn   = document.getElementById('tooltips-toggle-' + instanceId);
   const menuContent         = document.getElementById('menu-content-' + instanceId);
   const helpTextDiv         = menuContent.querySelector('.help-text');
 
-  // Tooltip elements
-  const tooltipDiv       = document.getElementById('point-tooltip');
-  const tooltipTextDiv   = document.getElementById('point-tooltip-text');
-  const tooltipImage     = document.getElementById('point-tooltip-image');
-  const tooltipCloseBtn  = document.getElementById('point-tooltip-close');
+  // Tooltip panel elements
+  const tooltipPanel       = document.getElementById('tooltip-panel');
+  const tooltipTextDiv     = document.getElementById('tooltip-text');
+  const tooltipImage       = document.getElementById('tooltip-image');
+  const tooltipCloseBtn    = document.getElementById('tooltip-close');
 
-  // Device detection for help text
+  // ─── 6a. Detect mobile vs. desktop ────────────────────────────────────────────
   const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-  // Conditionally include tooltip instruction only if points_url exists
-  const tooltipInstruction = config.points_url
-    ? '- Cliquez sur ⦿ pour afficher/masquer les points d’information.<br>'
+  // Conditionally include the French tooltip instruction line if tooltips_url exists
+  const tooltipInstruction = config.tooltips_url
+    ? '- Cliquez sur ⦿ pour afficher/masquer les tooltips.<br>'
     : '';
 
-  // Fill help text with instructions, plus two new French lines
+  // Fill help text with appropriate instructions
   if (isMobile) {
-    helpTextDiv.innerHTML = `
+    helpTextDiv.innerHTML = 
       - Pour vous déplacer, glissez deux doigts sur l'écran.<br>
       - Pour orbiter, utilisez un doigt.<br>
       - Pour zoomer, pincez avec deux doigts.<br>
       ${tooltipInstruction}
-      - ⟲ Réinitialise la caméra.<br>
-      - ⇱ Passe en plein écran.<br>
-    `;
+    ;
   } else {
-    helpTextDiv.innerHTML = `
+    helpTextDiv.innerHTML = 
       - orbitez avec le clic droit<br>
       - zoomez avec la molette<br>
       - déplacez vous avec le clic gauche<br>
       ${tooltipInstruction}
-      - ⟲ Réinitialise la caméra.<br>
-      - ⇱ Passe en plein écran.<br>
-    `;
+    ;
   }
 
   // Ensure instructions panel is visible by default
   menuContent.style.display = 'block';
+
   viewerContainerElem.style.display = 'block';
 
-  // …rest of the original working tooltip, drag-hide, fullscreen, resize, dynamic-import logic remains unchanged…
+  // Variable to hold the drag-hide listener reference
+  let dragHide = null;
+
+  // Utility: hide tooltip and remove drag-hide listener
+  function hideTooltipPanel() {
+    if (dragHide) {
+      viewerContainerElem.removeEventListener('pointermove', dragHide);
+      dragHide = null;
+    }
+    tooltipPanel.style.display = 'none';
+  }
+
+  // Utility: hide instructions panel
+  function hideHelpPanel() {
+    menuContent.style.display = 'none';
+  }
 
   // ─── 7. Dynamically load viewer.js ─────────────────────────────────────────
   let viewerModule;
@@ -170,6 +183,327 @@ const currentScriptTag = document.currentScript;
     return;
   }
 
-  // …etc.
+  // After viewer is ready, grab the canvas element
+  const canvasId = 'canvas-' + instanceId;
+  const canvasEl = document.getElementById(canvasId);
+
+  // ─── 8. Conditional display of tooltips-toggle button ─────────────────────────
+  if (!config.tooltips_url) {
+    tooltipsToggleBtn.style.display = 'none';
+  } else {
+    fetch(config.tooltips_url)
+      .then(resp => {
+        if (!resp.ok) {
+          tooltipsToggleBtn.style.display = 'none';
+        }
+      })
+      .catch(() => {
+        tooltipsToggleBtn.style.display = 'none';
+      });
+  }
+
+  // ─── 9. Fullscreen / state-preservation logic ───────────────────────────────
+  let isFullscreen = false;
+  let savedState = null;
+
+  function saveCurrentState() {
+    if (isFullscreen) return;
+    const computedWidget = window.getComputedStyle(widgetContainer);
+    const computedViewer = window.getComputedStyle(viewerContainerElem);
+    const originalAspect = widgetContainer.getAttribute('data-original-aspect') || aspectPercent;
+    const containerWidth  = widgetContainer.offsetWidth;
+    const containerHeight = widgetContainer.clientHeight || viewerContainerElem.offsetHeight;
+    const calculatedRatio = (containerHeight / containerWidth * 100) + '%';
+
+    savedState = {
+      widget: {
+        position:     widgetContainer.style.position,
+        top:          widgetContainer.style.top,
+        left:         widgetContainer.style.left,
+        width:        widgetContainer.style.width,
+        height:       widgetContainer.style.height,
+        maxWidth:     widgetContainer.style.maxWidth,
+        maxHeight:    widgetContainer.style.maxHeight,
+        paddingBottom: widgetContainer.style.paddingBottom || originalAspect,
+        margin:       widgetContainer.style.margin,
+        aspectPercent: originalAspect,
+        calculatedAspect: calculatedRatio,
+        computedWidth:    computedWidget.width,
+        computedHeight:   computedWidget.height,
+        offsetWidth:     containerWidth,
+        offsetHeight:    containerHeight
+      },
+      viewer: {
+        borderRadius: viewerContainerElem.style.borderRadius,
+        border:       viewerContainerElem.style.border,
+        computedWidth:  computedViewer.width,
+        computedHeight: computedViewer.height
+      }
+    };
+  }
+
+  function restoreOriginalStyles() {
+    if (!savedState) return;
+    let aspectToUse = aspectPercent;
+    if (savedState.widget.offsetWidth && savedState.widget.offsetHeight) {
+      const actualRatio = (savedState.widget.offsetHeight / savedState.widget.offsetWidth * 100) + '%';
+      aspectToUse = actualRatio;
+    } else if (savedState.widget.calculatedAspect) {
+      aspectToUse = savedState.widget.calculatedAspect;
+    } else if (savedState.widget.aspectPercent) {
+      aspectToUse = savedState.widget.aspectPercent;
+    } else if (savedState.widget.paddingBottom) {
+      aspectToUse = savedState.widget.paddingBottom;
+    }
+
+    widgetContainer.style.position     = savedState.widget.position    || "";
+    widgetContainer.style.top          = savedState.widget.top         || "";
+    widgetContainer.style.left         = savedState.widget.left        || "";
+    widgetContainer.style.width        = "100%";
+    widgetContainer.style.height       = "0";
+    widgetContainer.style.maxWidth     = savedState.widget.maxWidth    || "";
+    widgetContainer.style.maxHeight    = savedState.widget.maxHeight   || "";
+    widgetContainer.style.paddingBottom= aspectToUse;
+    widgetContainer.style.margin       = savedState.widget.margin      || "";
+    widgetContainer.style.border       = savedState.widget.border      || "";
+    widgetContainer.style.borderRadius = savedState.widget.borderRadius|| "";
+    widgetContainer.style.overflow     = savedState.widget.overflow    || "";
+    widgetContainer.classList.remove('fake-fullscreen');
+
+    viewerContainerElem.style.position    = "absolute";
+    viewerContainerElem.style.top         = "0";
+    viewerContainerElem.style.left        = "0";
+    viewerContainerElem.style.right       = "0";
+    viewerContainerElem.style.bottom      = "0";
+    viewerContainerElem.style.width       = "100%";
+    viewerContainerElem.style.height      = "100%";
+    viewerContainerElem.style.borderRadius= savedState.viewer.borderRadius || "";
+    viewerContainerElem.style.border      = savedState.viewer.border       || "";
+
+    if (viewerModule.app) {
+      const cw = viewerContainerElem.clientWidth;
+      const ch = viewerContainerElem.clientHeight;
+      viewerModule.app.resizeCanvas(cw, ch);
+    }
+
+    savedState = null;
+  }
+
+  function applyFullscreenStyles() {
+    widgetContainer.style.position     = 'fixed';
+    widgetContainer.style.top          = '0';
+    widgetContainer.style.left         = '0';
+    widgetContainer.style.width        = '100vw';
+    widgetContainer.style.height       = '100vh';
+    widgetContainer.style.maxWidth     = '100vw';
+    widgetContainer.style.maxHeight    = '100vh';
+    widgetContainer.style.paddingBottom= '0';
+    widgetContainer.style.margin       = '0';
+    widgetContainer.style.border       = 'none';
+    widgetContainer.style.borderRadius = '0';
+
+    viewerContainerElem.style.width       = '100%';
+    viewerContainerElem.style.height      = '100%';
+    viewerContainerElem.style.borderRadius= '0';
+    viewerContainerElem.style.border      = 'none';
+
+    if (viewerModule.app) {
+      viewerModule.app.resizeCanvas(window.innerWidth, window.innerHeight);
+    }
+
+    fullscreenToggle.textContent = '⇲';
+    isFullscreen = true;
+  }
+
+  function enterFullscreen() {
+    if (!savedState) {
+      saveCurrentState();
+    }
+    if (isIOS) {
+      applyFullscreenStyles();
+      widgetContainer.classList.add('fake-fullscreen');
+    } else {
+      if (widgetContainer.requestFullscreen) {
+        widgetContainer.requestFullscreen()
+          .then(() => {
+            applyFullscreenStyles();
+          })
+          .catch(err => {
+            console.error("Fullscreen request failed:", err);
+            applyFullscreenStyles();
+            widgetContainer.classList.add('fake-fullscreen');
+          });
+      } else if (widgetContainer.webkitRequestFullscreen) {
+        widgetContainer.webkitRequestFullscreen();
+        applyFullscreenStyles();
+      } else if (widgetContainer.mozRequestFullScreen) {
+        widgetContainer.mozRequestFullScreen();
+        applyFullscreenStyles();
+      } else if (widgetContainer.msRequestFullscreen) {
+        widgetContainer.msRequestFullscreen();
+        applyFullscreenStyles();
+      } else {
+        applyFullscreenStyles();
+        widgetContainer.classList.add('fake-fullscreen');
+      }
+    }
+  }
+
+  function exitFullscreen() {
+    if (document.fullscreenElement === widgetContainer) {
+      if (document.exitFullscreen) {
+        document.exitFullscreen().catch(err => {
+          console.error("Error exiting fullscreen:", err);
+        });
+      } else if (document.webkitExitFullscreen) {
+        document.webkitExitFullscreen();
+      } else if (document.mozCancelFullScreen) {
+        document.mozCancelFullScreen();
+      } else if (document.msExitFullscreen) {
+        document.msExitFullscreen();
+      }
+    }
+
+    widgetContainer.classList.remove('fake-fullscreen');
+    restoreOriginalStyles();
+    isFullscreen = false;
+  }
+
+  // ─── 10. Hook up event listeners ───────────────────────────────────────────
+
+  fullscreenToggle.addEventListener('click', () => {
+    hideTooltipPanel();
+    if (!isFullscreen) {
+      enterFullscreen();
+    } else {
+      exitFullscreen();
+    }
+  });
+
+  document.addEventListener('fullscreenchange', () => {
+    if (document.fullscreenElement === widgetContainer) {
+      isFullscreen = true;
+      applyFullscreenStyles();
+    } else if (isFullscreen) {
+      isFullscreen = false;
+      restoreOriginalStyles();
+    }
+  });
+  document.addEventListener('webkitfullscreenchange', () => {
+    if (document.webkitFullscreenElement === widgetContainer) {
+      isFullscreen = true;
+      applyFullscreenStyles();
+    } else if (isFullscreen) {
+      isFullscreen = false;
+      restoreOriginalStyles();
+    }
+  });
+  document.addEventListener('mozfullscreenchange', () => {
+    if (document.mozFullScreenElement === widgetContainer) {
+      isFullscreen = true;
+      applyFullscreenStyles();
+    } else if (isFullscreen) {
+      isFullscreen = false;
+      restoreOriginalStyles();
+    }
+  });
+  document.addEventListener('MSFullscreenChange', () => {
+    if (document.msFullscreenElement === widgetContainer) {
+      isFullscreen = true;
+      applyFullscreenStyles();
+    } else if (isFullscreen) {
+      isFullscreen = false;
+      restoreOriginalStyles();
+    }
+  });
+
+  helpToggle.addEventListener('click', (e) => {
+    hideTooltipPanel();
+    e.stopPropagation();
+    menuContent.style.display = (menuContent.style.display === 'block') ? 'none' : 'block';
+  });
+
+  helpCloseBtn.addEventListener('click', () => {
+    hideHelpPanel();
+  });
+
+  resetCameraBtn.addEventListener('click', () => {
+    hideTooltipPanel();
+    if (viewerModule.resetViewerCamera) {
+      viewerModule.resetViewerCamera();
+    }
+  });
+
+  // ⦿ toggle button
+  let tooltipsVisible = !!config.showTooltipsDefault;
+  if (tooltipsToggleBtn.style.display !== 'none') {
+    if (!tooltipsVisible) {
+      tooltipsToggleBtn.style.opacity = '0.5';
+    }
+    tooltipsToggleBtn.addEventListener('click', () => {
+      hideTooltipPanel();
+      tooltipsVisible = !tooltipsVisible;
+      tooltipsToggleBtn.style.opacity = tooltipsVisible ? '1' : '0.5';
+      document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: tooltipsVisible } }));
+    });
+  }
+
+  // Close tooltip panel on button click
+  tooltipCloseBtn.addEventListener('click', () => {
+    hideTooltipPanel();
+  });
+
+  // Listen for tooltip-selection events and show tooltip panel
+  document.addEventListener('tooltip-selected', (evt) => {
+    const { title, description, imgUrl } = evt.detail;
+    tooltipTextDiv.innerHTML = <strong>${title}</strong><br>${description};
+    if (imgUrl) {
+      tooltipImage.src = imgUrl;
+      tooltipImage.style.display = 'block';
+    } else {
+      tooltipImage.style.display = 'none';
+    }
+    tooltipPanel.style.display = 'flex';
+
+    // Attach drag-based hide listener
+    dragHide = (e) => {
+      if ((e.pointerType === 'mouse' && e.buttons !== 0) ||
+          (e.pointerType === 'touch')) {
+        hideTooltipPanel();
+      }
+    };
+    viewerContainerElem.addEventListener('pointermove', dragHide);
+  });
+
+  // Hide on any wheel event (zoom)
+  if (canvasEl) {
+    canvasEl.addEventListener('wheel', () => {
+      hideTooltipPanel();
+    }, { passive: true });
+  }
+
+  // Escape key also exits fullscreen
+  document.addEventListener('keydown', (e) => {
+    if ((e.key === 'Escape' || e.key === 'Esc') && isFullscreen) {
+      exitFullscreen();
+    }
+  });
+
+  // Window resize → resize PlayCanvas canvas
+  window.addEventListener('resize', () => {
+    if (isFullscreen && viewerModule.app) {
+      viewerModule.app.resizeCanvas(window.innerWidth, window.innerHeight);
+    } else if (viewerModule.app) {
+      const cw = viewerContainerElem.clientWidth;
+      const ch = viewerContainerElem.clientHeight;
+      viewerModule.app.resizeCanvas(cw, ch);
+    }
+  });
+
+  // Save “initial state” after a brief delay
+  setTimeout(() => {
+    saveCurrentState();
+    document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: tooltipsVisible } }));
+  }, 200);
 
-})();
+})();