New impl

Author: xezon

Core/GameEngine/Include/Common/FramePacer.h

@@ -48,6 +48,7 @@ class FramePacer
 
 	Real getUpdateTime() const; ///< Get the last update delta time in seconds.
 	Real getUpdateFps() const; ///< Get the last update fps.
+	Real getBaseOverUpdateFpsRatio(Real minUpdateFps = 5.0f); ///< Get the last engine base over update fps ratio. Used to scale user inputs to a frame rate independent speed.
 
 	void setTimeFrozen(Bool frozen); ///< Set time frozen. Allows scripted camera movement.
 	void setGameHalted(Bool halted); ///< Set game halted. Does not allow scripted camera movement.

Core/GameEngine/Source/Common/FramePacer.cpp

@@ -118,6 +118,13 @@ Real FramePacer::getUpdateFps()  const
 	return 1.0f / m_updateTime;
 }
 
+Real FramePacer::getBaseOverUpdateFpsRatio(Real minUpdateFps)
+{
+	// Update fps is floored to default 5 fps, 200 ms.
+	// Useful to prevent insane ratios on frame spikes/stalls.
+	return (Real)BaseFps / std::max(getUpdateFps(), minUpdateFps);
+}
+
 void FramePacer::setTimeFrozen(Bool frozen)
 {
 	m_isTimeFrozen = frozen;

GeneralsMD/Code/GameEngine/Source/GameClient/InGameUI.cpp

@@ -1945,7 +1945,7 @@ void InGameUI::update( void )
 	if (m_cameraRotatingLeft || m_cameraRotatingRight || m_cameraZoomingIn || m_cameraZoomingOut)
 	{
 		// TheSuperHackers @tweak The camera rotation and zoom are now decoupled from the render update.
-		const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();
+		const Real fpsRatio = TheFramePacer->getBaseOverUpdateFpsRatio();
 		const Real rotateAngle = TheGlobalData->m_keyboardCameraRotateSpeed * fpsRatio;
 		const Real zoomHeight = (Real)View::ZoomHeightPerSecond * fpsRatio;
 

GeneralsMD/Code/GameEngine/Source/GameClient/MessageStream/LookAtXlat.cpp

@@ -28,6 +28,7 @@
 
 #include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
 
+#include "Common/FramePacer.h"
 #include "Common/GameType.h"
 #include "Common/GameEngine.h"
 #include "Common/MessageStream.h"
@@ -439,7 +440,7 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 			{
 
 				// TheSuperHackers @bugfix Mauller 07/06/2025 The camera scrolling is now decoupled from the render update.
-				const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();
+				const Real fpsRatio = TheFramePacer->getBaseOverUpdateFpsRatio();
 
 				switch (m_scrollType)
 				{

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DView.cpp

@@ -1356,7 +1356,7 @@ 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))
 			{
-				const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();
+				const Real fpsRatio = TheFramePacer->getBaseOverUpdateFpsRatio();
 				const Real zoomAdj = (desiredZoom - m_zoom) * TheGlobalData->m_cameraAdjustSpeed * fpsRatio;
 				if (fabs(zoomAdj) >= 0.0001f)	// only do positive
 				{
@@ -1368,7 +1368,7 @@ void W3DView::update(void)
 		else if (!didScriptedMovement)
 		{
 			// we're not scrolling; settle toward desired height above ground
-			const Real fpsRatio = (Real)BaseFps / TheGameEngine->getUpdateFps();
+			const Real fpsRatio = TheFramePacer->getBaseOverUpdateFpsRatio();
 			const Real zoomAdj = (m_zoom - desiredZoom) * TheGlobalData->m_cameraAdjustSpeed * fpsRatio;
 			if (fabs(zoomAdj) >= 0.0001f)
 			{