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

xezon · web-flow · commit b1eac2a5bb23 · 2025-09-20T12:17:52.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/Generals/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
@@ -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;
diff --git a/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp b/Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
@@ -1184,34 +1184,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;
 			}
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp
@@ -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;
diff --git a/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp b/GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp
@@ -1333,34 +1333,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;
 			}

Original file line number	Diff line number	Diff line change
`@@ -399,19 +399,15 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage`
`399`	`399`
`400`	`400`	`Int spin = msg->getArgument( 1 )->integer;`
`401`	`401`
`402`		`- // TheSuperHackers @tweak The camera zoom is now decoupled from the render update.`
`403`		`- const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();`
`404`		`- const Real zoomHeight = (Real)View::ZoomHeightPerSecond * fpsRatio;`
`405`		`-`
`406`	`402`	`if (spin > 0)`
`407`	`403`	`{`
`408`	`404`	`for ( ; spin > 0; spin--)`
`409`		`- TheTacticalView->zoom( -zoomHeight );`
	`405`	`+ TheTacticalView->zoom( -View::ZoomHeightPerSecond );`
`410`	`406`	`}`
`411`	`407`	`else`
`412`	`408`	`{`
`413`	`409`	`for ( ;spin < 0; spin++ )`
`414`		`- TheTacticalView->zoom( +zoomHeight );`
	`410`	`+ TheTacticalView->zoom( +View::ZoomHeightPerSecond );`
