Update viewer.js

viewer.js

@@ -55,43 +55,54 @@ function traverse(entity, callback) {
   }
 }
 
-// ---------- Charger orbit-camera.js une seule fois globalement ----------
-async function ensureOrbitScripts(app) {
-  if (window.__orbitScriptsLoaded) return;
-  if (window.__orbitScriptsLoadingPromise) {
-    try {
-      await window.__orbitScriptsLoadingPromise;
-    } catch (e) {}
-    return;
+/**
+ * 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.
+ */
+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__;
 
-  window.__orbitScriptsLoadingPromise = new Promise((resolve, reject) => {
-    const asset = new pc.Asset(
-      "orbit-script-" + Math.random().toString(36).slice(2),
-      "script",
-      { url: "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js" }
-    );
-    app.assets.add(asset);
-
-    const done = () => {
-      window.__orbitScriptsLoaded = true;
-      resolve(true);
-    };
-    const fail = (e) => {
-      console.error("[viewer.js] orbit-camera.js failed to load", e);
-      reject(e);
-    };
-
-    asset.once("load", done);
-    asset.once("error", fail);
-    app.assets.load(asset);
-  });
+  // 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 {
-    await window.__orbitScriptsLoadingPromise;
+    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) {
-    // laisser l'app continuer sans scripts (mais la caméra ne marchera pas)
+    console.error("[viewer.js] orbit-camera.js eval error:", e);
+  } finally {
+    if (prevGetApp) pc.Application.getApplication = prevGetApp;
+    pc.app = prevApp;
   }
+
+  // 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 (_) {}
 }
 
 let pc;
@@ -112,76 +123,58 @@ let sogsUrl, glbUrl, presentoirUrl;
 let color_bg_hex, color_bg, espace_expo_bool;
 
 export async function initializeViewer(config, instanceId) {
-  // Ce module est importé avec un query param unique par interface.js,
-  // donc 1 instance par import. On garde tout de même ce garde-fou.
   if (viewerInitialized) return;
 
   const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent);
   const isMobile = isIOS || /Android/i.test(navigator.userAgent);
 
-  //prends les differents arguments de config.json
+  // Params
   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;
   chosenCameraY = isMobile ? cameraYPhone : cameraY;
   chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
 
-  //cree le nouveau canva (instanceId est une valeur aléatoire pour gérer plusieurs canvas sur la meme page)
+  // Canvas
   const canvasId = "canvas-" + instanceId;
   const progressDialog = document.getElementById("progress-dialog-" + instanceId);
-  const progressIndicator = document.getElementById("progress-indicator-" + instanceId);
   const viewerContainer = document.getElementById("viewer-container-" + instanceId);
 
   let oldCanvas = document.getElementById(canvasId);
@@ -195,79 +188,37 @@ export async function initializeViewer(config, instanceId) {
   canvas.setAttribute("tabindex", "0");
   viewerContainer.insertBefore(canvas, progressDialog);
 
+  // Gestes / molette
   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 }
-  );
+  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 seulement quand le pointeur est au-dessus du canvas ---
-  const scrollKeys = new Set([
-    "ArrowUp",
-    "ArrowDown",
-    "ArrowLeft",
-    "ArrowRight",
-    "PageUp",
-    "PageDown",
-    "Home",
-    "End",
-    " ",
-    "Space",
-    "Spacebar"
-  ]);
+  // --- 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"]);
   let isPointerOverCanvas = false;
   const focusCanvas = () => canvas.focus({ preventScroll: true });
 
-  const onPointerEnter = () => {
-    isPointerOverCanvas = true;
-    focusCanvas();
-  };
-  const onPointerLeave = () => {
-    isPointerOverCanvas = false;
-    // rendre immédiatement le scroll à la page sans recliquer
-    if (document.activeElement === canvas) canvas.blur();
-  };
+  const onPointerEnter = () => { isPointerOverCanvas = true; focusCanvas(); };
+  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 }
-  );
-
-  const onCanvasBlur = () => {
-    isPointerOverCanvas = false;
-  };
-  canvas.addEventListener("blur", onCanvasBlur);
+  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(); // bloque le scroll page
-      // ne pas stopPropagation -> PlayCanvas reçoit bien les touches
-    }
+    if (scrollKeys.has(e.key) || scrollKeys.has(e.code)) e.preventDefault();
   };
   window.addEventListener("keydown", onKeyDownCapture, true);
 
@@ -278,7 +229,7 @@ export async function initializeViewer(config, instanceId) {
     window.pc = pc;
   }
 
