Skip to content

Smooth tracked cameras relative to their focus #6266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akleshchev merged 2 commits into from
Sep 14, 2026
+32 −5
Merged

Smooth tracked cameras relative to their focus #6266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01fd5fd
Smooth tracked cameras relative to their focus
Viscerous Sep 5, 2026
41756a5
Merge branch 'develop' into fix/tracked-camera-smoothing
Viscerous Sep 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions indra/newview/llagentcamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,8 @@ LLAgentCamera::LLAgentCamera() :
mSitCameraEnabled(false),
mCameraSmoothingLastPositionGlobal(),
mCameraSmoothingLastPositionAgent(),
mCameraSmoothingLastFocusGlobal(),
mCameraSmoothingLastFocusValid(false),
mCameraSmoothingStop(false),

mCameraUpVector(LLVector3::z_axis), // default is straight up
Expand Down Expand Up @@ -1052,6 +1054,13 @@ void LLAgentCamera::cameraOrbitIn(const F32 meters)
}
}

void LLAgentCamera::setCameraSmoothingLastPositionGlobal(const LLVector3d& camera_position_global)
{
mCameraSmoothingLastPositionGlobal = camera_position_global;
mCameraSmoothingLastFocusGlobal = mFocusGlobal;
mCameraSmoothingLastFocusValid = true;
}

//-----------------------------------------------------------------------------
// cameraPanIn()
//-----------------------------------------------------------------------------
Expand All @@ -1067,7 +1076,7 @@ void LLAgentCamera::cameraPanIn(F32 meters)
// don't enforce zoom constraints as this is the only way for users to get past them easily
updateFocusOffset();
// NOTE: panning movements expect the camera to move exactly with the focus target, not animated behind -Nyx
mCameraSmoothingLastPositionGlobal = calcCameraPositionTargetGlobal();
setCameraSmoothingLastPositionGlobal(calcCameraPositionTargetGlobal());
}

//-----------------------------------------------------------------------------
Expand All @@ -1089,7 +1098,7 @@ void LLAgentCamera::cameraPanLeft(F32 meters)
cameraZoomIn(1.f);
updateFocusOffset();
// NOTE: panning movements expect the camera to move exactly with the focus target, not animated behind - Nyx
mCameraSmoothingLastPositionGlobal = calcCameraPositionTargetGlobal();
setCameraSmoothingLastPositionGlobal(calcCameraPositionTargetGlobal());
}

//-----------------------------------------------------------------------------
Expand All @@ -1111,7 +1120,7 @@ void LLAgentCamera::cameraPanUp(F32 meters)
cameraZoomIn(1.f);
updateFocusOffset();
// NOTE: panning movements expect the camera to move exactly with the focus target, not animated behind -Nyx
mCameraSmoothingLastPositionGlobal = calcCameraPositionTargetGlobal();
setCameraSmoothingLastPositionGlobal(calcCameraPositionTargetGlobal());
}

void LLAgentCamera::resetCameraPan()
Expand All @@ -1124,7 +1133,7 @@ void LLAgentCamera::resetCameraPan()
cameraZoomIn(1.f);
updateFocusOffset();

mCameraSmoothingLastPositionGlobal = calcCameraPositionTargetGlobal();
setCameraSmoothingLastPositionGlobal(calcCameraPositionTargetGlobal());

resetPanDiff();
}
Expand Down Expand Up @@ -1466,6 +1475,21 @@ void LLAgentCamera::updateCamera()
camera_pos_global = camera_pos_agent + agent_pos;
}
}
else if (mTrackFocusObject && mFocusObject.notNull())
{
// Keep tracked-object translation exact and smooth only changes
// to the camera offset, as is done in avatar-relative mode.
LLVector3d camera_pos_focus = camera_pos_global - mFocusGlobal;
LLVector3d last_camera_pos_focus =
mCameraSmoothingLastPositionGlobal - mCameraSmoothingLastFocusGlobal;
LLVector3d delta = camera_pos_focus - last_camera_pos_focus;
if (mCameraSmoothingLastFocusValid &&
delta.magVec() < MAX_CAMERA_SMOOTH_DISTANCE)
{
camera_pos_focus = lerp(last_camera_pos_focus, camera_pos_focus, smoothing);
camera_pos_global = camera_pos_focus + mFocusGlobal;
}
}
else
{
LLVector3d delta = camera_pos_global - mCameraSmoothingLastPositionGlobal;
Expand All @@ -1476,7 +1500,7 @@ void LLAgentCamera::updateCamera()
}
}

mCameraSmoothingLastPositionGlobal = camera_pos_global;
setCameraSmoothingLastPositionGlobal(camera_pos_global);
mCameraSmoothingLastPositionAgent = camera_pos_agent;
mCameraSmoothingStop = false;
}
Expand Down
3 changes: 3 additions & 0 deletions indra/newview/llagentcamera.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ class LLAgentCamera
const LLVector3& getCameraUpVector() const { return mCameraUpVector; }
private:
LLVector3 getAvatarRootPosition();
void setCameraSmoothingLastPositionGlobal(const LLVector3d& camera_position_global);

F32 mCurrentCameraDistance; // Current camera offset from avatar
F32 mTargetCameraDistance; // Target camera offset from avatar
Expand All @@ -159,6 +160,8 @@ class LLAgentCamera
LLVector3 mCameraVirtualPositionAgent; // Camera virtual position (target) before performing FOV zoom
LLVector3d mCameraSmoothingLastPositionGlobal;
LLVector3d mCameraSmoothingLastPositionAgent;
LLVector3d mCameraSmoothingLastFocusGlobal;
bool mCameraSmoothingLastFocusValid;
bool mCameraSmoothingStop;
LLVector3 mCameraLag; // Third person camera lag
LLVector3 mCameraUpVector; // Camera's up direction in world coordinates (determines the 'roll' of the view)
Expand Down
Loading