Update viewer.js

viewer.js

@@ -1,589 +1,213 @@
-// viewer.js
-// ==============================
-
 /* -------------------------------------------
    Utils
+   (les helpers image ne sont plus nécessaires pour .sog,
+   mais on les garde sans effet de bord pour compat ascendante)
 -------------------------------------------- */
 
-// (Conservé pour compat, même si .sog n'en a pas besoin)
 async function loadImageAsTexture(url, app) {
   return new Promise((resolve, reject) => {
     const img = new window.Image();
-    img.crossOrigin = "anonymous";
-    img.onload = function () {
-      const tex = new pc.Texture(app.graphicsDevice, {
-        width: img.width,
-        height: img.height,
-        format: pc.PIXELFORMAT_R8_G8_B8_A8
-      });
-      tex.setSource(img);
-      resolve(tex);
-    };
-    img.onerror = reject;
-    img.src = url;
   });
 }
-
-// Patch global Image -> force CORS
+// Patch global Image -> force CORS (sans incidence pour .sog)
 (function () {
   const OriginalImage = window.Image;
   window.Image = function (...args) {
-    const img = new OriginalImage(...args);
-    img.crossOrigin = "anonymous";
-    return img;
-  };
-})();
-
-function hexToRgbaArray(hex) {
-  try {
-    hex = String(hex || "").replace("#", "");
-    if (hex.length === 6) hex += "FF";
-    if (hex.length !== 8) return [1, 1, 1, 1];
-    const num = parseInt(hex, 16);
-    return [
-      ((num >> 24) & 0xff) / 255,
-      ((num >> 16) & 0xff) / 255,
-      ((num >> 8) & 0xff) / 255,
-      (num & 0xff) / 255
-    ];
-  } catch (e) {
-    console.warn("hexToRgbaArray error:", e);
-    return [1, 1, 1, 1];
-  }
-}
-
-// Parcours récursif d'une hiérarchie d'entités
-function traverse(entity, callback) {
-  callback(entity);
-  if (entity.children) {
-    entity.children.forEach((child) => traverse(child, callback));
-  }
-}
-
-/* -------------------------------------------
-   Chargement unique de ctrl_camera_pr_env.js
--------------------------------------------- */
-
-async function ensureOrbitScriptsLoaded() {
-  if (window.__PLY_ORBIT_LOADED__) return;
-  if (window.__PLY_ORBIT_LOADING__) {
-    await window.__PLY_ORBIT_LOADING__;
-    return;
-  }
-
-  window.__PLY_ORBIT_LOADING__ = new Promise((resolve, reject) => {
-    const s = document.createElement("script");
-    // IMPORTANT : charger le script free-camera + collisions (pas l'ancienne orbit-camera)
-    s.src = "https://mikafil-viewer-sgos.static.hf.space/deplacement_dans_env/ctrl_camera_pr_env.js";
-    s.async = true;
-    s.onload = () => {
-      window.__PLY_ORBIT_LOADED__ = true;
-      resolve();
-    };
-    s.onerror = (e) => {
-      console.error("[viewer.js] Failed to load ctrl_camera_pr_env.js", e);
-      reject(e);
-    };
-    document.head.appendChild(s);
-  });
-
-  await window.__PLY_ORBIT_LOADING__;
-}
-
-/* -------------------------------------------
-   State (par module = par instance importée)
--------------------------------------------- */
-
-let pc;
-export let app = null;
-let cameraEntity = null;
 let modelEntity = null;
-let envEntity = null;          // <<< GLB instancié (focusEntity collisions)
 let viewerInitialized = false;
 let resizeObserver = null;
-let resizeTimeout = null;
 
 // paramètres courants de l'instance
 let chosenCameraX, chosenCameraY, chosenCameraZ;
-let minZoom, maxZoom, minAngle, maxAngle, minAzimuth, maxAzimuth, minY;
-let modelX, modelY, modelZ, modelScale, modelRotationX, modelRotationY, modelRotationZ;
-let presentoirScaleX, presentoirScaleY, presentoirScaleZ;
 let sogUrl, glbUrl, presentoirUrl;
 let color_bg_hex, color_bg, espace_expo_bool;
 