`415`	`411`	`}`
`416`	`412`
`417`	`413`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -1184,34 +1184,34 @@ void W3DView::update(void)`
`1184`	`1184`	`{`
`1185`	`1185`	`Real desiredHeight = (m_terrainHeightUnderCamera + m_heightAboveGround);`
`1186`	`1186`	`Real desiredZoom = desiredHeight / m_cameraOffset.z;`
	`1187`	`+`
`1187`	`1188`	`if (didScriptedMovement \|\| (TheGameLogic->isInReplayGame() && TheGlobalData->m_useCameraInReplay))`
`1188`	`1189`	`{`
`1189`	`1190`	`// if we are in a scripted camera movement, take its height above ground as our desired height.`
`1190`	`1191`	`m_heightAboveGround = m_currentHeightAboveGround;`
`1191`	`1192`	`//DEBUG_LOG(("Frame %d: height above ground: %g %g %g %g", TheGameLogic->getFrame(), m_heightAboveGround,`
`1192`	`1193`	`// m_cameraOffset.z, m_zoom, m_terrainHeightUnderCamera));`
`1193`	`1194`	`}`
	`1195`	`+`
`1194`	`1196`	`if (TheInGameUI->isScrolling())`
`1195`	`1197`	`{`
`1196`	`1198`	`// if scrolling, only adjust if we're too close or too far`
`1197`	`1199`	`if (m_scrollAmount.length() < m_scrollAmountCutoff \|\| (m_currentHeightAboveGround < m_minHeightAboveGround) \|\| (TheGlobalData->m_enforceMaxCameraHeight && m_currentHeightAboveGround > m_maxHeightAboveGround))`
`1198`	`1200`	`{`
`1199`		`- Real zoomAdj = (desiredZoom - m_zoom)*TheGlobalData->m_cameraAdjustSpeed;`
`1200`		`- if (fabs(zoomAdj) >= 0.0001) // only do positive`
	`1201`	`+ Real zoomAdj = (desiredZoom - m_zoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();`
	`1202`	`+ if (fabs(zoomAdj) >= 0.0001f) // only do positive`
`1201`	`1203`	`{`
`1202`	`1204`	`m_zoom += zoomAdj;`
`1203`	`1205`	`recalcCamera = true;`
`1204`	`1206`	`}`
`1205`	`1207`	`}`
`1206`	`1208`	`}`
`1207`		`- else`
	`1209`	`+ else if (!didScriptedMovement)`
`1208`	`1210`	`{`
`1209`	`1211`	`// we're not scrolling; settle toward desired height above ground`
`1210`		`- Real zoomAdj = (m_zoom - desiredZoom)*TheGlobalData->m_cameraAdjustSpeed;`
`1211`		`- Real zoomAdjAbs = fabs(zoomAdj);`
`1212`		`- if (zoomAdjAbs >= 0.0001 && !didScriptedMovement)`
	`1212`	`+ Real zoomAdj = (m_zoom - desiredZoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();`
	`1213`	`+ if (fabs(zoomAdj) >= 0.0001f)`
`1213`	`1214`	`{`
`1214`		`- //DEBUG_LOG(("W3DView::update() - m_zoom=%g, desiredHeight=%g", m_zoom, desiredZoom));`
`1215`	`1215`	`m_zoom -= zoomAdj;`
`1216`	`1216`	`recalcCamera = true;`
`1217`	`1217`	`}`
Original file line number	Diff line number	Diff line change
`@@ -398,19 +398,15 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage`
`398`	`398`
`399`	`399`	`Int spin = msg->getArgument( 1 )->integer;`
`400`	`400`
`401`		`- // TheSuperHackers @tweak The camera zoom is now decoupled from the render update.`
`402`		`- const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();`
`403`		`- const Real zoomHeight = (Real)View::ZoomHeightPerSecond * fpsRatio;`
`404`		`-`
`405`	`401`	`if (spin > 0)`
`406`	`402`	`{`
`407`	`403`	`for ( ; spin > 0; spin--)`
`408`		`- TheTacticalView->zoom( -zoomHeight );`
	`404`	`+ TheTacticalView->zoom( -View::ZoomHeightPerSecond );`
`409`	`405`	`}`
`410`	`406`	`else`
`411`	`407`	`{`
`412`	`408`	`for ( ;spin < 0; spin++ )`
`413`		`- TheTacticalView->zoom( +zoomHeight );`
	`409`	`+ TheTacticalView->zoom( +View::ZoomHeightPerSecond );`
`414`	`410`	`}`
`415`	`411`
`416`	`412`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -1333,34 +1333,34 @@ void W3DView::update(void)`
`1333`	`1333`	`{`
`1334`	`1334`	`Real desiredHeight = (m_terrainHeightUnderCamera + m_heightAboveGround);`
`1335`	`1335`	`Real desiredZoom = desiredHeight / m_cameraOffset.z;`
	`1336`	`+`
`1336`	`1337`	`if (didScriptedMovement \|\| (TheGameLogic->isInReplayGame() && TheGlobalData->m_useCameraInReplay))`
`1337`	`1338`	`{`
`1338`	`1339`	`// if we are in a scripted camera movement, take its height above ground as our desired height.`
`1339`	`1340`	`m_heightAboveGround = m_currentHeightAboveGround;`
`1340`	`1341`	`//DEBUG_LOG(("Frame %d: height above ground: %g %g %g %g", TheGameLogic->getFrame(), m_heightAboveGround,`
`1341`	`1342`	`// m_cameraOffset.z, m_zoom, m_terrainHeightUnderCamera));`
`1342`	`1343`	`}`
	`1344`	`+`
`1343`	`1345`	`if (TheInGameUI->isScrolling())`
`1344`	`1346`	`{`
`1345`	`1347`	`// if scrolling, only adjust if we're too close or too far`
`1346`	`1348`	`if (m_scrollAmount.length() < m_scrollAmountCutoff \|\| (m_currentHeightAboveGround < m_minHeightAboveGround) \|\| (TheGlobalData->m_enforceMaxCameraHeight && m_currentHeightAboveGround > m_maxHeightAboveGround))`
`1347`	`1349`	`{`
`1348`		`- Real zoomAdj = (desiredZoom - m_zoom)*TheGlobalData->m_cameraAdjustSpeed;`
`1349`		`- if (fabs(zoomAdj) >= 0.0001) // only do positive`
	`1350`	`+ Real zoomAdj = (desiredZoom - m_zoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();`
	`1351`	`+ if (fabs(zoomAdj) >= 0.0001f) // only do positive`
`1350`	`1352`	`{`
`1351`	`1353`	`m_zoom += zoomAdj;`
`1352`	`1354`	`recalcCamera = true;`
`1353`	`1355`	`}`
`1354`	`1356`	`}`
`1355`	`1357`	`}`
`1356`		`- else`
	`1358`	`+ else if (!didScriptedMovement)`
`1357`	`1359`	`{`
`1358`	`1360`	`// we're not scrolling; settle toward desired height above ground`
`1359`		`- Real zoomAdj = (m_zoom - desiredZoom)*TheGlobalData->m_cameraAdjustSpeed;`
`1360`		`- Real zoomAdjAbs = fabs(zoomAdj);`
`1361`		`- if (zoomAdjAbs >= 0.0001 && !didScriptedMovement)`
	`1361`	`+ Real zoomAdj = (m_zoom - desiredZoom) * TheGlobalData->m_cameraAdjustSpeed * TheGameEngine->getActualLogicTimeScaleOverFpsRatio();`
	`1362`	`+ if (fabs(zoomAdj) >= 0.0001f)`
`1362`	`1363`	`{`
`1363`		`- //DEBUG_LOG(("W3DView::update() - m_zoom=%g, desiredHeight=%g", m_zoom, desiredZoom));`
`1364`	`1364`	`m_zoom -= zoomAdj;`
`1365`	`1365`	`recalcCamera = true;`
`1366`	`1366`	`}`