-  // Create app first
+  // App
   const device = await pc.createGraphicsDevice(canvas, {
     deviceTypes: ["webgl2"],
     glslangUrl: "https://playcanvas.vercel.app/static/lib/glslang/glslang.js",
@@ -291,7 +242,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); // clavier attaché au canvas
+  opts.keyboard = new pc.Keyboard(canvas);
   opts.componentSystems = [
     pc.RenderComponentSystem,
     pc.CameraComponentSystem,
@@ -323,49 +274,39 @@ export async function initializeViewer(config, instanceId) {
     app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight)
   );
 
-  // Nettoyage complet à la destruction
   app.on("destroy", () => {
     resizeObserver.disconnect();
     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);
   });
 
-  // Assets after app exists
-  // ⚠️ On NE charge PAS orbit-camera.js via AssetListLoader pour éviter les
-  // redéfinitions multiples de scripts. On l'assure via ensureOrbitScripts().
+  // Assets (on ne met PAS orbit-camera ici)
   const assets = {
     sogs: new pc.Asset("gsplat", "gsplat", { url: sogsUrl }),
     glb: new pc.Asset("glb", "container", { url: glbUrl }),
     presentoir: new pc.Asset("presentoir", "container", { url: presentoirUrl })
   };
-
   for (const key in assets) app.assets.add(assets[key]);
 
   const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
   loader.load(async () => {
-    // Charger les scripts orbit (une seule fois globalement)
-    await ensureOrbitScripts(app);
+    // Enregistrer les scripts orbit pour CETTE app
+    await registerOrbitScriptsForApp(app);
 
     app.start();
     progressDialog.style.display = "none";
 
+    // Modèle
     modelEntity = new pc.Entity("model");
     modelEntity.addComponent("gsplat", { asset: assets.sogs });
     modelEntity.setLocalPosition(modelX, modelY, modelZ);
-    modelEntity.setLocalEulerAngles(
-      modelRotationX,
-      modelRotationY,
-      modelRotationZ
-    );
+    modelEntity.setLocalEulerAngles(modelRotationX, modelRotationY, modelRotationZ);
     modelEntity.setLocalScale(modelScale, modelScale, modelScale);
     app.root.addChild(modelEntity);
 
@@ -373,11 +314,7 @@ export async function initializeViewer(config, instanceId) {
     app.root.addChild(glbEntity);
 
     const presentoirEntity = assets.presentoir.resource.instantiateRenderEntity();
-    presentoirEntity.setLocalScale(
-      presentoirScaleX,
-      presentoirScaleY,
-      presentoirScaleZ
-    );
+    presentoirEntity.setLocalScale(presentoirScaleX, presentoirScaleY, presentoirScaleZ);
     app.root.addChild(presentoirEntity);
 
     if (!espace_expo_bool) {
@@ -390,21 +327,17 @@ export async function initializeViewer(config, instanceId) {
 
       traverse(presentoirEntity, (node) => {
         if (node.render && node.render.meshInstances) {
-          for (let mi of node.render.meshInstances) {
-            mi.material = matSol;
-          }
+          for (let mi of node.render.meshInstances) mi.material = matSol;
         }
       });
-
       traverse(glbEntity, (node) => {
         if (node.render && node.render.meshInstances) {
-          for (let mi of node.render.meshInstances) {
-            mi.material = matSol;
-          }
+          for (let mi of node.render.meshInstances) mi.material = matSol;
         }
       });
     }
 
+    // Caméra + scripts d’input
     cameraEntity = new pc.Entity("camera");
     cameraEntity.addComponent("camera", {
       clearColor: new pc.Color(color_bg),
@@ -431,40 +364,28 @@ export async function initializeViewer(config, instanceId) {
     cameraEntity.script.create("orbitCameraInputMouse");
     cameraEntity.script.create("orbitCameraInputTouch");
     cameraEntity.script.create("orbitCameraInputKeyboard", {
-      attributes: {
-        forwardSpeed: 1.2, // vertical (relatif à la distance)
-        strafeSpeed: 1.2 // gauche/droite (relatif à la distance)
-      }
+      attributes: { forwardSpeed: 1.2, strafeSpeed: 1.2 }
     });
     app.root.addChild(cameraEntity);
 
-    app.resizeCanvas(
-      viewerContainer.clientWidth,
-      viewerContainer.clientHeight
-    );
+    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
     app.once("update", () => resetViewerCamera());
 
-    // Tooltips support
+    // Tooltips (optionnel)
     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 */
+        import("./tooltips.js").then((tooltipsModule) => {
+          tooltipsModule.initializeTooltips({
+            app,
+            cameraEntity,
+            modelEntity,
+            tooltipsUrl: config.tooltips_url,
+            defaultVisible: !!config.showTooltipsDefault,
+            moveDuration: config.tooltipMoveDuration || 0.6
           });
+        }).catch(() => {});
       }
-    } catch (e) {
-      // optional
-    }
+    } catch (_) {}
 
     viewerInitialized = true;
   });