Update viewer_ar_ios.js

viewer_ar_ios.js

@@ -1,75 +1,88 @@
-<!-- viewer_ar_ios.js -->
-
 /* viewer_ar_ios.js — AR PlayCanvas + GLB/USDZ via config.json
    - Lit config.json (data-config) => { "glb_url": "...", "usdz_url": "..." }
-   - iOS : AR Quick Look (USDZ) sans zoom, **ouverture directe via <a rel="ar">**
-   - Android/Desktop : WebXR AR (plans HORIZONTAUX uniquement) + slider yaw + blob shadow
-   - Message de démarrage centré & plus grand (iOS ET Android)
+   - iOS : AR Quick Look (USDZ) avec #allowsContentScaling=0 (pas de zoom)
+   - Android/Desktop : WebXR AR (horizontaux uniquement) + slider yaw + blob shadow
    - Éclairage PBR par défaut (sans WebXR light estimation)
    - Monté dans un conteneur choisi (data-mount="#ar-mount") pour Squarespace
 */
 
 (function () {
-  // ===================== Utilitaires: script/config/plateforme =====================
+  // ============ Utils: script tag / config / platform ============
   function getCurrentScript() {
+    // robuste même si currentScript n'est pas dispo
     return document.currentScript || (function () {
       var scripts = document.getElementsByTagName('script');
       return scripts[scripts.length - 1] || null;
     })();
   }
+
   function findConfigUrl() {
     var el = getCurrentScript();
     if (!el) return null;
     var url = el.getAttribute('data-config');
     return url || null;
   }
+
   function isIOS() {
     return /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
   }
+
   function timeout(ms) {
-    return new Promise(function (_res, rej) { setTimeout(function () { rej(new Error("timeout")); }, ms); });
+    return new Promise(function (_res, rej) {
+      setTimeout(function () { rej(new Error("timeout")); }, ms);
+    });
   }
+
   async function loadConfigJson(url) {
     if (!url) return null;
     try {
       var resp = await fetch(url, { cache: 'no-store' });
       if (!resp.ok) throw new Error("HTTP " + resp.status);
-      return await resp.json();
+      var json = await resp.json();
+      return json;
     } catch (e) {
       console.error("Erreur chargement config.json:", e);
       return null;
     }
   }
 
-  // ===================== PlayCanvas (Android/Desktop) =====================
+  // ============ PlayCanvas version fixée (Android/Desktop) ============
   var PC_VERSION = "2.11.7";
   var PC_URLS = {
     esm: ["https://cdn.jsdelivr.net/npm/playcanvas@" + PC_VERSION + "/build/playcanvas.min.mjs"],
     umd: ["https://cdn.jsdelivr.net/npm/playcanvas@" + PC_VERSION + "/build/playcanvas.min.js"]
   };
+
   async function loadPlayCanvasRobust(opts) {
     opts = opts || {};
     var esmFirst = (typeof opts.esmFirst === "boolean") ? opts.esmFirst : true;
     var loadTimeoutMs = (typeof opts.loadTimeoutMs === "number") ? opts.loadTimeoutMs : 15000;
+
     if (window.pc && window.pc.Application) return window.pc;
 
     async function tryESM() {
       for (var i = 0; i < PC_URLS.esm.length; i++) {
+        var url = PC_URLS.esm[i];
         try {
-          var mod = await Promise.race([import(/* @vite-ignore */ PC_URLS.esm[i]), timeout(loadTimeoutMs)]);
+          var mod = await Promise.race([import(/* @vite-ignore */ url), timeout(loadTimeoutMs)]);
           var ns = (mod && (mod.pc || mod["default"])) || mod;
-          if (ns && ns.Application) { if (!window.pc) window.pc = ns; return window.pc; }
-        } catch (_e) {}
+          if (ns && ns.Application) {
+            if (!window.pc) window.pc = ns;
+            return window.pc;
+          }
+        } catch (e) { /* continue */ }
       }
       throw new Error("ESM failed");
     }
+
     async function tryUMD() {
       for (var j = 0; j < PC_URLS.umd.length; j++) {
+        var url2 = PC_URLS.umd[j];
         try {
           await Promise.race([
             new Promise(function (res, rej) {
               var s = document.createElement("script");
-              s.src = PC_URLS.umd[j];
+              s.src = url2;
               s.async = true;
               s.onload = function () { res(); };
               s.onerror = function () { rej(new Error("script error")); };
@@ -78,45 +91,36 @@
             timeout(loadTimeoutMs)
           ]);
           if (window.pc && window.pc.Application) return window.pc;
-        } catch (_e) {}
+        } catch (e) { /* continue */ }
       }
       throw new Error("UMD failed");
     }
+
     try {
       if (esmFirst) return await tryESM();
       return await tryUMD();
-    } catch (_e) {
+    } catch (e) {
       if (esmFirst) return await tryUMD();
       return await tryESM();
     }
   }
 
-  // ===================== UI / Overlay (styles minimaux intégrés) =====================
+  // ============ UI / Overlay commun ============
   var css = [
-    /* Toast en bas */
     ".pc-ar-msg{position:fixed;left:50%;transform:translateX(-50%);bottom:16px;z-index:10002;padding:10px 14px;background:rgba(0,0,0,.65);color:#fff;border-radius:12px;font-family:system-ui,-apple-system,Segoe UI,Roboto,sans-serif;font-size:14px;line-height:1.3;text-align:center;max-width:min(90vw,640px);box-shadow:0 6px 20px rgba(0,0,0,.25);backdrop-filter:blur(4px);pointer-events:none}",
-    /* Variante centrée & plus grande (message de démarrage) */
-    ".pc-ar-msg.pc-ar-msg--centerBig{top:50%;bottom:auto;transform:translate(-50%,-50%);font-size:18px;padding:14px 18px;max-width:min(90vw,720px)}",
-
     "#xr-overlay-root{position:fixed;inset:0;z-index:10001;pointer-events:none}",
 
-    /* Bouton Android/Desktop (optionnel si tu veux un bouton aussi hors-iOS) */
-    "#ar-launch-btn{position:fixed;left:50%;transform:translateX(-50%);bottom:72px;z-index:10003;pointer-events:auto;appearance:none;border:none;border-radius:14px;padding:12px 18px;font-family:system-ui,-apple-system,Segoe UI,Roboto,sans-serif;font-size:15px;font-weight:600;color:#fff;background:rgba(0,0,0,0.85);box-shadow:0 6px 18px rgba(0,0,0,.25);backdrop-filter:blur(6px);cursor:pointer;touch-action:manipulation;-webkit-tap-highlight-color:transparent}",
-    "#ar-launch-btn:active{transform:translateX(-50%) scale(0.98)}",
-    "#ar-launch-btn:disabled{opacity:.5;cursor:not-allowed}",
-
-    /* Lien Quick Look iOS — visuel type bouton */
-    "a.ar-launch-link{position:fixed;left:50%;transform:translateX(-50%);bottom:72px;z-index:10003;pointer-events:auto;display:inline-block;text-decoration:none;text-align:center;border-radius:14px;padding:12px 18px;font-family:system-ui,-apple-system,Segoe UI,Roboto,sans-serif;font-size:15px;font-weight:600;color:#fff;background:rgba(0,0,0,0.85);box-shadow:0 6px 18px rgba(0,0,0,.25);backdrop-filter:blur(6px);-webkit-tap-highlight-color:transparent}",
-    "a.ar-launch-link:active{transform:translateX(-50%) scale(0.98)}",
-
-    /* --- NE PAS MODIFIER : panneau Rotation (WebXR) --- */
     ".ar-ui{position:absolute;right:12px;top:50%;transform:translateY(-50%);background:rgba(0,0,0,0.55);color:#fff;padding:12px 10px;border-radius:16px;width:56px;font-family:system-ui,-apple-system,Segoe UI,Roboto,sans-serif;pointer-events:auto;display:flex;flex-direction:column;align-items:center;gap:8px;box-shadow:0 6px 18px rgba(0,0,0,.25);backdrop-filter:blur(6px);touch-action:none}",
     ".ar-ui .label{font-size:12px;text-align:center;opacity:.95}",
     ".rotY-wrap{position:relative;width:48px;height:200px;display:flex;align-items:center;justify-content:center;touch-action:none;overflow:visible;pointer-events:auto}",
     ".rotY-rail{position:absolute;left:50%;transform:translateX(-50%);width:4px;height:100%;background:rgba(255,255,255,.35);border-radius:2px;pointer-events:none}",
     ".rotY-knob{position:absolute;left:50%;width:22px;height:22px;border-radius:50%;background:#fff;box-shadow:0 2px 8px rgba(0,0,0,.35);transform:translate(-50%,-50%);top:50%;will-change:top;touch-action:none;pointer-events:none}",
     ".ar-ui input[type=\"range\"].rotY{position:absolute;opacity:0;pointer-events:none;width:0;height:0}",
-    ".ar-ui .val{font-size:12px;opacity:.95}"
+    ".ar-ui .val{font-size:12px;opacity:.95}",
+
+    /* iOS Quick Look button */
+    "#ios-quicklook-btn{position:fixed;left:50%;transform:translateX(-50%);bottom:16px;z-index:10003;display:inline-block;pointer-events:auto}",
+    "#ios-quicklook-btn img{display:block;height:44px;width:auto}"
   ].join("\n");
   var styleTag = document.createElement("style");
   styleTag.textContent = css;
@@ -124,25 +128,26 @@
 
   function ensureOverlayRoot() {
     var r = document.getElementById("xr-overlay-root");
-    if (!r) { r = document.createElement("div"); r.id = "xr-overlay-root"; document.body.appendChild(r); }
+    if (!r) {
+      r = document.createElement("div");
+      r.id = "xr-overlay-root";
+      document.body.appendChild(r);
+    }
     return r;
   }
   var overlayRoot = ensureOverlayRoot();
 
-  // --------- Système de messages : toast bas OU centre agrandi ----------
-  function getMessageEl() {
+  function message(msg) {
     var el = overlayRoot.querySelector(".pc-ar-msg");
-    if (!el) { el = document.createElement("div"); el.className = "pc-ar-msg"; overlayRoot.appendChild(el); }
-    return el;
-  }
-  function messageToast(txt) {
-    var el = getMessageEl(); el.classList.remove("pc-ar-msg--centerBig"); el.textContent = txt;
-  }
-  function messageCenterBig(txt) {
-    var el = getMessageEl(); el.classList.add("pc-ar-msg--centerBig"); el.textContent = txt;
+    if (!el) {
+      el = document.createElement("div");
+      el.className = "pc-ar-msg";
+      overlayRoot.appendChild(el);
+    }
+    el.textContent = msg;
   }
 
-  // ===================== iOS Quick Look helpers =====================
+  // iOS Quick Look URL (empêche le pinch to scale)
   function buildQuickLookHref(usdzUrl) {
     try {
       var u = new URL(usdzUrl, window.location.href);
@@ -151,53 +156,80 @@
       params.set('allowsContentScaling', '0');
       u.hash = params.toString();
       return u.toString();
-    } catch (_e) {
+    } catch (e) {
       return usdzUrl + (usdzUrl.indexOf('#') >= 0 ? '&' : '#') + 'allowsContentScaling=0';
     }
   }
-  // Affiche une **ancre visible** rel="ar" (obligatoire pour ouverture directe)
-  function ensureIOSQuickLookLink(usdzUrl) {
-    var link = document.getElementById("ar-launch-link");
-    if (!link) {
-      link = document.createElement("a");
-      link.id = "ar-launch-link";
-      link.className = "ar-launch-link";
-      link.setAttribute("rel", "ar");
-      link.textContent = "Lancer l’AR";
-      document.body.appendChild(link);
-    }
-    link.setAttribute("href", buildQuickLookHref(usdzUrl));
-    return link;
+
+  function ensureQuickLookButton(USDZ_URL) {
+    var btn = document.getElementById("ios-quicklook-btn");
+    if (btn) return btn;
+
+    var anchor = document.createElement("a");
+    anchor.id = "ios-quicklook-btn";
+    anchor.setAttribute("rel", "ar");
+    anchor.setAttribute("href", buildQuickLookHref(USDZ_URL));
+
+    var img = document.createElement("img");
+    img.alt = "Voir en AR";
+    img.src =
+      "data:image/svg+xml;charset=utf-8," +
+      encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" width="160" height="44"><rect rx="8" ry="8" width="160" height="44" fill="black"/><text x="80" y="28" font-size="14" text-anchor="middle" fill="white" font-family="system-ui, -apple-system, Segoe UI, Roboto">Voir en AR</text></svg>');
+
+    anchor.appendChild(img);
+    document.body.appendChild(anchor);
+    return anchor;
   }
 
-  // ===================== Canvas monté dans un conteneur (Squarespace ok) =====================
+  // ============ Canvas monté dans un conteneur contrôlé (Squarespace) ============
   function ensureCanvas() {
     var scriptEl = getCurrentScript();
     var mountSel = scriptEl && scriptEl.getAttribute('data-mount');
     var desiredHeight = (scriptEl && scriptEl.getAttribute('data-height')) || '70vh';
 
+    // Trouve le conteneur cible
     var mountEl = null;
     if (mountSel) mountEl = document.querySelector(mountSel);
-    if (!mountEl) { mountEl = document.createElement('div'); mountEl.id = 'ar-mount-fallback'; document.body.insertBefore(mountEl, document.body.firstChild); }
+    if (!mountEl) {
+      // fallback : tout en haut du body (pour éviter "sous le footer")
+      mountEl = document.createElement('div');
+      mountEl.id = 'ar-mount-fallback';
+      document.body.insertBefore(mountEl, document.body.firstChild);
+    }
 
-    var ms = mountEl.style;
-    if (!ms.position) ms.position = 'relative';
-    ms.width = ms.width || '100%';
-    ms.minHeight = ms.minHeight || desiredHeight;
-    ms.touchAction = ms.touchAction || 'manipulation';
-    ms.webkitTapHighlightColor = 'transparent';
+    // Style du conteneur
+    var mountStyle = mountEl.style;
+    if (!mountStyle.position) mountStyle.position = 'relative';
+    mountStyle.width = mountStyle.width || '100%';
+    mountStyle.minHeight = mountStyle.minHeight || desiredHeight;
+    mountStyle.touchAction = mountStyle.touchAction || 'manipulation';
+    mountStyle.webkitTapHighlightColor = 'transparent';
 
+    // Réutilise ou crée le canvas
     var canvas = mountEl.querySelector('#application-canvas');
-    if (!canvas) { canvas = document.createElement('canvas'); canvas.id = 'application-canvas'; mountEl.appendChild(canvas); }
+    if (!canvas) {
+      canvas = document.createElement('canvas');
+      canvas.id = 'application-canvas';
+      mountEl.appendChild(canvas);
+    }
 
+    // Le canvas remplit le conteneur
     var cs = canvas.style;
-    cs.position = 'absolute'; cs.left = '0'; cs.top = '0'; cs.width = '100%'; cs.height = '100%'; cs.display = 'block';
+    cs.position = 'absolute';
+    cs.left = '0';
+    cs.top = '0';
+    cs.width = '100%';
+    cs.height = '100%';
+    cs.display = 'block';
+
+    // Optionnel : ramener le viewport sur le viewer
+    try {
+      mountEl.scrollIntoView({ behavior: 'instant', block: 'start' });
+    } catch (_) {}
 
-    try { mountEl.scrollIntoView({ behavior: 'instant', block: 'start' }); } catch (_e) {}
     return canvas;
   }
 
-  // ---------- Panneau “Rotation” (inchangé) ----------
   function ensureSliderUI() {
     var p = overlayRoot.querySelector(".ar-ui");
     if (p) return p;
@@ -215,47 +247,46 @@
     return p;
   }
 
-  // ===================== Boot : charge config, iOS vs Android/Desktop =====================
+  // ============ Boot : charge config, route iOS vs Android/Desktop ============
   (async function () {
     var cfgUrl = findConfigUrl();
     var cfg = await loadConfigJson(cfgUrl);
-    var GLB_URL = (cfg && typeof cfg.glb_url === "string" && cfg.glb_url)
-      ? cfg.glb_url
-      : "https://huggingface.co/datasets/MikaFil/viewer_gs/resolve/main/AR/tests/danae_no_metallic.glb";
-    var USDZ_URL = (cfg && typeof cfg.usdz_url === "string" && cfg.usdz_url) ? cfg.usdz_url : null;
+    var GLB_URL = (cfg && typeof cfg.glb_url === "string" && cfg.glb_url) ?
+                  cfg.glb_url :
+                  "https://huggingface.co/datasets/MikaFil/viewer_gs/resolve/main/AR/tests/danae_no_metallic.glb";
+    var USDZ_URL = (cfg && typeof cfg.usdz_url === "string" && cfg.usdz_url) ?
+                   cfg.usdz_url :
+                   null;
 
-    // ---- iOS : Quick Look via lien <a rel="ar"> (ouverture directe) ----
     if (isIOS()) {
       if (USDZ_URL) {
-        ensureIOSQuickLookLink(USDZ_URL);
-        messageCenterBig("Modèle chargé. Appuyez sur « Lancer l’AR » pour démarrer.");
+        ensureQuickLookButton(USDZ_URL);
+        message("iOS détecté : utilisez le bouton « Voir en AR » (AR Quick Look).");
       } else {
-        messageToast("iOS détecté, mais aucun 'usdz_url' dans config.json.");
+        message("iOS détecté, mais aucun 'usdz_url' dans config.json.");
       }
       return;
     }
 
-    // ---- Android/Desktop : WebXR ----
     try {
       await loadPlayCanvasRobust({ esmFirst: true, loadTimeoutMs: 15000 });
     } catch (e) {
       console.error("Chargement PlayCanvas échoué ->", e);
-      messageToast("Impossible de charger PlayCanvas (réseau/CDN). Réessaie plus tard.");
+      message("Impossible de charger PlayCanvas (réseau/CDN). Réessaie plus tard.");
       return;
     }
     initARApp(GLB_URL);
   })();
 
-  // ===================== App WebXR (Android/Desktop) =====================
+  // ============ App Android/Desktop (WebXR) ============
   function initARApp(GLB_URL) {
     var pc = window.pc;
-
     var canvas = ensureCanvas();
-    var sliderPanel = ensureSliderUI();
-    var rotTrack = sliderPanel.querySelector("#ar-rotY-wrap");
-    var rotThumb = sliderPanel.querySelector("#ar-rotY-knob");
-    var rotRangeInput = sliderPanel.querySelector("#ar-rotY");
-    var rotValueLabel = sliderPanel.querySelector("#ar-rotY-val");
+    var ui = ensureSliderUI();
+    var rotWrap = ui.querySelector("#ar-rotY-wrap");
+    var rotKnob = ui.querySelector("#ar-rotY-knob");
+    var rotYInput = ui.querySelector("#ar-rotY");
+    var rotYVal = ui.querySelector("#ar-rotY-val");
 
     window.focus();
 
@@ -274,21 +305,21 @@
     app.on("destroy", function () { window.removeEventListener("resize", onResize); });
     app.start();
 
-    // Rendu / PBR par défaut
+    // Rendu / PBR defaults
     app.scene.gammaCorrection = pc.GAMMA_SRGB;
     app.scene.toneMapping = pc.TONEMAP_ACES;
     app.scene.exposure = 1;
     app.scene.ambientLight = new pc.Color(1, 1, 1);
 
-    // Caméra + lumière
+    // Camera + lumière
     var camera = new pc.Entity("Camera");
     camera.addComponent("camera", { clearColor: new pc.Color(0, 0, 0, 0), farClip: 10000 });
     app.root.addChild(camera);
 
-    var mainLight = new pc.Entity("Light");
-    mainLight.addComponent("light", { type: "directional", intensity: 1.0, castShadows: true, color: new pc.Color(1, 1, 1) });
-    mainLight.setLocalEulerAngles(45, 30, 0);
-    app.root.addChild(mainLight);
+    var light = new pc.Entity("Light");
+    light.addComponent("light", { type: "directional", intensity: 1.0, castShadows: true, color: new pc.Color(1, 1, 1) });
+    light.setLocalEulerAngles(45, 30, 0);
+    app.root.addChild(light);
 
     // Réticule
     var reticleMat = new pc.StandardMaterial();
@@ -296,6 +327,7 @@
     reticleMat.opacity = 0.85;
     reticleMat.blendType = pc.BLEND_NORMAL;
     reticleMat.update();
+
     var reticle = new pc.Entity("Reticle");
     reticle.addComponent("render", { type: "torus", material: reticleMat });
     reticle.setLocalScale(0.12, 0.005, 0.12);
@@ -306,31 +338,42 @@
     var modelRoot = new pc.Entity("ModelRoot");
     modelRoot.enabled = false;
     app.root.addChild(modelRoot);
-
     var modelLoaded = false, placedOnce = false;
 
-    // Ombre de contact (blob)
-    var blobShadowEntity = null;
-    var BLOB_SIZE = 0.4, BLOB_OFFSET_Y = 0.005;
+    // ===== Blob Shadow =====
+    var blob = null;
+    var BLOB_SIZE = 0.4;
+    var BLOB_OFFSET_Y = 0.005;
 
-    function makeBlobTexture(appRef, size) {
-      var s = size || 256;
-      var cvs = document.createElement('canvas'); cvs.width = cvs.height = s;
+    function makeBlobTexture(app, size) {
+      size = size || 256;
+      var cvs = document.createElement('canvas');
+      cvs.width = cvs.height = size;
       var ctx = cvs.getContext('2d');
-      var r = s * 0.45;
-      var grd = ctx.createRadialGradient(s/2, s/2, r*0.2, s/2, s/2, r);
-      grd.addColorStop(0, 'rgba(0,0,0,0.5)'); grd.addColorStop(1, 'rgba(0,0,0,0)');
-      ctx.fillStyle = grd; ctx.fillRect(0,0,s,s);
-      var tex = new pc.Texture(appRef.graphicsDevice, {
-        width: s, height: s, format: pc.PIXELFORMAT_R8_G8_B8_A8,
-        mipmaps: true, magFilter: pc.FILTER_LINEAR, minFilter: pc.FILTER_LINEAR_MIPMAP_LINEAR
+      var r = size * 0.45;
+      var grd = ctx.createRadialGradient(size/2, size/2, r*0.2, size/2, size/2, r);
+      grd.addColorStop(0, 'rgba(0,0,0,0.5)');
+      grd.addColorStop(1, 'rgba(0,0,0,0.0)');
+      ctx.fillStyle = grd;
+      ctx.fillRect(0, 0, size, size);
+
+      var tex = new pc.Texture(app.graphicsDevice, {
+        width: size,
+        height: size,
+        format: pc.PIXELFORMAT_R8_G8_B8_A8,
+        mipmaps: true,
+        magFilter: pc.FILTER_LINEAR,
+        minFilter: pc.FILTER_LINEAR_MIPMAP_LINEAR
       });
-      tex.setSource(cvs); return tex;
+      tex.setSource(cvs);
+      return tex;
     }
+
     function createBlobShadowAt(pos, rot) {
       var tex = makeBlobTexture(app, 256);
+
       var blobMat = new pc.StandardMaterial();
-      blobMat.diffuse = new pc.Color(0,0,0);
+      blobMat.diffuse = new pc.Color(0, 0, 0);
       blobMat.opacity = 1.0;
       blobMat.opacityMap = tex;
       blobMat.opacityMapChannel = 'a';
@@ -339,25 +382,31 @@
       blobMat.depthWrite = false;
       blobMat.alphaTest = 0;
       blobMat.update();
+
       var e = new pc.Entity("BlobShadow");
       e.addComponent("render", { type: "plane", castShadows: false, receiveShadows: false });
       e.render.material = blobMat;
+
       e.setPosition(pos.x, pos.y + BLOB_OFFSET_Y, pos.z);
       e.setRotation(rot);
       e.setLocalScale(BLOB_SIZE, 1, BLOB_SIZE);
+
       app.root.addChild(e);
       return e;
     }
 
-    // Euler de base & rotation slider
+    // Euler de base (évite inversions)
     var baseEulerX = 0, baseEulerZ = 0;
+
+    // Rotation via slider (0..360, 360 en haut / 0 en bas)
     var rotationYDeg = 0;
     function clamp360(d) { return Math.max(0, Math.min(360, d)); }
+
     function updateKnobFromY(yDeg) {
       var t = 1 - (yDeg / 360);
-      rotThumb.style.top = String(t * 100) + "%";
-      rotRangeInput.value = String(Math.round(yDeg));
-      rotValueLabel.textContent = String(Math.round(yDeg)) + "°";
+      rotKnob.style.top = String(t * 100) + "%";
+      rotYInput.value = String(Math.round(yDeg));
+      rotYVal.textContent = String(Math.round(yDeg)) + "°";
     }
     function applyRotationY(deg) {
       var y = clamp360(deg);
@@ -365,25 +414,31 @@
       modelRoot.setEulerAngles(baseEulerX, y, baseEulerZ);
       updateKnobFromY(y);
     }
+
     function updateBlobPositionUnder(pos, rotLikePlane) {
-      if (!blobShadowEntity) return;
-      blobShadowEntity.setPosition(pos.x, pos.y + BLOB_OFFSET_Y, pos.z);
-      if (rotLikePlane) blobShadowEntity.setRotation(rotLikePlane);
+      if (!blob) return;
+      blob.setPosition(pos.x, pos.y + BLOB_OFFSET_Y, pos.z);
+      if (rotLikePlane) blob.setRotation(rotLikePlane);
     }
 
-    // Chargement GLB
+    // Chargement GLB (depuis config.json)
     app.assets.loadFromUrl(GLB_URL, "container", function (err, asset) {
-      if (err) { console.error(err); messageToast("Échec du chargement du modèle GLB."); return; }
+      if (err) { console.error(err); message("Échec du chargement du modèle GLB."); return; }
       var instance = asset.resource.instantiateRenderEntity({ castShadows: true, receiveShadows: false });
       modelRoot.addChild(instance);
-      modelRoot.setLocalScale(1,1,1);
+      modelRoot.setLocalScale(1, 1, 1);
 
+      // Fix matériaux simples
       var renders = instance.findComponents('render');
       for (var ri = 0; ri < renders.length; ri++) {
-        var r = renders[ri]; r.castShadows = true;
+        var r = renders[ri];
+        r.castShadows = true;
         for (var mi = 0; mi < r.meshInstances.length; mi++) {
-          var mat = r.meshInstances[mi].material; if (!mat) continue;
-          if (mat.diffuse && (mat.diffuse.r !== 1 || mat.diffuse.g !== 1 || mat.diffuse.b !== 1)) mat.diffuse.set(1,1,1);
+          var mat = r.meshInstances[mi].material;
+          if (!mat) continue;
+          if (mat.diffuse && (mat.diffuse.r !== 1 || mat.diffuse.g !== 1 || mat.diffuse.b !== 1)) {
+            mat.diffuse.set(1, 1, 1);
+          }
           if (typeof mat.useSkybox !== "undefined") mat.useSkybox = true;
           mat.update();
         }
@@ -393,164 +448,203 @@
       baseEulerX = initE.x; baseEulerZ = initE.z;
 
       modelLoaded = true;
-      messageCenterBig("Modèle chargé. Touchez l’écran pour démarrer l’AR.");
+      message("Modèle chargé. Touchez l’écran pour démarrer l’AR.");
     });
 
-    if (!app.xr.supported) { messageToast("WebXR n’est pas supporté sur cet appareil."); return; }
+    if (!app.xr.supported) { message("WebXR n’est pas supporté sur cet appareil."); return; }
+
+    // Slider fiable (pointer events en capture)
+    var uiInteracting = false;
+    var draggingWrap = false;
+    var activePointerId = null;
 
-    // Slider robuste (pointer events capture)
-    var isUIInteracting = false, isTrackDragging = false, activePointerId = null;
-    function insideTrack(target) { return rotTrack.contains(target); }
+    function insideWrap(target) { return rotWrap.contains(target); }
     function degFromPointer(e) {
-      var rect = rotTrack.getBoundingClientRect();
+      var rect = rotWrap.getBoundingClientRect();
       var y = (e.clientY != null) ? e.clientY : ((e.touches && e.touches[0] && e.touches[0].clientY) || 0);
-      var ratio = (y - rect.top) / rect.height; var t = Math.max(0, Math.min(1, ratio));
+      var ratio = (y - rect.top) / rect.height;
+      var t = Math.max(0, Math.min(1, ratio));
       return (1 - t) * 360;
     }
+
     function onPointerDownCapture(e) {
-      if (!insideTrack(e.target)) return;
-      isUIInteracting = true; isTrackDragging = true;
+      if (!insideWrap(e.target)) return;
+      uiInteracting = true;
+      draggingWrap = true;
       activePointerId = (e.pointerId != null) ? e.pointerId : 1;
-      if (rotTrack.setPointerCapture) { try { rotTrack.setPointerCapture(activePointerId); } catch (_er) {} }
+      if (rotWrap.setPointerCapture) {
+        try { rotWrap.setPointerCapture(activePointerId); } catch (er) {}
+      }
       applyRotationY(degFromPointer(e));
-      e.preventDefault(); e.stopPropagation();
+      e.preventDefault();
+      e.stopPropagation();
     }
     function onPointerMoveCapture(e) {
-      if (!isTrackDragging || ((e.pointerId != null ? e.pointerId : 1) !== activePointerId)) return;
+      if (!draggingWrap || ((e.pointerId != null ? e.pointerId : 1) !== activePointerId)) return;
       applyRotationY(degFromPointer(e));
-      e.preventDefault(); e.stopPropagation();
+      e.preventDefault();
+      e.stopPropagation();
     }
     function endDrag(e) {
-      if (!isTrackDragging || ((e.pointerId != null ? e.pointerId : 1) !== activePointerId)) return;
-      isTrackDragging = false; isUIInteracting = false;
-      if (rotTrack.releasePointerCapture) { try { rotTrack.releasePointerCapture(activePointerId); } catch (_er) {} }
-      activePointerId = null; e.preventDefault(); e.stopPropagation();
+      if (!draggingWrap || ((e.pointerId != null ? e.pointerId : 1) !== activePointerId)) return;
+      draggingWrap = false;
+      uiInteracting = false;
+      if (rotWrap.releasePointerCapture) {
+        try { rotWrap.releasePointerCapture(activePointerId); } catch (er) {}
+      }
+      activePointerId = null;
+      e.preventDefault();
+      e.stopPropagation();
     }
+
     document.addEventListener("pointerdown", onPointerDownCapture, { capture: true, passive: false });
     document.addEventListener("pointermove", onPointerMoveCapture, { capture: true, passive: false });
     document.addEventListener("pointerup", endDrag, { capture: true, passive: false });
     document.addEventListener("pointercancel", endDrag, { capture: true, passive: false });
 
-    // Démarrage AR (tap écran)
+    // --- Démarrage AR (Android/Desktop)
     function activateAR() {
-      if (!app.xr.isAvailable(pc.XRTYPE_AR)) { messageToast("AR immersive indisponible sur cet appareil."); return; }
+      if (!app.xr.isAvailable(pc.XRTYPE_AR)) { message("AR immersive indisponible sur cet appareil."); return; }
       if (!app.xr.domOverlay) app.xr.domOverlay = {};
       app.xr.domOverlay.root = document.getElementById("xr-overlay-root");
       camera.camera.startXr(pc.XRTYPE_AR, pc.XRSPACE_LOCALFLOOR, {
         requiredFeatures: ["hit-test", "dom-overlay"],
         domOverlay: { root: app.xr.domOverlay.root },
         callback: function (err) {
-          if (err) { console.error("Échec du démarrage AR :", err); messageToast("Échec du démarrage AR : " + (err.message || err)); }
+          if (err) {
+            console.error("Échec du démarrage AR :", err);
+            message("Échec du démarrage AR : " + (err.message || err));
+          }
         }
       });
     }
-    app.mouse.on("mousedown", function () { if (!app.xr.active && !isUIInteracting) activateAR(); });
+    app.mouse.on("mousedown", function () { if (!app.xr.active && !uiInteracting) activateAR(); });
     if (app.touch) {
       app.touch.on("touchend", function (evt) {
-        if (!app.xr.active && !isUIInteracting) activateAR();
-        evt.event.preventDefault(); evt.event.stopPropagation();
+        if (!app.xr.active && !uiInteracting) activateAR();
+        evt.event.preventDefault();
+        evt.event.stopPropagation();
       });
     }
     app.keyboard.on("keydown", function (evt) { if (evt.key === pc.KEY_ESCAPE && app.xr.active) app.xr.end(); });
 
     // Hit-test HORIZONTAL uniquement
-    var TMP_IN = new pc.Vec3(0,1,0), TMP_OUT = new pc.Vec3();
+    var TMP_IN = new pc.Vec3(0, 1, 0), TMP_OUT = new pc.Vec3();
     function isHorizontalUpFacing(rot, minDot) {
-      var md = (typeof minDot === "number") ? minDot : 0.75;
+      minDot = (typeof minDot === "number") ? minDot : 0.75;
       rot.transformVector(TMP_IN, TMP_OUT);
-      return TMP_OUT.y >= md;
+      return TMP_OUT.y >= minDot;
     }
+
+    // Hit Test global
     app.xr.hitTest.on("available", function () {
       app.xr.hitTest.start({
         entityTypes: [pc.XRTRACKABLE_POINT, pc.XRTRACKABLE_PLANE],
         callback: function (err, hitSource) {
-          if (err) { messageToast("Le AR hit test n’a pas pu démarrer."); return; }
+          if (err) { message("Le AR hit test n’a pas pu démarrer."); return; }
           hitSource.on("result", function (pos, rot) {
             if (!isHorizontalUpFacing(rot)) return;
-            reticle.enabled = true; reticle.setPosition(pos); reticle.setRotation(rot);
+
+            reticle.enabled = true;
+            reticle.setPosition(pos);
+            reticle.setRotation(rot);
 
             if (modelLoaded && !placedOnce) {
-              modelRoot.enabled = true; modelRoot.setPosition(pos);
-              blobShadowEntity = createBlobShadowAt(pos, rot);
+              modelRoot.enabled = true;
+              modelRoot.setPosition(pos);
 
-              var e = new pc.Vec3(); rot.getEulerAngles(e);
-              var y0 = ((e.y % 360) + 360) % 360; applyRotationY(y0);
+              // Ombre de contact
+              blob = createBlobShadowAt(pos, rot);
 
-              placedOnce = true; rotRangeInput.disabled = false;
-              messageToast("Objet placé. Glissez pour déplacer, tournez-le avec le slider →");
+              var e = new pc.Vec3();
+              rot.getEulerAngles(e);
+              var y0 = ((e.y % 360) + 360) % 360;
+              applyRotationY(y0);
+
+              placedOnce = true;
+              rotYInput.disabled = false;
+              message("Objet placé. Glissez pour déplacer, tournez-le avec le slider →");
             }
           });
         }
       });
     });
 
-    // Drag XR — ignoré si UI active
-    var isModelDragging = false;
+    // Déplacement XR (drag) — ignoré si UI active
+    var isDragging = false;
     app.xr.input.on("add", function (inputSource) {
       inputSource.on("selectstart", function () {
-        if (isUIInteracting) return;
+        if (uiInteracting) return;
         if (!placedOnce || !modelLoaded) return;
+
         inputSource.hitTestStart({
           entityTypes: [pc.XRTRACKABLE_POINT, pc.XRTRACKABLE_PLANE],
           callback: function (err, transientSource) {
             if (err) return;
-            isModelDragging = true;
+            isDragging = true;
+
             transientSource.on("result", function (pos, rot) {
-              if (!isModelDragging) return;
+              if (!isDragging) return;
               if (!isHorizontalUpFacing(rot)) return;
-              modelRoot.setPosition(pos); updateBlobPositionUnder(pos, rot);
+              modelRoot.setPosition(pos);
+              updateBlobPositionUnder(pos, rot);
             });
-            transientSource.once("remove", function () { isModelDragging = false; });
+
+            transientSource.once("remove", function () { isDragging = false; });
           }
         });
       });
-      inputSource.on("selectend", function () { isModelDragging = false; });
+      inputSource.on("selectend", function () { isDragging = false; });
     });
 
-    // Desktop : rotation souris
-    var isRotateMode = false, lastMouseX = 0;
+    // Desktop : rotation souris (ignore si UI)
+    var rotateMode = false, lastMouseX = 0;
     var ROTATE_SENSITIVITY = 0.25;
     app.mouse.on("mousedown", function (e) {
-      if (!app.xr.active || !placedOnce || isUIInteracting) return;
-      if (e.button === 0 && !e.shiftKey) { isModelDragging = true; }
-      else if (e.button === 2 || (e.button === 0 && e.shiftKey)) { isRotateMode = true; lastMouseX = e.x; }
+      if (!app.xr.active || !placedOnce || uiInteracting) return;
+      if (e.button === 0 && !e.shiftKey) {
+        isDragging = true;
+      } else if (e.button === 2 || (e.button === 0 && e.shiftKey)) {
+        rotateMode = true;
+        lastMouseX = e.x;
+      }
     });
     app.mouse.on("mousemove", function (e) {
-      if (!app.xr.active || !placedOnce || isUIInteracting) return;
-      if (isModelDragging) {
+      if (!app.xr.active || !placedOnce || uiInteracting) return;
+      if (isDragging) {
         if (reticle.enabled) {
-          var p = reticle.getPosition(); modelRoot.setPosition(p); updateBlobPositionUnder(p, null);
+          var p = reticle.getPosition();
+          modelRoot.setPosition(p);
+          updateBlobPositionUnder(p, null);
         }
-      } else if (isRotateMode && modelRoot.enabled) {
-        var dx = e.x - lastMouseX; lastMouseX = e.x;
+      } else if (rotateMode && modelRoot.enabled) {
+        var dx = e.x - lastMouseX;
+        lastMouseX = e.x;
         applyRotationY(rotationYDeg + dx * ROTATE_SENSITIVITY);
       }
     });
-    app.mouse.on("mouseup", function () { isModelDragging = false; isRotateMode = false; });
+    app.mouse.on("mouseup", function () { isDragging = false; rotateMode = false; });
     window.addEventListener("contextmenu", function (e) { e.preventDefault(); });
 
-    // Slider (input range, accessibilité)
-    rotRangeInput.disabled = true;
-    rotRangeInput.addEventListener("input", function (e) {
+    // Slider (accessibilité clavier)
+    rotYInput.disabled = true;
+    rotYInput.addEventListener("input", function (e) {
       if (!modelRoot.enabled) return;
-      var v = parseFloat(e.target.value || "0"); applyRotationY(v);
+      var v = parseFloat(e.target.value || "0");
+      applyRotationY(v);
     }, { passive: true });
 
-    // Événements AR
-    app.xr.on("start", function () { messageToast("Session AR démarrée. Visez le sol pour détecter un plan…"); reticle.enabled = true; });
-    app.xr.on("end", function () {
-      messageToast("Session AR terminée.");
-      reticle.enabled = false; isModelDragging = false; isRotateMode = false; rotRangeInput.disabled = true;
-    });
+    // AR events
+    app.xr.on("start", function () { message("Session AR démarrée. Visez le sol pour détecter un plan…"); reticle.enabled = true; });
+    app.xr.on("end", function () { message("Session AR terminée."); reticle.enabled = false; isDragging = false; rotateMode = false; rotYInput.disabled = true; });
     app.xr.on("available:" + pc.XRTYPE_AR, function (a) {
-      if (!a) messageToast("AR immersive indisponible.");
-      else if (!app.xr.hitTest.supported) messageToast("AR Hit Test non supporté.");
-      else messageToast(modelLoaded ? "Touchez l’écran pour démarrer l’AR." : "Chargement du modèle…");
+      if (!a) message("AR immersive indisponible.");
+      else if (!app.xr.hitTest.supported) message("AR Hit Test non supporté.");
+      else message(modelLoaded ? "Touchez l’écran pour démarrer l’AR." : "Chargement du modèle…");
     });
 
-    if (!app.xr.isAvailable(pc.XRTYPE_AR)) messageToast("AR immersive indisponible.");
-    else if (!app.xr.hitTest.supported) messageToast("AR Hit Test non supporté.");
-    else messageToast("Chargement du modèle…");
+    if (!app.xr.isAvailable(pc.XRTYPE_AR)) message("AR immersive indisponible.");
+    else if (!app.xr.hitTest.supported) message("AR Hit Test non supporté.");
+    else message("Chargement du modèle…");
   }
 })();
-