-// perf dynamique
-let maxDevicePixelRatio = 1.75;   // plafond par défaut (configurable)
-let interactDpr = 1.0;            // DPR pendant interaction
-let idleRestoreDelay = 350;       // ms avant de restaurer le DPR
-let idleTimer = null;
-
 /* -------------------------------------------
    Initialisation
 -------------------------------------------- */
 
 export async function initializeViewer(config, instanceId) {
+  // ce module ES est importé avec un param unique ?inst=..., donc 1 instance par import
   if (viewerInitialized) return;
 
   const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
   // --- Configuration ---
-  // Nouveau format .sog (et compat si seul sogs_json_url est présent)
+  // Nouveau : utiliser un .sog "bundled" (format SOG PlayCanvas)
+  // Compat ascendante : on accepte encore sogs_json_url si sog_url absent
   sogUrl = config.sog_url || config.sogs_json_url;
 
   glbUrl =
-    config.glb_url !== undefined
-      ? config.glb_url
-      : "https://huggingface.co/datasets/MikaFil/viewer_gs/resolve/main/ressources/espace_expo/sol_blanc_2.glb";
-
-  presentoirUrl =
-    config.presentoir_url !== undefined
-      ? config.presentoir_url
-      : "https://huggingface.co/datasets/MikaFil/viewer_gs/resolve/main/ressources/espace_expo/sol_blanc_2.glb";
-
-  minZoom = parseFloat(config.minZoom || "1");
-  maxZoom = parseFloat(config.maxZoom || "20");
-  minAngle = parseFloat(config.minAngle || "-2000");
-  maxAngle = parseFloat(config.maxAngle || "2000");
-  minAzimuth = config.minAzimuth !== undefined ? parseFloat(config.minAzimuth) : -360;
-  maxAzimuth = config.maxAzimuth !== undefined ? parseFloat(config.maxAzimuth) : 360;
-  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;
-
-  presentoirScaleX = config.presentoirScaleX !== undefined ? parseFloat(config.presentoirScaleX) : 0;
-  presentoirScaleY = config.presentoirScaleY !== undefined ? parseFloat(config.presentoirScaleY) : 0;
-  presentoirScaleZ = config.presentoirScaleZ !== undefined ? parseFloat(config.presentoirScaleZ) : 0;
-
-  const cameraX = config.cameraX !== undefined ? parseFloat(config.cameraX) : 0;
-  const cameraY = config.cameraY !== undefined ? parseFloat(config.cameraY) : 2;
-  const cameraZ = config.cameraZ !== undefined ? parseFloat(config.cameraZ) : 5;
-
-  const cameraXPhone = config.cameraXPhone !== undefined ? parseFloat(config.cameraXPhone) : cameraX;
-  const cameraYPhone = config.cameraYPhone !== undefined ? parseFloat(config.cameraYPhone) : cameraY;
-  const cameraZPhone = config.cameraZPhone !== undefined ? parseFloat(config.cameraZPhone) : cameraZ * 1.5;
-
-  color_bg_hex = config.canvas_background !== undefined ? config.canvas_background : "#FFFFFF";
-  espace_expo_bool = config.espace_expo_bool !== undefined ? config.espace_expo_bool : false;
-  color_bg = hexToRgbaArray(color_bg_hex);
-
-  chosenCameraX = isMobile ? cameraXPhone : cameraX;
   chosenCameraY = isMobile ? cameraYPhone : cameraY;
   chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
 
-  // Options perf configurables
-  if (config.maxDevicePixelRatio !== undefined) {
-    maxDevicePixelRatio = Math.max(0.75, parseFloat(config.maxDevicePixelRatio) || maxDevicePixelRatio);
-  }
-  if (config.interactionPixelRatio !== undefined) {
-    interactDpr = Math.max(0.75, parseFloat(config.interactionPixelRatio) || interactDpr);
-  }
-  if (config.idleRestoreDelayMs !== undefined) {
-    idleRestoreDelay = Math.max(120, parseInt(config.idleRestoreDelayMs, 10) || idleRestoreDelay);
-  }
 
   // --- Prépare le canvas unique à cette instance ---
   const canvasId = "canvas-" + instanceId;
   const progressDialog = document.getElementById("progress-dialog-" + instanceId);
-  const viewerContainer = document.getElementById("viewer-container-" + instanceId);
-
-  const old = document.getElementById(canvasId);
-  if (old) old.remove();
-
-  const canvas = document.createElement("canvas");
-  canvas.id = canvasId;
-  canvas.className = "ply-canvas";
-  canvas.style.width = "100%";
-  canvas.style.height = "100%";
-  canvas.setAttribute("tabindex", "0");
-  viewerContainer.insertBefore(canvas, progressDialog);
-
-  // interactions de base
-  canvas.style.touchAction = "none";
-  canvas.style.webkitTouchCallout = "none";
-  canvas.addEventListener("gesturestart", (e) => e.preventDefault());
-  canvas.addEventListener("gesturechange", (e) => e.preventDefault());
-  canvas.addEventListener("gestureend", (e) => e.preventDefault());
-  canvas.addEventListener("dblclick", (e) => e.preventDefault());
-  canvas.addEventListener(
-    "touchstart",
-    (e) => {
-      if (e.touches.length > 1) e.preventDefault();
-    },
-    { passive: false }
-  );
-  canvas.addEventListener(
-    "wheel",
-    (e) => {
-      e.preventDefault();
-    },
-    { passive: false }
-  );
-
-  // Bloque le scroll page uniquement quand le pointeur est sur le canvas
-  const scrollKeys = new Set([
-    "ArrowUp",
-    "ArrowDown",
-    "ArrowLeft",
-    "ArrowRight",
-    "PageUp",
-    "PageDown",
-    "Home",
-    "End",
-    " ",
-    "Space",
-    "Spacebar"
-  ]);
-  let isPointerOverCanvas = false;
-  const focusCanvas = () => canvas.focus({ preventScroll: true });
-
-  const onPointerEnter = () => {
-    isPointerOverCanvas = true;
-    focusCanvas();
-  };
-  const onPointerLeave = () => {
-    isPointerOverCanvas = false;
-    if (document.activeElement === canvas) canvas.blur();
-  };
-  const onCanvasBlur = () => {
-    isPointerOverCanvas = false;
-  };
-
-  canvas.addEventListener("pointerenter", onPointerEnter);
-  canvas.addEventListener("pointerleave", onPointerLeave);
-  canvas.addEventListener("mouseenter", onPointerEnter);
-  canvas.addEventListener("mouseleave", onPointerLeave);
-  canvas.addEventListener("mousedown", focusCanvas);
-  canvas.addEventListener(
-    "touchstart",
-    () => {
-      focusCanvas();
-    },
-    { passive: false }
-  );
-  canvas.addEventListener("blur", onCanvasBlur);
-
-  const onKeyDownCapture = (e) => {
-    if (!isPointerOverCanvas) return;
-    if (scrollKeys.has(e.key) || scrollKeys.has(e.code)) {
-      e.preventDefault();
-    }
-  };
-  window.addEventListener("keydown", onKeyDownCapture, true);
-
-  progressDialog.style.display = "block";
-
-  // --- Charge PlayCanvas lib ESM (une par module/instance) ---
-  if (!pc) {
-    pc = await import("https://esm.run/playcanvas");
-    window.pc = pc; // utiles pour tooltips.js
-  }
-
-  // --- Crée l'Application ---
-  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
   });
