Skip to content

Conversation

@xezon
Copy link

@xezon xezon commented Sep 29, 2025

This change decouple the wave movement time step from the render update.

TODO

  • Replicate in Generals

@xezon xezon added Enhancement Is new feature or request Minor Severity: Minor < Major < Critical < Blocker Gen Relates to Generals ZH Relates to Zero Hour Rendering Is Rendering related labels Sep 29, 2025
@xezon xezon added this to the Decouple logic and rendering milestone Sep 29, 2025
Copy link

@Skyaero42 Skyaero42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good

@xezon xezon force-pushed the xezon/rendering-5-wave-update branch from 75349c8 to b40bf2b Compare September 30, 2025 17:54
@xezon
Copy link
Author

xezon commented Sep 30, 2025

Replicated in Generals with conflict

D:\Projects\TheSuperHackers\GeneralsGameCode>FOR /F "delims=" %b IN ('git merge-base --fork-point main') DO git diff %b  1>changes.patch

D:\Projects\TheSuperHackers\GeneralsGameCode>git diff 358f6606bfaa355ff947bb9c66465cd10d16a211  1>changes.patch

D:\Projects\TheSuperHackers\GeneralsGameCode>git apply -p2 --directory=Generals --reject --whitespace=fix changes.patch
Checking patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp...
error: while searching for:
#include "GameClient/InGameUI.h"
#include "GameClient/Water.h"
#include "GameLogic/TerrainLogic.h"
#include "Common/GlobalData.h"
#include "Common/UnicodeString.h"
#include "Common/file.h"

error: patch failed: Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp:50
Hunk #2 succeeded at 59 (offset -4 lines).
Hunk #3 succeeded at 276 (offset -4 lines).
Hunk #4 succeeded at 291 (offset -4 lines).
Applying patch Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWaterTracks.cpp with 1 reject...
Rejected hunk #1.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.

@xezon xezon merged commit 3ae6b3a into TheSuperHackers:main Sep 30, 2025
18 checks passed
@xezon xezon deleted the xezon/rendering-5-wave-update branch September 30, 2025 18:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Enhancement Is new feature or request Gen Relates to Generals Minor Severity: Minor < Major < Critical < Blocker Rendering Is Rendering related ZH Relates to Zero Hour

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants