[GEN][ZH] Decouple tree, water and wave movements from client FPS (#1227)

Author: Mauller

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp

@@ -1199,24 +1199,22 @@ void WaterRenderObjClass::update( void )
 	if( TheGameLogic )
 		currLogicFrame = TheGameLogic->getFrame();
 
-	m_riverVOrigin += 0.002f;
-	m_riverXOffset += (Real)(0.0125*33/5000);
-	m_riverYOffset += (Real)(2*0.0125*33/5000);
-	if (m_riverXOffset > 1) m_riverXOffset -= 1;
-	if (m_riverYOffset > 1) m_riverYOffset -= 1;
-	if (m_riverXOffset < -1) m_riverXOffset += 1;
-	if (m_riverYOffset < -1) m_riverYOffset += 1;
- 	m_iBumpFrame++;
-	if (m_iBumpFrame >= NUM_BUMP_FRAMES) {
-		m_iBumpFrame = 0;
-	}
-
-
-
-	// we only process some things if the logic frame has changed
+	// we only process things if the logic frame has changed
 	if( lastLogicFrame != currLogicFrame )
 	{
 
+		m_riverVOrigin += 0.002f;
+		m_riverXOffset += (Real)(0.0125*33/5000);
+		m_riverYOffset += (Real)(2*0.0125*33/5000);
+		if (m_riverXOffset > 1) m_riverXOffset -= 1;
+		if (m_riverYOffset > 1) m_riverYOffset -= 1;
+		if (m_riverXOffset < -1) m_riverXOffset += 1;
+		if (m_riverYOffset < -1) m_riverYOffset += 1;
+ 		m_iBumpFrame++;
+		if (m_iBumpFrame >= NUM_BUMP_FRAMES) {
+			m_iBumpFrame = 0;
+		}
+
 		// for vertex animated water we need to update the vector field
 		if( m_doWaterGrid && m_meshInMotion == TRUE )
 		{

Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp

@@ -832,9 +832,6 @@ void WaterTracksRenderSystem::update()
 	Int timeDiff = timeGetTime()-iLastTime;
 	iLastTime += timeDiff;
 
-	//Lock framerate to 30 fps
-	timeDiff = 1.0f/30.0f*1000.0f;
-
 	//first update all the tracks
 	while( mod )
 	{

GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h

@@ -254,6 +254,7 @@ class W3DTreeTextureClass : public TextureClass
 	Real		m_curSwayOffset[MAX_SWAY_TYPES];
 	Real		m_curSwayStep[MAX_SWAY_TYPES];
 	Real		m_curSwayFactor[MAX_SWAY_TYPES];
+	Int			m_lastLogicFrame;
 
 	W3DProjectedShadow *m_shadow;
 

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

@@ -1286,6 +1286,8 @@ void W3DTreeBuffer::clearAllTrees(void)
 		m_areaPartition[i] = END_OF_PARTITION;
 	}
 	m_numTreeTypes = 0;
+
+	m_lastLogicFrame = 0;
 }
 
 //=============================================================================
@@ -1551,6 +1553,16 @@ void W3DTreeBuffer::drawTrees(CameraClass * camera, RefRenderObjListIterator *pD
 	if (TheGameLogic && TheGameLogic->isGamePaused()) {
 		pause = true;
 	}
+
+	// TheSuperHackers @bugfix Mauller 04/07/2025 decouple the tree sway position updates from the client fps
+	if (TheGameLogic) {
+		UnsignedInt currentFrame = TheGameLogic->getFrame();
+		if (m_lastLogicFrame == currentFrame) {
+			pause = true;
+		}
+		m_lastLogicFrame = currentFrame;
+	}
+
 	Int i;
 	if (!pause) {
 		if (info.m_breezeVersion != m_curSwayVersion) 

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp

@@ -1222,24 +1222,22 @@ void WaterRenderObjClass::update( void )
 	if( TheGameLogic )
 		currLogicFrame = TheGameLogic->getFrame();
 
-	m_riverVOrigin += 0.002f;
-	m_riverXOffset += (Real)(0.0125*33/5000);
-	m_riverYOffset += (Real)(2*0.0125*33/5000);
-	if (m_riverXOffset > 1) m_riverXOffset -= 1;
-	if (m_riverYOffset > 1) m_riverYOffset -= 1;
-	if (m_riverXOffset < -1) m_riverXOffset += 1;
-	if (m_riverYOffset < -1) m_riverYOffset += 1;
- 	m_iBumpFrame++;
-	if (m_iBumpFrame >= NUM_BUMP_FRAMES) {
-		m_iBumpFrame = 0;
-	}
-
-
-
-	// we only process some things if the logic frame has changed
+	// we only process things if the logic frame has changed
 	if( lastLogicFrame != currLogicFrame )
 	{
 
+		m_riverVOrigin += 0.002f;
+		m_riverXOffset += (Real)(0.0125*33/5000);
+		m_riverYOffset += (Real)(2*0.0125*33/5000);
+		if (m_riverXOffset > 1) m_riverXOffset -= 1;
+		if (m_riverYOffset > 1) m_riverYOffset -= 1;
+		if (m_riverXOffset < -1) m_riverXOffset += 1;
+		if (m_riverYOffset < -1) m_riverYOffset += 1;
+ 		m_iBumpFrame++;
+		if (m_iBumpFrame >= NUM_BUMP_FRAMES) {
+			m_iBumpFrame = 0;
+		}
+
 		// for vertex animated water we need to update the vector field
 		if( m_doWaterGrid && m_meshInMotion == TRUE )
 		{

GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp

@@ -835,9 +835,6 @@ void WaterTracksRenderSystem::update()
 	Int timeDiff = timeGetTime()-iLastTime;
 	iLastTime += timeDiff;
 
-	//Lock framerate to 30 fps
-	timeDiff = 1.0f/30.0f*1000.0f;
-
 	//first update all the tracks
 	while( mod )
 	{