-
-  // Cap DPR pour limiter le coût CPU/GPU
-  device.maxPixelRatio = Math.min(window.devicePixelRatio || 1, maxDevicePixelRatio);
+  device.maxPixelRatio = Math.min(window.devicePixelRatio, 2);
 
   const opts = new pc.AppOptions();
   opts.graphicsDevice = device;
   opts.mouse = new pc.Mouse(canvas);
   opts.touch = new pc.TouchDevice(canvas);
-  opts.keyboard = new pc.Keyboard(canvas);
+  opts.keyboard = new pc.Keyboard(canvas); // clavier scoping canvas
   opts.componentSystems = [
     pc.RenderComponentSystem,
     pc.CameraComponentSystem,
-    pc.LightComponentSystem,
-    pc.ScriptComponentSystem,
-    pc.GSplatComponentSystem,
     pc.CollisionComponentSystem,
     pc.RigidbodyComponentSystem
   ];
-  // GSplatHandler gère nativement les .sog
+  // GSplatHandler gère nativement les .sog (bundled SOG)
   opts.resourceHandlers = [pc.TextureHandler, pc.ContainerHandler, pc.ScriptHandler, pc.GSplatHandler];
 
   app = new pc.Application(canvas, opts);
   app.setCanvasFillMode(pc.FILLMODE_NONE);
   app.setCanvasResolution(pc.RESOLUTION_AUTO);
 
