Update deplacement_dans_env/viewer_pr_env.js

deplacement_dans_env/viewer_pr_env.js

@@ -1,39 +1,49 @@
-// viewer.js
-// ==============================
+// viewer_pr_env.js — Physics (Ammo) version
+// ============================================================================
+// - Charge PlayCanvas (ESM)
+// - Charge Ammo (WASM) avec fallback JS et timeout, base URL configurable
+// - Instancie le GLB d’environnement et lui ajoute des colliders statiques (mesh)
+// - Crée un "player" capsule dynamique et attache la caméra en enfant (yeux)
+// - Garde le chargement GSplat (.sog) et la gestion DPR dynamique
+// - NE CHARGE PAS le script de contrôle caméra ici (tu le demanderas ensuite)
+// ============================================================================
 
 /* -------------------------------------------
-   Utils
+   State (module / instance)
 -------------------------------------------- */
+let pc;
+export let app = null;
+export let cameraEntity = null;
+export let playerEntity = null; // capsule dynamique (rigidbody)
+export let envEntity = null;    // GLB (environnement)
+export let modelEntity = null;  // GSplat principal (.sog)
 
-// (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;
-  });
-}
+let viewerInitialized = false;
+let resizeObserver = null;
+let resizeTimeout = null;
 
-// Patch global Image -> force CORS
-(function () {
-  const OriginalImage = window.Image;
-  window.Image = function (...args) {
-    const img = new OriginalImage(...args);
-    img.crossOrigin = "anonymous";
-    return img;
-  };
-})();
+// Config / paramètres courants
+let sogUrl, glbUrl, presentoirUrl;
+let color_bg_hex, color_bg;
+let espace_expo_bool;
+
+// Camera spawn
+let chosenCameraX, chosenCameraY, chosenCameraZ;
 
+// DPR / perf
+let maxDevicePixelRatio = 1.75;
+let interactDpr = 1.0;
+let idleRestoreDelay = 350;
+let idleTimer = null;
+
+// Physique
+let ammoBaseUrl = "https://playcanvas.github.io/examples/lib/ammo/"; // surchargable par config
+let physicsEnabled = true; // si Ammo indisponible -> false
+let gravityVec = null;     // sera défini selon config (free-fly vs grounded)
+
+/* -------------------------------------------
+   Utils
+-------------------------------------------- */
 function hexToRgbaArray(hex) {
   try {
     hex = String(hex || "").replace("#", "");
@@ -46,138 +56,81 @@ function hexToRgbaArray(hex) {
       ((num >> 8) & 0xff) / 255,
       (num & 0xff) / 255
     ];
-  } catch (e) {
-    console.warn("hexToRgbaArray error:", e);
+  } catch {
     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));
+function traverse(entity, cb) {
+  cb(entity);
+  if (entity.children && entity.children.length) {
+    entity.children.forEach((c) => traverse(c, cb));
   }
 }
 
-/* -------------------------------------------
-   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__;
+function isMobileUA() {
+  const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
+  const isAndroid = /Android/i.test(navigator.userAgent);
+  return isIOS || isAndroid;
 }
 
-/* -------------------------------------------
-   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;
+async function loadAmmoOrFallback(baseUrl, timeoutMs = 4000) {
+  // Configure les URLs Ammo (WASM + fallback JS)
+  pc.WasmModule.setConfig("Ammo", {
+    glueUrl: `${baseUrl}ammo.wasm.js`,
+    wasmUrl: `${baseUrl}ammo.wasm.wasm`,
+    fallbackUrl: `${baseUrl}ammo.js`
+  });
 
-// 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;
+  let resolved = false;
+  await Promise.race([
+    new Promise((resolve) => {
+      pc.WasmModule.getInstance("Ammo", () => {
+        resolved = true;
+        resolve();
+      });
+    }),
+    new Promise((resolve) => setTimeout(resolve, timeoutMs))
+  ]);
 
-// 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;
+  if (!resolved) {
+    console.warn("[viewer_pr_env] Ammo not ready within timeout — physics disabled (fallback rendering only).");
+    return false;
+  }
+  return true;
+}
 
 /* -------------------------------------------
-   Initialisation
+   Initialisation principale
 -------------------------------------------- */
-
 export async function initializeViewer(config, instanceId) {
   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)
-  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;
+  // ---- Lecture config ----
+  const mobile = isMobileUA();
+
+  sogUrl = config.sog_url || config.sogs_json_url || null;
+  glbUrl = (config.glb_url !== undefined) ? config.glb_url : null;
+  presentoirUrl = (config.presentoir_url !== undefined) ? config.presentoir_url : null;
 
   color_bg_hex = config.canvas_background !== undefined ? config.canvas_background : "#FFFFFF";
