Update tooltips.js

tooltips.js

@@ -3,9 +3,9 @@
 /**
  * initializeTooltips(options)
  *
- * - options.app: the PlayCanvas App instance
- * - options.cameraEntity: the PlayCanvas camera Entity
- * - options.modelEntity: the main model entity (for any relative positioning; optional)
+ * - options.app: the PlayCanvas AppBase instance
+ * - options.cameraEntity: PlayCanvas camera Entity
+ * - options.modelEntity: the main model entity (for relative positioning, optional)
  * - options.tooltipsUrl: URL to fetch JSON array of tooltip definitions
  * - options.defaultVisible: boolean: whether tooltips are visible initially
  * - options.moveDuration: number (seconds) for smooth camera move to selected tooltip
@@ -20,29 +20,23 @@ export async function initializeTooltips(options) {
     moveDuration = 0.6
   } = options;
 
-  if (!app || !cameraEntity || !tooltipsUrl) {
-    return;
-  }
+  if (!app || !cameraEntity || !tooltipsUrl) return;
 
   let tooltipsData;
   try {
     const resp = await fetch(tooltipsUrl);
     tooltipsData = await resp.json();
-  } catch (e) {
-    return;
-  }
-  if (!Array.isArray(tooltipsData)) {
-    return;
-  }
+  } catch (e) { return; }
+  if (!Array.isArray(tooltipsData)) return;
 
   const tooltipEntities = [];
 
-  // Create a material for tooltip spheres
+  // Create a material for tooltip spheres (still use StandardMaterial, works fine)
   const mat = new pc.StandardMaterial();
   mat.diffuse = new pc.Color(1, 0.8, 0);
   mat.specular = new pc.Color(1, 1, 1);
   mat.shininess = 20;
-  mat.emissive = new pc.Color(0.85, 0.85, 0.85);      // Strong orange emissive
+  mat.emissive = new pc.Color(0.85, 0.85, 0.85);
   mat.emissiveIntensity = 1;
   mat.useLighting = false;
   mat.update();
@@ -64,9 +58,7 @@ export async function initializeTooltips(options) {
   }
 
   function setTooltipsVisibility(visible) {
-    tooltipEntities.forEach(ent => {
-      ent.enabled = visible;
-    });
+    tooltipEntities.forEach(ent => { ent.enabled = visible; });
   }
   setTooltipsVisibility(!!defaultVisible);
 
@@ -83,10 +75,8 @@ export async function initializeTooltips(options) {
       currentTween = null;
     }
 
-    const x = event.x;
-    const y = event.y;
-    const from = new pc.Vec3();
-    const to   = new pc.Vec3();
+    const x = event.x, y = event.y;
+    const from = new pc.Vec3(), to = new pc.Vec3();
     const camera = cameraEntity.camera;
 
     camera.screenToWorld(x, y, camera.nearClip, from);
@@ -127,9 +117,7 @@ export async function initializeTooltips(options) {
     }
   });
 
-  // Do NOT close the tooltip panel on canvas mousedown/touchstart!
-
-  // Helper to normalize angle difference into [-180, +180]
+  // Camera animation
   function shortestAngleDiff(target, current) {
     let delta = target - current;
     delta = ((delta + 180) % 360 + 360) % 360 - 180;
@@ -141,12 +129,12 @@ export async function initializeTooltips(options) {
     if (!orbitCam) return;
 
     const targetPos = tooltipEnt.getPosition().clone();
-    const startPivot   = orbitCam.pivotPoint.clone();
-    const startYaw     = orbitCam._yaw;
-    const startPitch   = orbitCam._pitch;
-    const startDist    = orbitCam._distance;
+    const startPivot = orbitCam.pivotPoint.clone();
+    const startYaw = orbitCam._yaw;
+    const startPitch = orbitCam._pitch;
+    const startDist = orbitCam._distance;
 
-    const worldRadius  = 0.5 * tooltipEnt.getLocalScale().x;
+    const worldRadius = 0.5 * tooltipEnt.getLocalScale().x;
     const minZoom = orbitCam.distanceMin;
     const desiredDistance = Math.max(minZoom * 1.2, worldRadius * 4);
 
@@ -171,14 +159,14 @@ export async function initializeTooltips(options) {
 
     tempEnt.destroy();
 
-    const endPivot   = targetPos.clone();
-    const endDist    = desiredDistance;
+    const endPivot = targetPos.clone();
+    const endDist = desiredDistance;
 
     let elapsed = 0;
     const orgPivot = startPivot.clone();
-    const orgYaw   = startYaw;
+    const orgYaw = startYaw;
     const orgPitch = startPitch;
-    const orgDist  = startDist;
+    const orgDist = startDist;
 
     if (currentTween) {
       app.off("update", currentTween);
@@ -192,16 +180,16 @@ export async function initializeTooltips(options) {
       const newPivot = new pc.Vec3().lerp(orgPivot, endPivot, t);
       orbitCam.pivotPoint.copy(newPivot);
 
-      const newYaw   = pc.math.lerp(orgYaw,   endYaw,   t);
+      const newYaw = pc.math.lerp(orgYaw, endYaw, t);
       const newPitch = pc.math.lerp(orgPitch, endPitch, t);
-      const newDist  = pc.math.lerp(orgDist,  endDist,  t);
+      const newDist = pc.math.lerp(orgDist, endDist, t);
 
-      orbitCam._targetYaw      = newYaw;
-      orbitCam._yaw            = newYaw;
-      orbitCam._targetPitch    = newPitch;
-      orbitCam._pitch          = newPitch;
+      orbitCam._targetYaw = newYaw;
+      orbitCam._yaw = newYaw;
+      orbitCam._targetPitch = newPitch;
+      orbitCam._pitch = newPitch;
       orbitCam._targetDistance = newDist;
-      orbitCam._distance       = newDist;
+      orbitCam._distance = newDist;
 
       orbitCam._updatePosition();