Update viewer.js

viewer.js

@@ -55,54 +55,24 @@ function traverse(entity, callback) {
   }
 }
 
-/**
- * Charge la source d'orbit-camera.js une seule fois (cache global),
- * puis l'évalue POUR CHAQUE APP afin que pc.createScript enregistre
- * les types dans le ScriptRegistry de l'application courante.
- */
+// Charger orbit-camera.js **par application**
 const ORBIT_URL = "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js";
-async function registerOrbitScriptsForApp(app) {
-  // Si cette app possède déjà les scripts, on ne fait rien
-  try {
-    if (app?.scripts?.get && app.scripts.get("orbitCamera")) return;
-  } catch (_) {}
-
-  // Cache global de la source
-  if (!window.__ORBIT_SOURCE_PROMISE__) {
-    window.__ORBIT_SOURCE_PROMISE__ = fetch(ORBIT_URL, { cache: "no-store", credentials: "omit" })
-      .then(r => {
-        if (!r.ok) throw new Error("Failed to fetch orbit-camera.js");
-        return r.text();
-      });
-  }
-  const src = await window.__ORBIT_SOURCE_PROMISE__;
-
-  // Binder l’“application courante” sur CETTE app pendant l’évaluation
-  const prevGetApp = pc.Application.getApplication ? pc.Application.getApplication.bind(pc.Application) : null;
-  const prevApp = pc.app;
-
-  try {
-    if (pc.Application.getApplication) {
-      pc.Application.getApplication = () => app;
-    }
-    pc.app = app;
-
-    // Évaluation globale : pc.createScript enregistre dans le registry de "app"
-    (0, eval)(src);
-
-  } catch (e) {
-    console.error("[viewer.js] orbit-camera.js eval error:", e);
-  } finally {
-    if (prevGetApp) pc.Application.getApplication = prevGetApp;
-    pc.app = prevApp;
-  }
+function loadOrbitScriptsForApp(app, instanceId) {
+  return new Promise((resolve, reject) => {
+    // Si déjà enregistré dans CETTE app, ne rien faire
+    try {
+      if (app?.scripts?.get && app.scripts.get("orbitCamera")) return resolve();
+    } catch (_) {}
 
-  // Sécurité : vérifier que le type est bien dispo
-  try {
-    if (!(app?.scripts?.get && app.scripts.get("orbitCamera"))) {
-      console.warn("[viewer.js] orbitCamera script type not found on app after eval");
-    }
-  } catch (_) {}
+    const asset = new pc.Asset("orbit-" + instanceId, "script", { url: ORBIT_URL });
+    app.assets.add(asset);
+    asset.once("load", () => resolve());
+    asset.once("error", (e) => {
+      console.error("[viewer.js] orbit-camera.js load error:", e);
+      reject(e);
+    });
+    app.assets.load(asset);
+  });
 }
 
 let pc;
@@ -128,44 +98,59 @@ export async function initializeViewer(config, instanceId) {
   const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-  // Params
+  // Config
   sogsUrl = 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";
+  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 || "-45");
   maxAngle = parseFloat(config.maxAngle || "90");
-  minAzimuth = (config.minAzimuth !== undefined) ? parseFloat(config.minAzimuth) : -360;
-  maxAzimuth = (config.maxAzimuth !== undefined) ? parseFloat(config.maxAzimuth) : 360;
+  minAzimuth =
+    config.minAzimuth !== undefined ? parseFloat(config.minAzimuth) : -360;
+  maxAzimuth =
+    config.maxAzimuth !== undefined ? parseFloat(config.maxAzimuth) : 360;
   minPivotY = parseFloat(config.minPivotY || "0");
-  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;
+  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;
@@ -195,30 +180,50 @@ export async function initializeViewer(config, instanceId) {
   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 });
+  canvas.addEventListener(
+    "touchstart",
+    (e) => {
+      if (e.touches.length > 1) e.preventDefault();
+    },
+    { passive: false }
+  );
+  canvas.addEventListener(
+    "wheel",
+    (e) => {
+      e.preventDefault();
+    },
+    { passive: false }
+  );
 
-  // --- Clavier : bloquer le scroll uniquement quand la souris est au-dessus ---
-  const scrollKeys = new Set(["ArrowUp","ArrowDown","ArrowLeft","ArrowRight","PageUp","PageDown","Home","End"," ","Space","Spacebar"]);
+  // --- Clavier : bloquer le scroll seulement quand le pointeur est au-dessus du 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 onPointerLeave = () => {
+    isPointerOverCanvas = false;
+    if (document.activeElement === canvas) canvas.blur();
+  };
 
   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", () => { isPointerOverCanvas = false; });
 
   const onKeyDownCapture = (e) => {
     if (!isPointerOverCanvas) return;
-    if (scrollKeys.has(e.key) || scrollKeys.has(e.code)) e.preventDefault();
+    if (scrollKeys.has(e.key) || scrollKeys.has(e.code)) {
+      e.preventDefault();
+    }
   };
   window.addEventListener("keydown", onKeyDownCapture, true);
 
@@ -242,7 +247,7 @@ export async function initializeViewer(config, instanceId) {
   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 par canvas
   opts.componentSystems = [
     pc.RenderComponentSystem,
     pc.CameraComponentSystem,
@@ -286,7 +291,7 @@ export async function initializeViewer(config, instanceId) {
     canvas.removeEventListener("touchstart", focusCanvas);
   });
 
-  // Assets (on ne met PAS orbit-camera ici)
+  // Assets (sans orbit-camera ici)
   const assets = {
     sogs: new pc.Asset("gsplat", "gsplat", { url: sogsUrl }),
     glb: new pc.Asset("glb", "container", { url: glbUrl }),
@@ -296,13 +301,13 @@ export async function initializeViewer(config, instanceId) {
 
   const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
   loader.load(async () => {
-    // Enregistrer les scripts orbit pour CETTE app
-    await registerOrbitScriptsForApp(app);
+    // Charger et enregistrer orbit-camera.js pour CETTE app
+    await loadOrbitScriptsForApp(app, instanceId);
 
     app.start();
     progressDialog.style.display = "none";
 
-    // Modèle
+    // Entités
     modelEntity = new pc.Entity("model");
     modelEntity.addComponent("gsplat", { asset: assets.sogs });
     modelEntity.setLocalPosition(modelX, modelY, modelZ);
@@ -337,7 +342,7 @@ export async function initializeViewer(config, instanceId) {
       });
     }
 
-    // Caméra + scripts d’input
+    // Caméra + scripts orbit
     cameraEntity = new pc.Entity("camera");
     cameraEntity.addComponent("camera", {
       clearColor: new pc.Color(color_bg),