-  espace_expo_bool = config.espace_expo_bool !== undefined ? config.espace_expo_bool : false;
+  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;
+  // Camera spawn — valeurs par défaut
+  const camX = config.cameraX !== undefined ? parseFloat(config.cameraX) : 0;
+  const camY = config.cameraY !== undefined ? parseFloat(config.cameraY) : 1.6;
+  const camZ = config.cameraZ !== undefined ? parseFloat(config.cameraZ) : 4.0;
 
-  // Options perf configurables
+  const camXPhone = config.cameraXPhone !== undefined ? parseFloat(config.cameraXPhone) : camX;
+  const camYPhone = config.cameraYPhone !== undefined ? parseFloat(config.cameraYPhone) : camY;
+  const camZPhone = config.cameraZPhone !== undefined ? parseFloat(config.cameraZPhone) : camZ * 1.5;
+
+  chosenCameraX = mobile ? camXPhone : camX;
+  chosenCameraY = mobile ? camYPhone : camY;
+  chosenCameraZ = mobile ? camZPhone : camZ;
+
+  // DPR / perf
   if (config.maxDevicePixelRatio !== undefined) {
     maxDevicePixelRatio = Math.max(0.75, parseFloat(config.maxDevicePixelRatio) || maxDevicePixelRatio);
   }
@@ -188,7 +141,13 @@ export async function initializeViewer(config, instanceId) {
     idleRestoreDelay = Math.max(120, parseInt(config.idleRestoreDelayMs, 10) || idleRestoreDelay);
   }
 
-  // --- Prépare le canvas unique à cette instance ---
+  // Physique
+  if (config.ammoBaseUrl) ammoBaseUrl = String(config.ammoBaseUrl).endsWith("/") ? config.ammoBaseUrl : (config.ammoBaseUrl + "/");
+  physicsEnabled = config.usePhysics === false ? false : true; // par défaut true
+  const freeFly = !!config.freeFly; // si true => pas de gravité
+  gravityVec = freeFly ? new pc.Vec3(0, 0, 0) : new pc.Vec3(0, -9.81, 0);
+
+  // ---- Canvas / DOM ----
   const canvasId = "canvas-" + instanceId;
   const progressDialog = document.getElementById("progress-dialog-" + instanceId);
   const viewerContainer = document.getElementById("viewer-container-" + instanceId);
@@ -204,103 +163,66 @@ export async function initializeViewer(config, instanceId) {
   canvas.setAttribute("tabindex", "0");
   viewerContainer.insertBefore(canvas, progressDialog);
 
-  // interactions de base
+  // Interaction UI de base (prévenir scroll)
   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"
-  ]);
+  canvas.addEventListener("wheel", (e) => e.preventDefault(), { passive: false });
+
+  // Focus au survol pour capter le clavier
   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;
-  };
+  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("touchstart", focusCanvas, { passive: true });
   canvas.addEventListener("blur", onCanvasBlur);
 
-  const onKeyDownCapture = (e) => {
-    if (!isPointerOverCanvas) return;
-    if (scrollKeys.has(e.key) || scrollKeys.has(e.code)) {
-      e.preventDefault();
-    }
-  };
+  // Empêche les touches scroll pendant survol
+  const scrollKeys = new Set(["ArrowUp","ArrowDown","ArrowLeft","ArrowRight","PageUp","PageDown","Home","End"," ","Space","Spacebar"]);
+  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) ---
+  // ---- Import PlayCanvas ----
   if (!pc) {
     pc = await import("https://esm.run/playcanvas");
-    window.pc = pc; // utiles pour tooltips.js
+    window.pc = pc; // debug
+  }
+
+  // ---- Charge Ammo si activé ----
+  if (physicsEnabled) {
+    try {
+      const ok = await loadAmmoOrFallback(ammoBaseUrl, mobile ? 5000 : 3500);
+      physicsEnabled = !!ok;
+    } catch (e) {
+      console.warn("[viewer_pr_env] Ammo load exception, physics disabled:", e);
+      physicsEnabled = false;
+    }
   }
 
-  // --- Crée l'Application ---
+  // ---- 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",
+    deviceTypes: ["webgl2", "webgl1"],
     antialias: false
   });
-
-  // Cap DPR pour limiter le coût CPU/GPU
   device.maxPixelRatio = Math.min(window.devicePixelRatio || 1, maxDevicePixelRatio);
 
   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.mouse   = new pc.Mouse(canvas);
