bugfix(fps): Decouple camera zoom and rotation time step from render update

Author: xezon

GeneralsMD/Code/GameEngine/Include/GameClient/View.h

@@ -184,8 +184,7 @@ class View : public Snapshot
 	virtual void setZoom(Real z) { }
 	virtual Real getHeightAboveGround() { return m_heightAboveGround; }
 	virtual void setHeightAboveGround(Real z) { m_heightAboveGround = z; }
-	virtual void zoomIn( void );																				///< Zoom in, closer to the ground, limit to min
-	virtual void zoomOut( void );																				///< Zoom out, farther away from the ground, limit to max
+	virtual void zoom( Real height ); ///< Zoom in/out, closer to the ground, limit to min, or farther away from the ground, limit to max
 	virtual void setZoomToDefault( void ) { }														///< Set zoom to default value
 	virtual Real getMaxZoom( void ) { return m_maxZoom; }								///< return max zoom value
 	virtual void setOkToAdjustHeight( Bool val ) { m_okToAdjustHeight = val; }	///< Set this to adjust camera height

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

@@ -1883,26 +1883,30 @@ void InGameUI::update( void )
 		layout->runUpdate();
 	}
 
-	//Handle keyboard camera rotations
-	if( m_cameraRotatingLeft && !m_cameraRotatingRight )
+	if (m_cameraRotatingLeft || m_cameraRotatingRight || m_cameraZoomingIn || m_cameraZoomingOut)
 	{
-		//Keyboard rotate left
-		TheTacticalView->setAngle( TheTacticalView->getAngle() - TheGlobalData->m_keyboardCameraRotateSpeed );
-	}
-	if( m_cameraRotatingRight && !m_cameraRotatingLeft )
-	{
-		//Keyboard rotate right
-		TheTacticalView->setAngle( TheTacticalView->getAngle() + TheGlobalData->m_keyboardCameraRotateSpeed );
-	}
-	if( m_cameraZoomingIn && !m_cameraZoomingOut )
-	{
-		//Keyboard zoom in
-		TheTacticalView->zoomIn();
-	}
-	if( m_cameraZoomingOut && !m_cameraZoomingIn )
-	{
-		//Keyboard zoom out
-		TheTacticalView->zoomOut();
+		// TheSuperHackers @tweak Decouples camera rotation and zoom from draw (aka render update)
+		const Real logicTimeScaleOverFpsRatio = TheGameEngine->getActualLogicTimeScaleOverFpsRatio();
+		const Real rotateAngle = TheGlobalData->m_keyboardCameraRotateSpeed * logicTimeScaleOverFpsRatio;
+		const Real zoomHeight = 10.0f * logicTimeScaleOverFpsRatio;
+
+		if( m_cameraRotatingLeft && !m_cameraRotatingRight )
+		{
+			TheTacticalView->setAngle( TheTacticalView->getAngle() - rotateAngle );
+		}
+		else if( m_cameraRotatingRight && !m_cameraRotatingLeft )
+		{
+			TheTacticalView->setAngle( TheTacticalView->getAngle() + rotateAngle );
+		}
+
+		if( m_cameraZoomingIn && !m_cameraZoomingOut )
+		{
+			TheTacticalView->zoom( -zoomHeight );
+		}
+		else if( m_cameraZoomingOut && !m_cameraZoomingIn )
+		{
+			TheTacticalView->zoom( +zoomHeight );
+		}
 	}
 
 

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

@@ -29,6 +29,7 @@
 #include "PreRTS.h"	// This must go first in EVERY cpp file int the GameEngine
 
 #include "Common/GameType.h"
+#include "Common/GameEngine.h"
 #include "Common/MessageStream.h"
 #include "Common/Player.h"
 #include "Common/PlayerList.h"
@@ -366,15 +367,19 @@ GameMessageDisposition LookAtTranslator::translateGameMessage(const GameMessage
 
 			Int spin = msg->getArgument( 1 )->integer;
 
+			// TheSuperHackers @tweak Decouples camera zoom from draw (aka render update)
+			const Real logicTimeScaleOverFpsRatio = TheGameEngine->getActualLogicTimeScaleOverFpsRatio();
+			const Real zoomHeight = 10.0f * logicTimeScaleOverFpsRatio;
+
 			if (spin > 0)
 			{
 				for ( ; spin > 0; spin--)
-					TheTacticalView->zoomIn();
+					TheTacticalView->zoom( -zoomHeight );
 			}
 			else
 			{
 				for ( ;spin < 0; spin++ )
-					TheTacticalView->zoomOut();
+					TheTacticalView->zoom( +zoomHeight );
 			}
 		}
 

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

@@ -125,14 +125,9 @@ View *View::prependViewToList( View *list )
 	return this;
 }
 
-void View::zoomIn( void )
+void View::zoom( Real height )
 {
-	setHeightAboveGround(getHeightAboveGround() - 10.0f);
-}
-
-void View::zoomOut( void )
-{
-	setHeightAboveGround(getHeightAboveGround() + 10.0f);
+	setHeightAboveGround(getHeightAboveGround() + height);
 }
 
 /**