Update viewer.js

viewer.js

@@ -2,27 +2,27 @@
 // ==============================
 
 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;
-    });
+  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 all window.Image to force crossOrigin="anonymous" ---
-(function() {
+(function () {
   const OriginalImage = window.Image;
-  window.Image = function(...args) {
+  window.Image = function (...args) {
     const img = new OriginalImage(...args);
     img.crossOrigin = "anonymous";
     return img;
@@ -36,10 +36,10 @@ function hexToRgbaArray(hex) {
     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
+      ((num >> 24) & 0xff) / 255,
+      ((num >> 16) & 0xff) / 255,
+      ((num >> 8) & 0xff) / 255,
+      (num & 0xff) / 255
     ];
   } catch (e) {
     alert("hexToRgbaArray error: " + e);
@@ -49,10 +49,49 @@ function hexToRgbaArray(hex) {
 
 // ----- Utility: Recursive scene traversal -----
 function traverse(entity, callback) {
-    callback(entity);
-    if (entity.children) {
-        entity.children.forEach(child => traverse(child, callback));
-    }
+  callback(entity);
+  if (entity.children) {
+    entity.children.forEach((child) => traverse(child, 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;
+  }
+
+  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);
+  });
+
+  try {
+    await window.__orbitScriptsLoadingPromise;
+  } catch (e) {
+    // laisser l'app continuer sans scripts (mais la caméra ne marchera pas)
+  }
 }
 
 let pc;
@@ -73,6 +112,8 @@ 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);
@@ -80,38 +121,57 @@ export async function initializeViewer(config, instanceId) {
 
   //prends les differents arguments de config.json
   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;
@@ -119,82 +179,99 @@ export async function initializeViewer(config, instanceId) {
   chosenCameraZ = isMobile ? cameraZPhone : cameraZ;
 
   //cree le nouveau canva (instanceId est une valeur aléatoire pour gérer plusieurs canvas sur la meme page)
-  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);
+  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);
   if (oldCanvas) oldCanvas.remove();
 
-  const canvas = document.createElement('canvas');
+  const canvas = document.createElement("canvas");
   canvas.id = canvasId;
-  canvas.className = 'ply-canvas';
+  canvas.className = "ply-canvas";
   canvas.style.width = "100%";
   canvas.style.height = "100%";
-  canvas.setAttribute('tabindex', '0');
+  canvas.setAttribute("tabindex", "0");
   viewerContainer.insertBefore(canvas, progressDialog);
 
   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("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 }
+  );
 
   // --- 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'
+    "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();
-    }
+    if (document.activeElement === canvas) canvas.blur();
   };
 
-  // Fallback souris si pointer events indisponibles
-  canvas.addEventListener('pointerenter', onPointerEnter);
-  canvas.addEventListener('pointerleave', onPointerLeave);
-  canvas.addEventListener('mouseenter', onPointerEnter);
-  canvas.addEventListener('mouseleave', onPointerLeave);
-
-  // Forcer le focus quand on interagit
-  canvas.addEventListener('mousedown', focusCanvas);
-  canvas.addEventListener('touchstart', () => { focusCanvas(); }, { passive: false });
-
-  // Si le canvas perd le focus (Alt+Tab, click ailleurs…), on arrête de bloquer
-  const onCanvasBlur = () => { isPointerOverCanvas = false; };
-  canvas.addEventListener('blur', onCanvasBlur);
+  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);
 
-  // Capture au niveau fenêtre pour bloquer le scroll, mais seulement si pointeur dessus
   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 doit recevoir les touches
+      // ne pas stopPropagation -> PlayCanvas reçoit bien les touches
     }
   };
-  window.addEventListener('keydown', onKeyDownCapture, true);
+  window.addEventListener("keydown", onKeyDownCapture, true);
 
