Skip to content

tweak(water): Decouple wave movement time step from render update #1654

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

tweak(water): Decouple wave movement time step from render update #1654

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
fa72919
tweak(water): Decouple wave movement time step from render update
xezon Sep 28, 2025
b40bf2b
Replicate in Generals
xezon Sep 30, 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
18 changes: 4 additions & 14 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
#include "W3DDevice/GameClient/W3DWaterTracks.h"
#include "GameClient/InGameUI.h"
#include "GameLogic/TerrainLogic.h"
#include "Common/GameEngine.h"
#include "Common/GlobalData.h"
#include "Common/UnicodeString.h"
#include "Common/file.h"
Expand All @@ -59,8 +60,6 @@
#include "assetmgr.h"
#include "WW3D2/dx8wrapper.h"

//#define ALLOW_WATER_TRACK_EDIT

//number of vertex pages allocated - allows double buffering of vertex updates.
//while one is being rendered, another is being updated. Improves HW parallelism.
#define WATER_VB_PAGES 1000
Expand Down Expand Up @@ -278,18 +277,6 @@ void WaterTracksObj::init( Real width, const Vector2 &start, const Vector2 &end,
//=============================================================================
Int WaterTracksObj::update(Int msElapsed)
{
#ifdef ALLOW_WATER_TRACK_EDIT
// if (pauseWaves)
// m_elapsedMs = m_timeToReachBeach+m_timeToStop;
// else
#endif

//nothing to do here...most of the work is done on render.
m_elapsedMs += msElapsed; //advance time for this update

///@todo: Should check in here if we are done with this object are return FALSE to free it.
// return FALSE;

return TRUE; //assume we had an update
}

Expand All @@ -305,6 +292,9 @@ Int WaterTracksObj::update(Int msElapsed)

Int WaterTracksObj::render(DX8VertexBufferClass *vertexBuffer, Int batchStart)
{
// TheSuperHackers @tweak The wave movement time step is now decoupled from the render update.
m_elapsedMs += TheGameEngine->getLogicTimeStepMilliseconds();

VertexFormatXYZDUV1 *vb;
Vector2 waveTailOrigin,waveFrontOrigin;
Real ooWaveDirLen=1.0f/m_waveDir.Length(); //one over length
Expand Down
18 changes: 4 additions & 14 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
#include "GameClient/InGameUI.h"
#include "GameClient/Water.h"
#include "GameLogic/TerrainLogic.h"
#include "Common/GameEngine.h"
#include "Common/GlobalData.h"
#include "Common/UnicodeString.h"
#include "Common/file.h"
Expand All @@ -62,8 +63,6 @@
#include "assetmgr.h"
#include "WW3D2/dx8wrapper.h"

//#define ALLOW_WATER_TRACK_EDIT

//number of vertex pages allocated - allows double buffering of vertex updates.
//while one is being rendered, another is being updated. Improves HW parallelism.
#define WATER_VB_PAGES 1000
Expand Down Expand Up @@ -281,18 +280,6 @@ void WaterTracksObj::init( Real width, const Vector2 &start, const Vector2 &end,
//=============================================================================
Int WaterTracksObj::update(Int msElapsed)
{
#ifdef ALLOW_WATER_TRACK_EDIT
// if (pauseWaves)
// m_elapsedMs = m_timeToReachBeach+m_timeToStop;
// else
#endif

//nothing to do here...most of the work is done on render.
m_elapsedMs += msElapsed; //advance time for this update

///@todo: Should check in here if we are done with this object are return FALSE to free it.
// return FALSE;

return TRUE; //assume we had an update
}

Expand All @@ -308,6 +295,9 @@ Int WaterTracksObj::update(Int msElapsed)

Int WaterTracksObj::render(DX8VertexBufferClass *vertexBuffer, Int batchStart)
{
// TheSuperHackers @tweak The wave movement time step is now decoupled from the render update.
m_elapsedMs += TheGameEngine->getLogicTimeStepMilliseconds();

VertexFormatXYZDUV1 *vb;
Vector2 waveTailOrigin,waveFrontOrigin;
Real ooWaveDirLen=1.0f/m_waveDir.Length(); //one over length
Expand Down
Loading