+  opts.touch   = new pc.TouchDevice(canvas);
+  opts.keyboard= new pc.Keyboard(canvas);
   opts.componentSystems = [
     pc.RenderComponentSystem,
     pc.CameraComponentSystem,
@@ -310,14 +232,16 @@ export async function initializeViewer(config, instanceId) {
     pc.CollisionComponentSystem,
     pc.RigidbodyComponentSystem
   ];
-  // GSplatHandler gère nativement les .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) ---
+  // Gravité
+  app.scene.gravity = gravityVec || new pc.Vec3(0, -9.81, 0);
+
+  // Resize observé (debounce)
   resizeObserver = new ResizeObserver((entries) => {
     if (!entries || !entries.length) return;
     if (resizeTimeout) clearTimeout(resizeTimeout);
@@ -334,11 +258,8 @@ export async function initializeViewer(config, instanceId) {
     }, 60);
   });
 
-  // Nettoyage complet
   app.on("destroy", () => {
-    try {
-      resizeObserver.disconnect();
-    } catch {}
+    try { resizeObserver.disconnect(); } catch {}
     if (opts.keyboard && opts.keyboard.detach) opts.keyboard.detach();
     window.removeEventListener("keydown", onKeyDownCapture, true);
 
@@ -351,91 +272,130 @@ export async function initializeViewer(config, instanceId) {
     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);
+  // ---- Assets (SOG + GLB) ----
+  const assets = [];
+  let sogAsset = null, glbAsset = null;
 
-  // Assure la free-cam + collisions
-  await ensureOrbitScriptsLoaded();
+  if (sogUrl) {
+    sogAsset = new pc.Asset("gsplat", "gsplat", { url: sogUrl });
+    app.assets.add(sogAsset); assets.push(sogAsset);
+  }
+  if (glbUrl) {
+    glbAsset = new pc.Asset("glb", "container", { url: glbUrl });
+    app.assets.add(glbAsset); assets.push(glbAsset);
+  }
 
-  // ---------- CHARGEMENT SOG + GLB AVANT CREATION CAMERA ----------
+  // Charge les assets requis avant de créer la scène
   await new Promise((resolve, reject) => {
-    const loader = new pc.AssetListLoader([sogAsset, glbAsset], app.assets);
+    const loader = new pc.AssetListLoader(assets, app.assets);
     loader.load(() => resolve());
     loader.on('error', reject);
   });
 
-  app.start(); // démarre l'update loop dès que possible
+  // Démarrer la boucle update
+  app.start();
   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);
+  // ---- Crée le modèle GSplat (optionnel) ----
+  if (sogAsset) {
+    modelEntity = new pc.Entity("model");
+    modelEntity.addComponent("gsplat", { asset: sogAsset });
+    app.root.addChild(modelEntity);
+  }
 
-  // --- Instancier le GLB d’environnement (collision) ---
-  envEntity = glbAsset.resource ? glbAsset.resource.instantiateRenderEntity() : null;
+  // ---- Instancier le GLB d’environnement ----
+  envEntity = glbAsset && glbAsset.resource ? glbAsset.resource.instantiateRenderEntity() : null;
   if (envEntity) {
     envEntity.name = "ENV_GLTF";
     app.root.addChild(envEntity);
-
-    console.log('[VIEWER] env ready:', !!envEntity, 'meshes:',
-    envEntity?.render?.meshInstances?.length || '(via children)');
-    // 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).");
+    console.warn("[viewer_pr_env] Aucun GLB d’environnement — collisions physiques inutilisables.");
+  }
+
+  // ---- Matériau "fond uni" si pas d'espace expo ----
+  if (!espace_expo_bool && envEntity) {
+    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(envEntity, (node) => {
+      if (node.render && node.render.meshInstances) {
+        for (const mi of node.render.meshInstances) mi.material = matSol;
+      }
+    });
+  }
+
+  // ---- Physique : colliders "mesh" statiques sur l’environnement ----
+  if (physicsEnabled && envEntity) {
+    const addStaticMeshCollider = (e) => {
+      if (e.render && !e.collision) {
+        e.addComponent('collision', { type: 'mesh' });
+      }
+      if (!e.rigidbody) {
+        e.addComponent('rigidbody', { type: 'static', friction: 0.6, restitution: 0.0 });
+      } else if (e.rigidbody && e.rigidbody.type !== 'static') {
+        // force static pour le décor
+        e.rigidbody.type = 'static';
+      }
+    };
+    traverse(envEntity, addStaticMeshCollider);
   }
 
-  // --- Caméra + scripts d’input (free-cam nommée 'orbitCamera' pour compat) ---
+  // ---- Caméra + Player capsule ----
   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
-    }
+    nearClip: 0.03,
+    farClip: 500,
+    // viewport: peut être défini si besoin
   });