-  // --- Debounce resize (moins de rafales) ---
+
   resizeObserver = new ResizeObserver((entries) => {
-    if (!entries || !entries.length) return;
-    if (resizeTimeout) clearTimeout(resizeTimeout);
-    resizeTimeout = setTimeout(() => {
-      app.resizeCanvas(entries[0].contentRect.width, entries[0].contentRect.height);
-    }, 60);
+    entries.forEach((entry) => {
+      app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
+    });
   });
   resizeObserver.observe(viewerContainer);
 
-  window.addEventListener("resize", () => {
-    if (resizeTimeout) clearTimeout(resizeTimeout);
-    resizeTimeout = setTimeout(() => {
-      app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-    }, 60);
-  });
-
+  window.addEventListener("resize", () =>
+    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight)
+  );
   // Nettoyage complet
   app.on("destroy", () => {
-    try {
       resizeObserver.disconnect();
     } catch {}
     if (opts.keyboard && opts.keyboard.detach) opts.keyboard.detach();
+
     window.removeEventListener("keydown", onKeyDownCapture, true);
 
     canvas.removeEventListener("pointerenter", onPointerEnter);
-    canvas.removeEventListener("pointerleave", onPointerLeave);
-    canvas.removeEventListener("mouseenter", onPointerEnter);
-    canvas.removeEventListener("mouseleave", onPointerLeave);
-    canvas.removeEventListener("mousedown", focusCanvas);
-    canvas.removeEventListener("touchstart", focusCanvas);
     canvas.removeEventListener("blur", onCanvasBlur);
   });