-  // ⚠️ IMPORTANT : on ne bloque plus keydown/keyup sur le canvas lui-même.
-  // Ça évite de devoir “recliquer” pour retrouver le scroll.
-
-  progressDialog.style.display = 'block';
+  progressDialog.style.display = "block";
 
   if (!pc) {
     pc = await import("https://esm.run/playcanvas");
@@ -214,7 +291,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 attaché au canvas
   opts.componentSystems = [
     pc.RenderComponentSystem,
     pc.CameraComponentSystem,
@@ -235,50 +312,60 @@ export async function initializeViewer(config, instanceId) {
   app.setCanvasFillMode(pc.FILLMODE_NONE);
   app.setCanvasResolution(pc.RESOLUTION_AUTO);
 
-  resizeObserver = new ResizeObserver(entries => {
-    entries.forEach(entry => {
+  resizeObserver = new ResizeObserver((entries) => {
+    entries.forEach((entry) => {
       app.resizeCanvas(entry.contentRect.width, entry.contentRect.height);
     });
   });
   resizeObserver.observe(viewerContainer);
 
-  window.addEventListener('resize', () => app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight));
+  window.addEventListener("resize", () =>
+    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight)
+  );
 
   // Nettoyage complet à la destruction
-  app.on('destroy', () => {
+  app.on("destroy", () => {
     resizeObserver.disconnect();
     if (opts.keyboard && opts.keyboard.detach) opts.keyboard.detach();
 
-    window.removeEventListener('keydown', onKeyDownCapture, true);
+    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);
+    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().
   const assets = {
-    sogs: new pc.Asset('gsplat', 'gsplat', { url: sogsUrl }),
-    orbit: new pc.Asset('script', 'script', { url: "https://mikafil-viewer-sgos.static.hf.space/orbit-camera.js" }),
-    glb: new pc.Asset('glb', 'container', { url: glbUrl }),
-    presentoir: new pc.Asset('presentoir', 'container', { url: presentoirUrl }),
+    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(() => {
+  loader.load(async () => {
+    // Charger les scripts orbit (une seule fois globalement)
+    await ensureOrbitScripts(app);
+
     app.start();
-    progressDialog.style.display = 'none';
+    progressDialog.style.display = "none";
 
-    modelEntity = new pc.Entity('model');
-    modelEntity.addComponent('gsplat', { asset: assets.sogs });
+    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);
 
@@ -286,7 +373,11 @@ 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) {
@@ -297,7 +388,7 @@ export async function initializeViewer(config, instanceId) {
       matSol.useLighting = false;
       matSol.update();
 
-      traverse(presentoirEntity, node => {
+      traverse(presentoirEntity, (node) => {
         if (node.render && node.render.meshInstances) {
           for (let mi of node.render.meshInstances) {
             mi.material = matSol;
@@ -305,7 +396,7 @@ export async function initializeViewer(config, instanceId) {
         }
       });
 
-      traverse(glbEntity, node => {
+      traverse(glbEntity, (node) => {
         if (node.render && node.render.meshInstances) {
           for (let mi of node.render.meshInstances) {
             mi.material = matSol;
@@ -314,17 +405,16 @@ export async function initializeViewer(config, instanceId) {
       });
     }
 
-    cameraEntity = new pc.Entity('camera');
-    cameraEntity.addComponent('camera',
-      {
-        clearColor: new pc.Color(color_bg),
-        nearClip: 0.001,
-        farClip: 100
-      });
+    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');
-    cameraEntity.script.create('orbitCamera', {
+    cameraEntity.addComponent("script");
+    cameraEntity.script.create("orbitCamera", {
       attributes: {
         focusEntity: modelEntity,
         inertiaFactor: 0.2,
@@ -338,32 +428,39 @@ export async function initializeViewer(config, instanceId) {
         frameOnStart: false
       }
     });
-    cameraEntity.script.create('orbitCameraInputMouse');
-    cameraEntity.script.create('orbitCameraInputTouch');
-    cameraEntity.script.create('orbitCameraInputKeyboard', {
+    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)
+        strafeSpeed: 1.2 // gauche/droite (relatif à la distance)
       }
     });
     app.root.addChild(cameraEntity);
 
-    app.resizeCanvas(viewerContainer.clientWidth, viewerContainer.clientHeight);
-    app.once('update', () => resetViewerCamera());
+    app.resizeCanvas(
+      viewerContainer.clientWidth,
+      viewerContainer.clientHeight
+    );
+    app.once("update", () => resetViewerCamera());
 
-    // Tooltips supported if tooltips_url set
+    // Tooltips support
     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
+        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(() => { /* optional */ });
       }
     } catch (e) {
       // optional
@@ -384,10 +481,9 @@ export function resetViewerCamera() {
     tempEnt.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
     tempEnt.lookAt(modelPos);
 
-    const dist = new pc.Vec3().sub2(
-      new pc.Vec3(chosenCameraX, chosenCameraY, chosenCameraZ),
-      modelPos
-    ).length();
+    const dist = new pc.Vec3()
+      .sub2(new pc.Vec3(chosenCameraX, chosenCameraY, chosenCameraZ), modelPos)
+      .length();
 
     cameraEntity.setPosition(chosenCameraX, chosenCameraY, chosenCameraZ);
     cameraEntity.lookAt(modelPos);