Update viewer.js

viewer.js

@@ -1,6 +1,7 @@
 // viewer.js
 // ==============================
-// WhatsApp iOS: Fallback to webgl1 if webgl2 fails
+// viewer.js
+// ==============================
 
 let pc;            // will hold the PlayCanvas module once imported
 export let app = null;
@@ -14,15 +15,6 @@ let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minPivotY, min
 let modelX, modelY, modelZ, modelScale, modelRotationX, modelRotationY, modelRotationZ;
 let plyUrl, glbUrl;
 
-function isWhatsappIOS() {
-  return /iphone|ipod|ipad/i.test(navigator.userAgent) &&
-         /WhatsApp/i.test(navigator.userAgent);
-}
-function isInstagramIOS() {
-  return /iphone|ipod|ipad/i.test(navigator.userAgent) &&
-         /Instagram/i.test(navigator.userAgent);
-}
-
 /**
  * initializeViewer(config, instanceId)
  */
@@ -31,15 +23,6 @@ export async function initializeViewer(config, instanceId) {
 
   const isIOS    = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
-  const isWA = isWhatsappIOS();
-  const isIG = isInstagramIOS();
-
-  if (isWA) {
-    alert("WhatsApp iOS detected: trying WebGL fallback.");
-  }
-  if (isIG) {
-    // Optional: alert("Instagram iOS detected.");
-  }
 
   // 1. Read config
   plyUrl = config.ply_url;
@@ -112,43 +95,14 @@ export async function initializeViewer(config, instanceId) {
 
   try {
     // 6. Setup device & app
-    let device = null;
-    let contextSuccess = false;
-    let contextType = null;
-
-    // Try webgl2, then webgl1
-    try {
-      device = await pc.createGraphicsDevice(canvas, {
-        deviceTypes: ["webgl2"],
-        glslangUrl:  "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
-        twgslUrl:    "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
-        antialias:   false
-      });
-      device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
-      contextType = "webgl2";
-      contextSuccess = true;
-      alert("WebGL2 context creation successful.");
-    } catch (err) {
-      // Try webgl1 if webgl2 fails
-      try {
-        device = await pc.createGraphicsDevice(canvas, {
-          deviceTypes: ["webgl1"],
-          glslangUrl:  "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
-          twgslUrl:    "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
-          antialias:   false
-        });
-        device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
-        contextType = "webgl1";
-        contextSuccess = true;
-        alert("WebGL1 context creation successful (WebGL2 failed).");
-      } catch (err2) {
-        alert("WebGL context creation FAILED.\nWhatsApp iOS browser does not support WebGL. Try opening this link in Safari or another browser.");
-        progressDialog.innerHTML = `<p style="color: red">WebGL is not supported in this browser. Please try opening in Safari or Chrome.</p>`;
-        throw err2;
-      }
-    }
+    const device = await pc.createGraphicsDevice(canvas, {
+      deviceTypes: ["webgl2"],
+      glslangUrl:  "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
+      twgslUrl:    "https://playcanvas.vercel.app/static/lib/twgsl/twgsl.js",
+      antialias:   false
+    });
+    device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
 
-    // ... continue as before ...
     const opts = new pc.AppOptions();
     opts.graphicsDevice = device;
     opts.mouse = new pc.Mouse(canvas);
@@ -172,6 +126,8 @@ export async function initializeViewer(config, instanceId) {
     app = new pc.Application(canvas, opts);
     app.setCanvasFillMode(pc.FILLMODE_NONE);
     app.setCanvasResolution(pc.RESOLUTION_AUTO);
+    //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 => {
@@ -197,7 +153,7 @@ export async function initializeViewer(config, instanceId) {
       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`
+        url: https://huggingface.co/datasets/bilca/ply_files/resolve/main/galeries/blanc.png
       }, { type: pc.TEXTURETYPE_RGBP, mipmaps: false })
     };
 
@@ -206,7 +162,7 @@ export async function initializeViewer(config, instanceId) {
     assets.model.on('load', () => progressDialog.style.display = 'none');
     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 progCheck = setInterval(() => {
@@ -263,6 +219,7 @@ export async function initializeViewer(config, instanceId) {
         clearColor: config.canvas_background
           ? parseInt(config.canvas_background.substr(1, 2), 16) / 255
           : 0,
+        //toneMapping: pc.TONEMAP_ACES
       });
       cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
       cameraEntity.lookAt(modelEntity.getPosition());
@@ -334,11 +291,10 @@ 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>;
   }
 }
 
-// (resetViewerCamera and cleanupViewer unchanged)
 export function resetViewerCamera() {
   try {
     if (!cameraEntity || !modelEntity || !app) return;
@@ -402,3 +358,410 @@ export function cleanupViewer() {
     resizeObserver = null;
   }
 }
+
+interface.js : 
+
+// interface.js
+// ==============================
+// interface.js
+// ==============================
+
+// Store a reference to the <script> tag that loaded this file
+const currentScriptTag = document.currentScript;
+
+(async function() {
+  // ─── 1. Locate the <script> and read data-config ───────────────────────────────
+  let scriptTag = currentScriptTag;
+  if (!scriptTag) {
+    const scripts = document.getElementsByTagName('script');
+    for (let i = 0; i < scripts.length; i++) {
+      if (scripts[i].src.includes('interface.js') && scripts[i].hasAttribute('data-config')) {
+        scriptTag = scripts[i];
+        break;
+      }
+    }
+    if (!scriptTag && scripts.length > 0) {
+      scriptTag = scripts[scripts.length - 1];
+    }
+  }
+
+  const configUrl = scriptTag.getAttribute('data-config');
+  let config = {};
+  if (configUrl) {
+    try {
+      const response = await fetch(configUrl);
+      config = await response.json();
+    } catch (error) {
+      console.error("Error loading config file:", error);
+      return;
+    }
+  } else {
+    console.error("No config file provided. Please set a data-config attribute on the <script> tag.");
+    return;
+  }
+
+  // ─── 2. If config.css_url is provided, inject a <link> to that CSS ─────────────
+  if (config.css_url) {
+    const linkEl = document.createElement('link');
+    linkEl.rel = "stylesheet";
+    linkEl.href = config.css_url;
+    document.head.appendChild(linkEl);
+  }
+
+  // ─── 3. Generate a unique instanceId for this widget ───────────────────────────
+  const instanceId = Math.random().toString(36).substr(2, 8);
+
+  // ─── 4. Compute the aspect ratio (padding-bottom %) ────────────────────────────
+  let aspectPercent = "100%";
+  if (config.aspect) {
+    if (config.aspect.includes(":")) {
+      const parts = config.aspect.split(":");
+      const w = parseFloat(parts[0]);
+      const h = parseFloat(parts[1]);
+      if (!isNaN(w) && !isNaN(h) && w > 0) {
+        aspectPercent = (h / w * 100) + "%";
+      }
+    } else {
+      const aspectValue = parseFloat(config.aspect);
+      if (!isNaN(aspectValue) && aspectValue > 0) {
+        aspectPercent = (100 / aspectValue) + "%";
+      }
+    }
+  } else {
+    const parentContainer = scriptTag.parentNode;
+    const containerWidth  = parentContainer.offsetWidth;
+    const containerHeight = parentContainer.offsetHeight;
+    if (containerWidth > 0 && containerHeight > 0) {
+      aspectPercent = (containerHeight / containerWidth * 100) + "%";
+    }
+  }
+
+  // ─── 5. Create the widget container (no GIF preview, no close button) ───────────
+  const widgetContainer = document.createElement('div');
+  widgetContainer.id = 'ply-widget-container-' + instanceId;
+  widgetContainer.classList.add('ply-widget-container');
+  widgetContainer.style.height = "0";
+  widgetContainer.style.paddingBottom = aspectPercent;
+  widgetContainer.setAttribute('data-original-aspect', aspectPercent);
+
+  // Conditionally include the “tooltips-toggle” button only if config.tooltips_url is defined
+  const tooltipsButtonHTML = config.tooltips_url
+    ? <button id="tooltips-toggle-${instanceId}" class="widget-button tooltips-toggle">⦿</button>
+    : '';
+
+  // Add the 3D-viewer HTML + 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>
+      </div>
+      <button id="fullscreen-toggle-${instanceId}" class="widget-button fullscreen-toggle">⇱</button>
+      <button id="help-toggle-${instanceId}" class="widget-button help-toggle">?</button>
+      <button id="reset-camera-btn-${instanceId}" class="widget-button reset-camera-btn">
+        <span class="reset-icon">⟲</span>
+      </button>
+      ${tooltipsButtonHTML}
+      <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="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 ──────────────────────────────────
+  const viewerContainerElem = document.getElementById('viewer-container-' + instanceId);
+  const fullscreenToggle    = document.getElementById('fullscreen-toggle-' + instanceId);
+  const helpToggle          = document.getElementById('help-toggle-' + instanceId);
+  const helpCloseBtn        = document.getElementById('help-close-' + instanceId);
+  const resetCameraBtn      = document.getElementById('reset-camera-btn-' + instanceId);
+  const tooltipsToggleBtn   = document.getElementById('tooltips-toggle-' + instanceId);
+  const menuContent         = document.getElementById('menu-content-' + instanceId);
+  const helpTextDiv         = menuContent.querySelector('.help-text');
+
+  // 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');
+
+  // ─── 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 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 the two new French lines
+  if (isMobile) {
+    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 = 
+      - 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';
+
+  // Variable to hold the drag-hide listener reference
+  let dragHide = null;
+
+  // Utilities to hide panels
+  function hideTooltipPanel() {
+    if (dragHide) {
+      viewerContainerElem.removeEventListener('pointermove', dragHide);
+      dragHide = null;
+    }
+    tooltipPanel.style.display = 'none';
+  }
+  function hideHelpPanel() {
+    menuContent.style.display = 'none';
+  }
+
+  // ─── 7. Dynamically load viewer.js ─────────────────────────────────────────
+  let viewerModule;
+  try {
+    viewerModule = await import('https://mikafil-viewer-gs.static.hf.space/viewer.js');
+    await viewerModule.initializeViewer(config, instanceId);
+  } catch (err) {
+    console.error("Failed to load viewer.js or initialize the 3D viewer:", err);
+    return;
+  }
+
+  const canvasId = 'canvas-' + instanceId;
+  const canvasEl = document.getElementById(canvasId);
+
+  // ─── 8. Conditional display of tooltips-toggle button ─────────────────────────
+  if (tooltipsToggleBtn) {
+    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;
+    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,
+      },
+      viewer: {
+        borderRadius: viewerContainerElem.style.borderRadius,
+        border:       viewerContainerElem.style.border,
+      }
+    };
+  }
+
+  function restoreOriginalStyles() {
+    if (!savedState) return;
+    const 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.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) {
+      viewerModule.app.resizeCanvas(
+        viewerContainerElem.clientWidth,
+        viewerContainerElem.clientHeight
+      );
+    }
+
+    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(() => {
+          applyFullscreenStyles();
+          widgetContainer.classList.add('fake-fullscreen');
+        });
+    } else {
+      applyFullscreenStyles();
+      widgetContainer.classList.add('fake-fullscreen');
+    }
+  }
+
+  function exitFullscreen() {
+    if (document.fullscreenElement === widgetContainer && document.exitFullscreen) {
+      document.exitFullscreen().catch(() => {});
+    }
+    widgetContainer.classList.remove('fake-fullscreen');
+    restoreOriginalStyles();
+    isFullscreen = false;
+  }
+
+  // ─── 10. Hook up event listeners ───────────────────────────────────────────
+  fullscreenToggle.addEventListener('click', () => {
+    hideTooltipPanel();
+    isFullscreen ? exitFullscreen() : enterFullscreen();
+  });
+  document.addEventListener('fullscreenchange', () => {
+    if (!document.fullscreenElement && 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();
+    }
+  });
+
+  if (tooltipsToggleBtn) {
+    let tooltipsVisible = !!config.showTooltipsDefault;
+    tooltipsToggleBtn.style.opacity = tooltipsVisible ? '1' : '0.5';
+    tooltipsToggleBtn.addEventListener('click', () => {
+      hideTooltipPanel();
+      tooltipsVisible = !tooltipsVisible;
+      tooltipsToggleBtn.style.opacity = tooltipsVisible ? '1' : '0.5';
+      document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: tooltipsVisible } }));
+    });
+  }
+
+  tooltipCloseBtn.addEventListener('click', hideTooltipPanel);
+
+  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';
+    dragHide = (e) => {
+      if ((e.pointerType === 'mouse' && e.buttons !== 0) || e.pointerType === 'touch') {
+        hideTooltipPanel();
+      }
+    };
+    viewerContainerElem.addEventListener('pointermove', dragHide);
+  });
+
+  if (canvasEl) {
+    canvasEl.addEventListener('wheel', hideTooltipPanel, { passive: true });
+  }
+  document.addEventListener('keydown', (e) => {
+    if ((e.key === 'Escape' || e.key === 'Esc') && isFullscreen) exitFullscreen();
+  });
+  window.addEventListener('resize', () => {
+    if (viewerModule.app) {
+      if (isFullscreen) {
+        viewerModule.app.resizeCanvas(window.innerWidth, window.innerHeight);
+      } else {
+        viewerModule.app.resizeCanvas(
+          viewerContainerElem.clientWidth,
+          viewerContainerElem.clientHeight
+        );
+      }
+    }
+  });
+
+  // Save “initial state” after a brief delay
+  setTimeout(() => {
+    saveCurrentState();
+    document.dispatchEvent(new CustomEvent('toggle-tooltips', { detail: { visible: !!config.showTooltipsDefault } }));
+  }, 200);
+
+})();