Update tooltips.js

tooltips.js

@@ -173,19 +173,26 @@ 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;
+    // Raw yaw and pitch from tempEnt
+    let tgtYaw = Math.atan2(-forward.x, -forward.z) * pc.math.RAD_TO_DEG;
+    // Compute pitch (the _calcPitch logic):
     const yawQuat = new pc.Quat().setFromEulerAngles(0, -tgtYaw, 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;
+    let tgtPitch = Math.atan2(fNoYaw.y, -fNoYaw.z) * pc.math.RAD_TO_DEG;
     tempEnt.destroy();
 
-    // Target state:
-    const endPivot   = targetPos.clone();
-    const endYaw     = tgtYaw;
-    const endPitch   = tgtPitch;
-    const endDist    = desiredDistance;
+    // Adjust yaw to follow the shortest path from current yaw to target yaw
+    const currentYaw = startYaw;
+    let deltaYaw = tgtYaw - currentYaw;
+    // Wrap into [-180, +180]
+    deltaYaw = ((deltaYaw + 180) % 360) - 180;
+    const endYaw = currentYaw + deltaYaw;
+
+    // For pitch, since it’s usually within [-90, +90], direct assignment is fine
+    const endPitch = tgtPitch;
+    const endDist  = desiredDistance;
 
     let elapsed = 0;
     const orgPivot = startPivot.clone();
@@ -205,7 +212,7 @@ export async function initializeTooltips(options) {
       const t = Math.min(elapsed / duration, 1);
 
       // Interpolate pivot (vector lerp)
-      const newPivot = new pc.Vec3().lerp(orgPivot, endPivot, t);
+      const newPivot = new pc.Vec3().lerp(orgPivot, targetPos, t);
       orbitCam.pivotPoint.copy(newPivot);
 
       // Interpolate yaw/pitch/distance (simple lerp)
@@ -213,12 +220,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();