Update viewer.js

viewer.js

@@ -1,3 +1,6 @@
+// viewer.js
+// ==============================
+
 /* -------------------------------------------
    Utils
    (les helpers image ne sont plus nécessaires pour .sog,
@@ -7,18 +10,102 @@
 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 (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 orbit-camera.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");
+    s.src = "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js";
+    s.async = true;
+    s.onload = () => {
+      window.__PLY_ORBIT_LOADED__ = true;
+      resolve();
+    };
+    s.onerror = (e) => {
+      console.error("[viewer.js] Failed to load orbit-camera.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 viewerInitialized = false;
 let resizeObserver = 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;
 
@@ -39,13 +126,152 @@ export async function initializeViewer(config, instanceId) {
   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;
 
-
   // --- 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
   });
@@ -59,6 +285,9 @@ export async function initializeViewer(config, instanceId) {
   opts.componentSystems = [
     pc.RenderComponentSystem,
     pc.CameraComponentSystem,
+    pc.LightComponentSystem,
+    pc.ScriptComponentSystem,
+    pc.GSplatComponentSystem,
     pc.CollisionComponentSystem,
     pc.RigidbodyComponentSystem
   ];
@@ -69,7 +298,6 @@ export async function initializeViewer(config, instanceId) {
   app.setCanvasFillMode(pc.FILLMODE_NONE);
   app.setCanvasResolution(pc.RESOLUTION_AUTO);
 
-
   resizeObserver = new ResizeObserver((entries) => {
     entries.forEach((entry) => {
       app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
@@ -80,8 +308,10 @@ export async function initializeViewer(config, instanceId) {
   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();
@@ -89,8 +319,14 @@ export async function initializeViewer(config, instanceId) {
     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 les assets ---
   // IMPORTANT : pour .sog on déclare un asset de type "gsplat" avec l'URL .sog
   const assets = {
@@ -101,6 +337,7 @@ export async function initializeViewer(config, instanceId) {
   for (const k in assets) app.assets.add(assets[k]);
 
   const loader = new pc.AssetListLoader(Object.values(assets), app.assets);
+
   // Assure orbit-camera.js une seule fois
   await ensureOrbitScriptsLoaded();
 
@@ -147,6 +384,7 @@ export async function initializeViewer(config, instanceId) {
       ////// 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", {
@@ -206,8 +444,56 @@ export async function initializeViewer(config, instanceId) {
     } catch (e) {
       /* optional */
     }
+
     viewerInitialized = true;
   });
 }
 
-/* -------------------------------------------
+/* -------------------------------------------
+   Reset caméra (API)
+-------------------------------------------- */
+
+export function resetViewerCamera() {
+  try {
+    if (!cameraEntity || !modelEntity || !app) return;
+    const orbitCam = cameraEntity.script.orbitCamera;
+    if (!orbitCam) return;
+
+    const modelPos = modelEntity.getPosition();
+    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);
+  }
+}