-  app.root.addChild(cameraEntity);
+
+  if (physicsEnabled) {
+    // Player (rigidbody capsule) — porteur de la caméra
+    playerEntity = new pc.Entity("Player");
+    const capsuleRadius = config.capsuleRadius !== undefined ? parseFloat(config.capsuleRadius) : 0.30;
+    const capsuleHeight = config.capsuleHeight !== undefined ? parseFloat(config.capsuleHeight) : 1.60;
+
+    playerEntity.addComponent('collision', {
+      type: 'capsule',
+      radius: capsuleRadius,
+      height: capsuleHeight
+    });
+    playerEntity.addComponent('rigidbody', {
+      type: 'dynamic',
+      mass: 70,
+      friction: 0.45,
+      restitution: 0.0,
+      linearDamping: 0.15,
+      angularDamping: 0.999
+    });
+    // Bloquer la rotation pour éviter le roulis
+    playerEntity.rigidbody.angularFactor = new pc.Vec3(0, 0, 0);
+
+    // Spawn
+    playerEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+    app.root.addChild(playerEntity);
+
+    // Caméra en enfant (yeux)
+    const eyes = config.eyesOffsetY !== undefined ? parseFloat(config.eyesOffsetY) : Math.max(0.1, capsuleHeight * 0.9);
+    cameraEntity.setPosition(0, eyes, 0);
+    playerEntity.addChild(cameraEntity);
+  } else {
+    // Pas de physique : on place simplement la caméra dans la scène (pas de contrôle ici)
+    cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
+    app.root.addChild(cameraEntity);
+  }
+
+  // Regarder vers le modèle si présent, sinon vers l’origine
+  const lookTarget = modelEntity ? modelEntity.getPosition() : new pc.Vec3(0, 1, 0);
+  cameraEntity.lookAt(lookTarget);
 
   // 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 ----------
+  // DPR dynamique : réduit pendant interaction
   const setDpr = (val) => {
     const clamped = Math.max(0.5, Math.min(val, maxDevicePixelRatio));
     if (app.graphicsDevice.maxPixelRatio !== clamped) {
@@ -443,7 +403,6 @@ export async function initializeViewer(config, instanceId) {
       app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
     }
   };
-
   const bumpInteraction = () => {
     setDpr(interactDpr);
     if (idleTimer) clearTimeout(idleTimer);
@@ -453,140 +412,28 @@ export async function initializeViewer(config, instanceId) {
   };
 
   const interactionEvents = ["mousedown", "mousemove", "mouseup", "wheel", "touchstart", "touchmove", "keydown"];
-  interactionEvents.forEach((ev) => {
-    canvas.addEventListener(ev, bumpInteraction, { passive: true });
-  });
-
-  // ---------- 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());
-      });
-
-      const presentoirEntity =
-        presentoirAsset.resource ? presentoirAsset.resource.instantiateRenderEntity() : null;
-      if (presentoirEntity) {
-        presentoirEntity.setLocalScale(presentoirScaleX, presentoirScaleY, presentoirScaleZ);
-        app.root.addChild(presentoirEntity);
-      }
-
-      // 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;
-            }
-          });
-        }
-
-        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 */ });
-        }
-      } catch (e) { /* optional */ }
-    } catch (e) {
-      console.warn("[viewer.js] Deferred assets load failed:", e);
-    }
-  }, 0);
+  interactionEvents.forEach((ev) => canvas.addEventListener(ev, bumpInteraction, { passive: true }));
 
   viewerInitialized = true;
+
+  // Logs utiles
+  console.log("[VIEWER] physics:", physicsEnabled, "env:", !!envEntity, "sog:", !!modelEntity);
 }
 
 /* -------------------------------------------
-   Reset caméra (API)
+   API helper : repositionner caméra/joueur
 -------------------------------------------- */
-
-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);
+export function resetViewerCamera(x, y, z) {
+  if (!app || !cameraEntity) return;
+  const nx = (x !== undefined) ? parseFloat(x) : chosenCameraX;
+  const ny = (y !== undefined) ? parseFloat(y) : chosenCameraY;
+  const nz = (z !== undefined) ? parseFloat(z) : chosenCameraZ;
+
+  if (playerEntity && playerEntity.rigidbody) {
+    playerEntity.rigidbody.teleport(nx, ny, nz, playerEntity.getRotation());
+    playerEntity.rigidbody.linearVelocity = pc.Vec3.ZERO.clone();
+    playerEntity.rigidbody.angularVelocity = pc.Vec3.ZERO.clone();
+  } else {
+    cameraEntity.setPosition(nx, ny, nz);
   }
 }