Update deplacement_dans_env/viewer_pr_env.js

deplacement_dans_env/viewer_pr_env.js

@@ -75,26 +75,54 @@ function isMobileUA() {
 }
 
 async function loadAmmoOrFallback(baseUrl, timeoutMs = 4000) {
-  // Configure les URLs Ammo (WASM + fallback JS)
+  // Configure URLs
   pc.WasmModule.setConfig("Ammo", {
     glueUrl: `${baseUrl}ammo.wasm.js`,
     wasmUrl: `${baseUrl}ammo.wasm.wasm`,
     fallbackUrl: `${baseUrl}ammo.js`
   });
 
-  let resolved = false;
-  await Promise.race([
-    new Promise((resolve) => {
-      pc.WasmModule.getInstance("Ammo", () => {
-        resolved = true;
-        resolve();
-      });
-    }),
-    new Promise((resolve) => setTimeout(resolve, timeoutMs))
-  ]);
-
-  if (!resolved) {
-    console.warn("[viewer_pr_env] Ammo not ready within timeout — physics disabled (fallback rendering only).");
+  // Essaye l’API Promise d’abord
+  const tryPromise = async () => {
+    try {
+      const p = pc.WasmModule.getInstance("Ammo", `${baseUrl}ammo.wasm.js`);
+      if (p && typeof p.then === "function") {
+        await Promise.race([
+          p,
+          new Promise((_, rej) => setTimeout(() => rej(new Error("Ammo load timeout (promise)")), timeoutMs))
+        ]);
+        return true;
+      }
+      return false;
+    } catch (e) {
+      console.warn("[Ammo] promise form failed:", e);
+      return false;
+    }
+  };
+
+  // Sinon, essaye l’API callback
+  const tryCallback = async () => {
+    let resolved = false;
+    try {
+      await Promise.race([
+        new Promise((resolve, reject) => {
+          pc.WasmModule.getInstance("Ammo", () => {
+            resolved = true;
+            resolve();
+          });
+        }),
+        new Promise((_, rej) => setTimeout(() => rej(new Error("Ammo load timeout (callback)")), timeoutMs))
+      ]);
+      return resolved;
+    } catch (e) {
+      console.warn("[Ammo] callback form failed:", e);
+      return false;
+    }
+  };
+
+  const ok = (await tryPromise()) || (await tryCallback());
+  if (!ok) {
+    console.warn("[viewer] Ammo not available — physics disabled.");
     return false;
   }
   return true;
@@ -293,8 +321,11 @@ export async function initializeViewer(config, instanceId) {
   });
 
   // Démarrer la boucle update
+  console.log("[viewer] before app.start()");
   app.start();
+  console.log("[viewer] START OK");
   progressDialog.style.display = "none";
+  console.log("[viewer] progress hidden");
 
   // ---- Crée le modèle GSplat (optionnel) ----
   if (sogAsset) {