Update tooltips.js

tooltips.js

@@ -21,21 +21,17 @@ export async function initializeTooltips(options) {
   } = options;
 
   if (!app || !cameraEntity || !tooltipsUrl) {
-    console.error("tooltips.js → missing required initialization options");
     return;
   }
 
-  // Load JSON of tooltips:
   let tooltipsData;
   try {
     const resp = await fetch(tooltipsUrl);
     tooltipsData = await resp.json();
   } catch (e) {
-    console.error("tooltips.js → failed fetching tooltips.json:", e);
     return;
   }
   if (!Array.isArray(tooltipsData)) {
-    console.error("tooltips.js → tooltips.json must be an array");
     return;
   }
 
@@ -47,8 +43,8 @@ export async function initializeTooltips(options) {
   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.emissiveIntensity = 1;                   // Brightness, tweak as needed
-  mat.useLighting = false;                     // Optional: disables effect of lights, makes it "self-lit"
+  mat.emissiveIntensity = 1;
+  mat.useLighting = false;
   mat.update();
 
   // Build each tooltip sphere + attach custom data
@@ -60,7 +56,6 @@ export async function initializeTooltips(options) {
     sphere.addComponent("model", { type: "sphere" });
     sphere.model.material = mat;
 
-    // Scale small (primitive sphere radius = 0.5)
     sphere.setLocalScale(0.05, 0.05, 0.05);
     sphere.setLocalPosition(x, y, z);
     sphere.tooltipData = { title, description, imgUrl };
@@ -68,7 +63,6 @@ export async function initializeTooltips(options) {
     tooltipEntities.push(sphere);
   }
 
-  // Show/hide all tooltip spheres
   function setTooltipsVisibility(visible) {
     tooltipEntities.forEach(ent => {
       ent.enabled = visible;
@@ -76,18 +70,14 @@ export async function initializeTooltips(options) {
   }
   setTooltipsVisibility(!!defaultVisible);
 
-  // Respond to toggle-tooltips event from interface.js
   document.addEventListener("toggle-tooltips", (evt) => {
     const { visible } = evt.detail;
     setTooltipsVisibility(!!visible);
   });
 
-  // Keep track of any in-flight camera tween so we can cancel it
   let currentTween = null;
 
-  // On mouse down (or touch equivalent), perform manual ray‐sphere intersection
   app.mouse.on(pc.EVENT_MOUSEDOWN, (event) => {
-    // If a tween is running, cancel it immediately
     if (currentTween) {
       app.off("update", currentTween);
       currentTween = null;
@@ -137,17 +127,7 @@ export async function initializeTooltips(options) {
     }
   });
 
-  // Also close tooltip panel if user interacts (mouse or touch) on the canvas
-  const canvasId = app.graphicsDevice.canvas.id;
-  const htmlCanvas = document.getElementById(canvasId);
-  if (htmlCanvas) {
-    htmlCanvas.addEventListener("mousedown", () => {
-      document.dispatchEvent(new CustomEvent("hide-tooltip"));
-    });
-    htmlCanvas.addEventListener("touchstart", () => {
-      document.dispatchEvent(new CustomEvent("hide-tooltip"));
-    });
-  }
+  // Do NOT close the tooltip panel on canvas mousedown/touchstart!
 
   // Helper to normalize angle difference into [-180, +180]
   function shortestAngleDiff(target, current) {
@@ -156,25 +136,20 @@ export async function initializeTooltips(options) {
     return delta;
   }
 
-  // Tween helper: smoothly move and reorient camera to focus the chosen tooltip sphere
   function tweenCameraToTooltip(tooltipEnt, duration) {
     const orbitCam = cameraEntity.script.orbitCamera;
     if (!orbitCam) return;
 
-    // Compute target pivot exactly at the sphere center
     const targetPos = tooltipEnt.getPosition().clone();
-    // Compute current state
     const startPivot   = orbitCam.pivotPoint.clone();
     const startYaw     = orbitCam._yaw;
     const startPitch   = orbitCam._pitch;
     const startDist    = orbitCam._distance;
 
-    // Compute direction & candidate distance:
     const worldRadius  = 0.5 * tooltipEnt.getLocalScale().x;
     const minZoom = orbitCam.distanceMin;
     const desiredDistance = Math.max(minZoom * 1.2, worldRadius * 4);
 
-    // Compute raw target yaw/pitch from camera pointing at targetPos
     const camWorldPos = cameraEntity.getPosition().clone();
     const tempEnt = new pc.Entity();
     tempEnt.setPosition(camWorldPos);
@@ -186,7 +161,6 @@ export async function initializeTooltips(options) {
     const yawDelta = shortestAngleDiff(rawTgtYaw, startYaw);
     const endYaw = startYaw + yawDelta;
 
-    // Pitch calculation and normalization
     const yawQuat = new pc.Quat().setFromEulerAngles(0, -rawTgtYaw, 0);
     const rotNoYaw = new pc.Quat().mul2(yawQuat, rotation);
     const fNoYaw = new pc.Vec3();
@@ -197,7 +171,6 @@ export async function initializeTooltips(options) {
 
     tempEnt.destroy();
 
-    // Target state:
     const endPivot   = targetPos.clone();
     const endDist    = desiredDistance;
 
@@ -207,22 +180,18 @@ export async function initializeTooltips(options) {
     const orgPitch = startPitch;
     const orgDist  = startDist;
 
-    // If another tween is running, cancel it
     if (currentTween) {
       app.off("update", currentTween);
       currentTween = null;
     }
 
-    // Per-frame update
     function lerpUpdate(dt) {
       elapsed += dt;
       const t = Math.min(elapsed / duration, 1);
 
-      // Interpolate pivot (vector lerp)
       const newPivot = new pc.Vec3().lerp(orgPivot, endPivot, t);
       orbitCam.pivotPoint.copy(newPivot);
 
-      // Interpolate yaw/pitch/distance (simple lerp)
       const newYaw   = pc.math.lerp(orgYaw,   endYaw,   t);
       const newPitch = pc.math.lerp(orgPitch, endPitch, t);
       const newDist  = pc.math.lerp(orgDist,  endDist,  t);