-
-  // --- Enregistre et charge les assets en 1 phase pour SOG + GLB (focusEntity prêt avant la caméra) ---
-  const sogAsset = new pc.Asset("gsplat", "gsplat", { url: sogUrl });
-  const glbAsset = new pc.Asset("glb", "container", { url: glbUrl });
-  app.assets.add(sogAsset);
-  app.assets.add(glbAsset);
-
-  // Assure la free-cam + collisions
-  await ensureOrbitScriptsLoaded();
-
-  // ---------- CHARGEMENT SOG + GLB AVANT CREATION CAMERA ----------
-  await new Promise((resolve, reject) => {
-    const loader = new pc.AssetListLoader([sogAsset, glbAsset], app.assets);
-    loader.load(() => resolve());
-    loader.on('error', reject);
-  });
-
-  app.start(); // démarre l'update loop dès que possible
-  progressDialog.style.display = "none";
-
-  // --- Modèle principal (GSplat via .sog) ---
-  modelEntity = new pc.Entity("model");
-  modelEntity.addComponent("gsplat", { asset: sogAsset });
-  modelEntity.setLocalPosition(modelX, modelY, modelZ);
-  modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
-  modelEntity.setLocalScale(modelScale, modelScale, modelScale);
-  app.root.addChild(modelEntity);
-
-  // --- Instancier le GLB d’environnement (collision) ---
-  envEntity = glbAsset.resource ? glbAsset.resource.instantiateRenderEntity() : null;
-  if (envEntity) {
-    envEntity.name = "ENV_GLTF";
-    app.root.addChild(envEntity);
-    // NOTE : évite de changer l'échelle ici, sauf si nécessaire. Si tu DOIS :
-    // envEntity.setLocalScale(1,1,1); // garde l'échelle d'import cohérente
-  } else {
-    console.warn("[viewer.js] GLB resource missing: collisions will fallback on GSplat (aucun mesh).");
-  }
-
-  // --- Caméra + scripts d’input (free-cam nommée 'orbitCamera' pour compat) ---
-  cameraEntity = new pc.Entity("camera");
-  cameraEntity.addComponent("camera", {
-    clearColor: new pc.Color(color_bg),
-    nearClip: 0.001,
-    farClip: 100
-  });
-  cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-  cameraEntity.lookAt(modelEntity.getPosition());
-  cameraEntity.addComponent("script");
-
-  // >>> focusEntity = GLB en priorité (sinon fallback gsplat) <<<
-  cameraEntity.script.create("orbitCamera", {
-    attributes: {
-      focusEntity: envEntity || modelEntity,
-      // Attributs hérités pour compat, mais seront interprétés par la free-cam
-      inertiaFactor: 0.2,
-      distanceMax: maxZoom,
-      distanceMin: minZoom,
-      pitchAngleMax: maxAngle,
-      pitchAngleMin: minAngle,
-      yawAngleMax: maxAzimuth,
-      yawAngleMin: minAzimuth,
-      minY: minY,
-      frameOnStart: false
-    }
-  });
-  cameraEntity.script.create("orbitCameraInputMouse");
-  cameraEntity.script.create("orbitCameraInputTouch");
-  cameraEntity.script.create("orbitCameraInputKeyboard", {
-    attributes: {
-      forwardSpeed: 1.2,
-      strafeSpeed: 1.2
-    }
-  });
-  app.root.addChild(cameraEntity);
-
-  // Taille initiale
-  app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-
-  // IMPORTANT : si la free-cam est active, ne pas "forcer" un reset d'orbite.
-  app.once("update", () => resetViewerCamera());
-
-  // ---------- Perf dynamique : DPR temporairement réduit pendant interaction ----------
-  const setDpr = (val) => {
-    const clamped = Math.max(0.5, Math.min(val, maxDevicePixelRatio));
-    if (app.graphicsDevice.maxPixelRatio !== clamped) {
-      app.graphicsDevice.maxPixelRatio = clamped;
-      app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-    }
+  // --- Enregistre les assets ---
+  // IMPORTANT : pour .sog on déclare un asset de type "gsplat" avec l'URL .sog
+  const assets = {
+    sog: new pc.Asset("gsplat", "gsplat", { url: sogUrl }),
+    glb: new pc.Asset("glb", "container", { url: glbUrl }),
+    presentoir: new pc.Asset("presentoir", "container", { url: presentoirUrl })
   };
+  for (const k in assets) app.assets.add(assets[k]);
 
-  const bumpInteraction = () => {
-    setDpr(interactDpr);
-    if (idleTimer) clearTimeout(idleTimer);
-    idleTimer = setTimeout(() => {
-      setDpr(Math.min(window.devicePixelRatio || 1, maxDevicePixelRatio));
-    }, idleRestoreDelay);
-  };
+  const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
+  // Assure orbit-camera.js une seule fois
+  await ensureOrbitScriptsLoaded();
 
-  const interactionEvents = ["mousedown", "mousemove", "mouseup", "wheel", "touchstart", "touchmove", "keydown"];
-  interactionEvents.forEach((ev) => {
-    canvas.addEventListener(ev, bumpInteraction, { passive: true });
-  });
+  loader.load(() => {
+    app.start();
+    progressDialog.style.display = "none";
+
+    // --- Modèle principal (GSplat via .sog) ---
+    modelEntity = new pc.Entity("model");
+    modelEntity.addComponent("gsplat", { asset: assets.sog });
+    modelEntity.setLocalPosition(modelX, modelY, modelZ);
+    modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
+    modelEntity.setLocalScale(modelScale, modelScale, modelScale);
+    app.root.addChild(modelEntity);
+
+    // --- Sol / environnement ---
+    const glbEntity = assets.glb.resource.instantiateRenderEntity();
+    app.root.addChild(glbEntity);
+
+    const presentoirEntity = assets.presentoir.resource.instantiateRenderEntity();
+    presentoirEntity.setLocalScale(presentoirScaleX, presentoirScaleY, presentoirScaleZ);
+    app.root.addChild(presentoirEntity);
+
+    if (!espace_expo_bool) {
+      const matSol = new pc.StandardMaterial();
+      matSol.blendType = pc.BLEND_NONE;
+      matSol.emissive = new pc.Color(color_bg);
+      matSol.emissiveIntensity = 1;
+      matSol.useLighting = false;
+      matSol.update();
+
+      traverse(presentoirEntity, (node) => {
+        if (node.render && node.render.meshInstances) {
+          for (const mi of node.render.meshInstances) mi.material = matSol;
+        }
+      });
 
-  // ---------- CHARGEMENT DIFFÉRÉ : présentoir et tooltips ----------
-  setTimeout(async () => {
-    try {
-      const presentoirAsset = new pc.Asset("presentoir", "container", { url: presentoirUrl });
-      app.assets.add(presentoirAsset);
-      await new Promise((resolve) => {
-        const loader2 = new pc.AssetListLoader([presentoirAsset], app.assets);
-        loader2.load(() => resolve());
+      traverse(glbEntity, (node) => {
+        if (node.render && node.render.meshInstances) {
+          for (const mi of node.render.meshInstances) mi.material = matSol;
+        }
       });
 
-      const presentoirEntity =
-        presentoirAsset.resource ? presentoirAsset.resource.instantiateRenderEntity() : null;
-      if (presentoirEntity) {
-        presentoirEntity.setLocalScale(presentoirScaleX, presentoirScaleY, presentoirScaleZ);
-        app.root.addChild(presentoirEntity);
+      ////// MODIFIE A LA MANO FAIRE GAFFE //////
+      glbEntity.setLocalScale(10, 10, 10);
+    }
+    // --- Caméra + scripts d’input (disponibles car orbit chargé globalement) ---
+    cameraEntity = new pc.Entity("camera");
+    cameraEntity.addComponent("camera", {
+      clearColor: new pc.Color(color_bg),
+      nearClip: 0.001,
+      farClip: 100
+    });
+    cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+    cameraEntity.lookAt(modelEntity.getPosition());
+    cameraEntity.addComponent("script");
+
+    cameraEntity.script.create("orbitCamera", {
+      attributes: {
+        focusEntity: modelEntity,
+        inertiaFactor: 0.2,
+        distanceMax: maxZoom,
+        distanceMin: minZoom,
+        pitchAngleMax: maxAngle,
+        pitchAngleMin: minAngle,
+        yawAngleMax: maxAzimuth,
+        yawAngleMin: minAzimuth,
+        minY: minY,
+        frameOnStart: false
       }
+    });
+    cameraEntity.script.create("orbitCameraInputMouse");
+    cameraEntity.script.create("orbitCameraInputTouch");
+    cameraEntity.script.create("orbitCameraInputKeyboard", {
+      attributes: {
+        forwardSpeed: 1.2,
+        strafeSpeed: 1.2
+      }
+    });
+    app.root.addChild(cameraEntity);
 
-      // Si pas d'espace expo : recolore GLB & présentoir pour fond uni
-      if (!espace_expo_bool) {
-        const matSol = new pc.StandardMaterial();
-        matSol.blendType = pc.BLEND_NONE;
-        matSol.emissive = new pc.Color(color_bg);
-        matSol.emissiveIntensity = 1;
-        matSol.useLighting = false;
-        matSol.update();
-
-        if (presentoirEntity) {
-          traverse(presentoirEntity, (node) => {
-            if (node.render && node.render.meshInstances) {
-              for (const mi of node.render.meshInstances) mi.material = matSol;
-            }
-          });
-        }
+    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
+    app.once("update", () => resetViewerCamera());
 
-        if (envEntity) {
-          traverse(envEntity, (node) => {
-            if (node.render && node.render.meshInstances) {
-              for (const mi of node.render.meshInstances) mi.material = matSol;
-            }
+    // --- Tooltips (optionnels) ---
+    try {
+      if (config.tooltips_url) {
+        import("./tooltips.js")
+          .then((tooltipsModule) => {
+            tooltipsModule.initializeTooltips({
+              app,
+              cameraEntity,
+              modelEntity,
+              tooltipsUrl: config.tooltips_url,
+              defaultVisible: !!config.showTooltipsDefault,
+              moveDuration: config.tooltipMoveDuration || 0.6
+            });
+          })
+          .catch(() => {
+            /* optional */
           });
-        }
       }
-
-      // Tooltips (optionnels)
-      try {
-        if (config.tooltips_url) {
-          import("./tooltips.js")
-            .then((tooltipsModule) => {
-              tooltipsModule.initializeTooltips({
-                app,
-                cameraEntity,
-                modelEntity,
-                tooltipsUrl: config.tooltips_url,
-                defaultVisible: !!config.showTooltipsDefault,
-                moveDuration: config.tooltipMoveDuration || 0.6
-              });
-            })
-            .catch(() => { /* optional */ });
-        }
-      } catch (e) { /* optional */ }
     } catch (e) {
-      console.warn("[viewer.js] Deferred assets load failed:", e);
+      /* optional */
     }
-  }, 0);
-
-  viewerInitialized = true;
+    viewerInitialized = true;
+  });
 }
 
-/* -------------------------------------------
-   Reset caméra (API)
--------------------------------------------- */
-
-export function resetViewerCamera() {
-  try {
-    if (!cameraEntity || !modelEntity || !app) return;
-    const camScript = cameraEntity.script && cameraEntity.script.orbitCamera;
-    if (!camScript) return;
-
-    const modelPos = modelEntity.getPosition();
-
-    // Si c'est une FREE-CAM (notre script), ne pas toucher à des champs d'orbite.
-    // On se contente éventuellement de réaligner le regard.
-    const looksLikeOrbit =
-      ("pivotPoint" in camScript) ||
-      ("_distance" in camScript) ||
-      ("_updatePosition" in camScript);
-
-    if (!looksLikeOrbit) {
-      // Free camera : juste orienter vers le modèle si souhaité
-      cameraEntity.lookAt(modelPos);
-      return;
-    }
-
-    // --- Cas d'une vraie orbit-camera (compat héritée) ---
-    const orbitCam = camScript;
-
-    const tempEnt = new pc.Entity();
-    tempEnt.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-    tempEnt.lookAt(modelPos);
-
-    const dist = new pc.Vec3()
-      .sub2(new pc.Vec3(chosenCameraX, chosenCameraY, chosenCameraZ), modelPos)
-      .length();
-
-    cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
-    cameraEntity.lookAt(modelPos);
-
-    orbitCam.pivotPoint = modelPos.clone();
-    orbitCam._targetDistance = dist;
-    orbitCam._distance = dist;
-
-    const rot = tempEnt.getRotation();
-    const fwd = new pc.Vec3();
-    rot.transformVector(pc.Vec3.FORWARD, fwd);
-
-    const yaw = Math.atan2(-fwd.x, -fwd.z) * pc.math.RAD_TO_DEG;
-    const yawQuat = new pc.Quat().setFromEulerAngles(0, -yaw, 0);
-    const rotNoYaw = new pc.Quat().mul2(yawQuat, rot);
-    const fNoYaw = new pc.Vec3();
-    rotNoYaw.transformVector(pc.Vec3.FORWARD, fNoYaw);
-    const pitch = Math.atan2(fNoYaw.y, -fNoYaw.z) * pc.math.RAD_TO_DEG;
-
-    orbitCam._targetYaw = yaw;
-    orbitCam._yaw = yaw;
-    orbitCam._targetPitch = pitch;
-    orbitCam._pitch = pitch;
-    if (orbitCam._updatePosition) orbitCam._updatePosition();
-
-    tempEnt.destroy();
-  } catch (e) {
-    console.error("[viewer.js] resetViewerCamera error:", e);
-  }
-}
+/* -------------------------------------------