Update tooltips.js

tooltips.js

@@ -146,6 +146,13 @@ export async function initializeTooltips(options) {
     });
   }
 
+  // Helper to normalize angle difference into [-180, +180]
+  function shortestAngleDiff(target, current) {
+    let delta = target - current;
+    delta = ((delta + 180) % 360 + 360) % 360 - 180;
+    return delta;
+  }
+
   // Tween helper: smoothly move and reorient camera to focus the chosen tooltip sphere
   function tweenCameraToTooltip(tooltipEnt, duration) {
     const orbitCam = cameraEntity.script.orbitCamera;
@@ -164,8 +171,7 @@ export async function initializeTooltips(options) {
     const minZoom = orbitCam.distanceMin;
     const desiredDistance = Math.max(minZoom * 1.2, worldRadius * 4);
 
-    // Compute target yaw/pitch from camera pointing at targetPos
-    // Reuse reset logic: place a temp entity at camera’s current position, have it look at target
+    // Compute raw target yaw/pitch from camera pointing at targetPos
     const camWorldPos = cameraEntity.getPosition().clone();
     const tempEnt = new pc.Entity();
     tempEnt.setPosition(camWorldPos);
@@ -173,18 +179,23 @@ export async function initializeTooltips(options) {
     const rotation = tempEnt.getRotation();
     const forward = new pc.Vec3();
     rotation.transformVector(pc.Vec3.FORWARD, forward);
-    const tgtYaw = Math.atan2(-forward.x, -forward.z) * pc.math.RAD_TO_DEG;
-    const yawQuat = new pc.Quat().setFromEulerAngles(0, -tgtYaw, 0);
+    const rawTgtYaw = Math.atan2(-forward.x, -forward.z) * pc.math.RAD_TO_DEG;
+    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();
     rotNoYaw.transformVector(pc.Vec3.FORWARD, fNoYaw);
-    const tgtPitch = Math.atan2(fNoYaw.y, -fNoYaw.z) * pc.math.RAD_TO_DEG;
+    const rawTgtPitch = Math.atan2(fNoYaw.y, -fNoYaw.z) * pc.math.RAD_TO_DEG;
+    const pitchDelta = shortestAngleDiff(rawTgtPitch, startPitch);
+    const endPitch = startPitch + pitchDelta;
+
     tempEnt.destroy();
 
     // Target state:
     const endPivot   = targetPos.clone();
-    const endYaw     = tgtYaw;
-    const endPitch   = tgtPitch;
     const endDist    = desiredDistance;
 
     let elapsed = 0;
@@ -213,12 +224,12 @@ export async function initializeTooltips(options) {
       const newPitch = pc.math.lerp(orgPitch, endPitch, 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();
 
@@ -231,4 +242,4 @@ export async function initializeTooltips(options) {
     currentTween = lerpUpdate;
     app.on("update", lerpUpdate);
   }
-}
+}