Skip to content

refactor(terrain): Simplify cloud movement clamping #1648

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

refactor(terrain): Simplify cloud movement clamping #1648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42b33d9
refactor(terrain): Simplify cloud movement clamping
xezon Sep 29, 2025
3e6cc79
Simplify that code even more
xezon Sep 30, 2025
87a27cf
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
7 changes: 3 additions & 4 deletions Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1336,10 +1336,9 @@ void TerrainShader2Stage::updateCloud()
m_xOffset += m_xSlidePerSecond * frame_time;
m_yOffset += m_ySlidePerSecond * frame_time;

while (m_xOffset > 1) m_xOffset -= 1;
while (m_yOffset > 1) m_yOffset -= 1;
while (m_xOffset < -1) m_xOffset += 1;
while (m_yOffset < -1) m_yOffset += 1;
// This moves offsets towards zero when smaller -1.0 or larger 1.0
m_xOffset -= (Int)m_xOffset;
m_yOffset -= (Int)m_yOffset;
}

void TerrainShader2Stage::updateNoise1(D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate)
Expand Down
7 changes: 3 additions & 4 deletions GeneralsMD/Code/GameEngineDevice/Source/W3DDevice/GameClient/W3DShaderManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,10 +1601,9 @@ void TerrainShader2Stage::updateCloud()
m_xOffset += m_xSlidePerSecond * frame_time;
m_yOffset += m_ySlidePerSecond * frame_time;

while (m_xOffset > 1) m_xOffset -= 1;
while (m_yOffset > 1) m_yOffset -= 1;
while (m_xOffset < -1) m_xOffset += 1;
while (m_yOffset < -1) m_yOffset += 1;
// This moves offsets towards zero when smaller -1.0 or larger 1.0
m_xOffset -= (Int)m_xOffset;
m_yOffset -= (Int)m_yOffset;
}

void TerrainShader2Stage::updateNoise1(D3DXMATRIX *destMatrix,D3DXMATRIX *curViewInverse, Bool doUpdate)
Expand Down
Loading