Skip to content

bugfix(camera): Decouple camera zoom update from logic time #1655

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
merged 2 commits into from
Sep 30, 2025
Merged

bugfix(camera): Decouple camera zoom update from logic time #1655

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
f2257df
tweak(camera): Decouple camera zoom update from logic time
xezon Sep 28, 2025
ae58764
Replicate in Generals
xezon Sep 30, 2025
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
6 changes: 4 additions & 2 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,8 @@ void W3DView::update(void)
// if scrolling, only adjust if we're too close or too far
if (m_scrollAmount.length() < m_scrollAmountCutoff || (m_currentHeightAboveGround < m_minHeightAboveGround) || (TheGlobalData->m_enforceMaxCameraHeight && m_currentHeightAboveGround > m_maxHeightAboveGround))
{
Real zoomAdj = (desiredZoom - m_zoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();
const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();
const Real zoomAdj = (desiredZoom - m_zoom) * TheGlobalData->m_cameraAdjustSpeed * fpsRatio;
if (fabs(zoomAdj) >= 0.0001f) // only do positive
{
m_zoom += zoomAdj;
Expand All @@ -1217,7 +1218,8 @@ void W3DView::update(void)
else if (!didScriptedMovement)
{
// we're not scrolling; settle toward desired height above ground
Real zoomAdj = (m_zoom - desiredZoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();
const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();
const Real zoomAdj = (m_zoom - desiredZoom) * TheGlobalData->m_cameraAdjustSpeed * fpsRatio;
if (fabs(zoomAdj) >= 0.0001f)
{
m_zoom -= zoomAdj;
Expand Down
6 changes: 4 additions & 2 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1355,7 +1355,8 @@ void W3DView::update(void)
// if scrolling, only adjust if we're too close or too far
if (m_scrollAmount.length() < m_scrollAmountCutoff || (m_currentHeightAboveGround < m_minHeightAboveGround) || (TheGlobalData->m_enforceMaxCameraHeight && m_currentHeightAboveGround > m_maxHeightAboveGround))
{
Real zoomAdj = (desiredZoom - m_zoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();
const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();
const Real zoomAdj = (desiredZoom - m_zoom) * TheGlobalData->m_cameraAdjustSpeed * fpsRatio;
if (fabs(zoomAdj) >= 0.0001f) // only do positive
{
m_zoom += zoomAdj;
Expand All @@ -1366,7 +1367,8 @@ void W3DView::update(void)
else if (!didScriptedMovement)
{
// we're not scrolling; settle toward desired height above ground
Real zoomAdj = (m_zoom - desiredZoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();
const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();
const Real zoomAdj = (m_zoom - desiredZoom) * TheGlobalData->m_cameraAdjustSpeed * fpsRatio;
if (fabs(zoomAdj) >= 0.0001f)
{
m_zoom -= zoomAdj;
Expand Down
Loading