Skip to content

bugfix(fps): Fix mouse wheel zoom speed and decouple zoom update from logic step #1587

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

bugfix(fps): Fix mouse wheel zoom speed and decouple zoom update from logic step #1587

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
1802f65
Decouple zoom update from logic update
xezon Sep 17, 2025
183a608
Replicate in Generals
xezon Sep 20, 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
8 changes: 2 additions & 6 deletions Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,19 +399,15 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage

Int spin = msg->getArgument( 1 )->integer;

// TheSuperHackers @tweak The camera zoom is now decoupled from the render update.
const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();
const Real zoomHeight = (Real)View::ZoomHeightPerSecond * fpsRatio;

if (spin > 0)
{
for ( ; spin > 0; spin--)
TheTacticalView->zoom( -zoomHeight );
TheTacticalView->zoom( -View::ZoomHeightPerSecond );
}
else
{
for ( ;spin < 0; spin++ )
TheTacticalView->zoom( +zoomHeight );
TheTacticalView->zoom( +View::ZoomHeightPerSecond );
}

break;
Expand Down
14 changes: 7 additions & 7 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 @@ -1195,34 +1195,34 @@ void W3DView::update(void)
{
Real desiredHeight = (m_terrainHeightUnderCamera + m_heightAboveGround);
Real desiredZoom = desiredHeight / m_cameraOffset.z;

if (didScriptedMovement || (TheGameLogic->isInReplayGame() && TheGlobalData->m_useCameraInReplay))
{
// if we are in a scripted camera movement, take its height above ground as our desired height.
m_heightAboveGround = m_currentHeightAboveGround;
//DEBUG_LOG(("Frame %d: height above ground: %g %g %g %g", TheGameLogic->getFrame(), m_heightAboveGround,
// m_cameraOffset.z, m_zoom, m_terrainHeightUnderCamera));
}

if (TheInGameUI->isScrolling())
{
// 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;
if (fabs(zoomAdj) >= 0.0001) // only do positive
Real zoomAdj = (desiredZoom - m_zoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();
if (fabs(zoomAdj) >= 0.0001f) // only do positive
{
m_zoom += zoomAdj;
recalcCamera = true;
}
}
}
else
else if (!didScriptedMovement)
{
// we're not scrolling; settle toward desired height above ground
Real zoomAdj = (m_zoom - desiredZoom)*TheGlobalData->m_cameraAdjustSpeed;
Real zoomAdjAbs = fabs(zoomAdj);
if (zoomAdjAbs >= 0.0001 && !didScriptedMovement)
Real zoomAdj = (m_zoom - desiredZoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();
if (fabs(zoomAdj) >= 0.0001f)
{
//DEBUG_LOG(("W3DView::update() - m_zoom=%g, desiredHeight=%g", m_zoom, desiredZoom));
m_zoom -= zoomAdj;
recalcCamera = true;
}
Expand Down
8 changes: 2 additions & 6 deletions GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,19 +398,15 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage

Int spin = msg->getArgument( 1 )->integer;

// TheSuperHackers @tweak The camera zoom is now decoupled from the render update.
const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();
const Real zoomHeight = (Real)View::ZoomHeightPerSecond * fpsRatio;

if (spin > 0)
{
for ( ; spin > 0; spin--)
TheTacticalView->zoom( -zoomHeight );
TheTacticalView->zoom( -View::ZoomHeightPerSecond );
}
else
{
for ( ;spin < 0; spin++ )
TheTacticalView->zoom( +zoomHeight );
TheTacticalView->zoom( +View::ZoomHeightPerSecond );
}

break;
Expand Down
14 changes: 7 additions & 7 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 @@ -1348,34 +1348,34 @@ void W3DView::update(void)
{
Real desiredHeight = (m_terrainHeightUnderCamera + m_heightAboveGround);
Real desiredZoom = desiredHeight / m_cameraOffset.z;

if (didScriptedMovement || (TheGameLogic->isInReplayGame() && TheGlobalData->m_useCameraInReplay))
{
// if we are in a scripted camera movement, take its height above ground as our desired height.
m_heightAboveGround = m_currentHeightAboveGround;
//DEBUG_LOG(("Frame %d: height above ground: %g %g %g %g", TheGameLogic->getFrame(), m_heightAboveGround,
// m_cameraOffset.z, m_zoom, m_terrainHeightUnderCamera));
}

if (TheInGameUI->isScrolling())
{
// 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;
if (fabs(zoomAdj) >= 0.0001) // only do positive
Real zoomAdj = (desiredZoom - m_zoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();
if (fabs(zoomAdj) >= 0.0001f) // only do positive
{
m_zoom += zoomAdj;
recalcCamera = true;
}
}
}
else
else if (!didScriptedMovement)
{
// we're not scrolling; settle toward desired height above ground
Real zoomAdj = (m_zoom - desiredZoom)*TheGlobalData->m_cameraAdjustSpeed;
Real zoomAdjAbs = fabs(zoomAdj);
if (zoomAdjAbs >= 0.0001 && !didScriptedMovement)
Real zoomAdj = (m_zoom - desiredZoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();
if (fabs(zoomAdj) >= 0.0001f)
{
//DEBUG_LOG(("W3DView::update() - m_zoom=%g, desiredHeight=%g", m_zoom, desiredZoom));
m_zoom -= zoomAdj;
recalcCamera = true;
}
Expand Down
Loading