Skip to content

bugfix(water): Fix river visuals in black shroud #2749

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

Open
stephanmeesters wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −3
Open

bugfix(water): Fix river visuals in black shroud #2749

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e06378
bugfix(water): Fix river visuals in black shroud
stephanmeesters May 27, 2026
5e88198
Adjust river water shader
stephanmeesters May 27, 2026
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
8 changes: 5 additions & 3 deletions Core/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ static Int getRiverVertexDiffuse(W3DShroud *shroud, Real x, Real y, Real shadeR,
(Int)(shadeR * shroudScale),
(Int)(shadeG * shroudScale),
(Int)(shadeB * shroudScale),
(diffuse >> 24) & 0xff);
((diffuse >> 24) & 0xff) * shroudScale);
}

void doSkyBoxSet(Bool startDraw)
Expand Down Expand Up @@ -926,9 +926,11 @@ void WaterRenderObjClass::ReAcquireResources()
tex t1 \n\
tex t2 \n\
tex t3\n\
mul r0,v0,t0 ; blend vertex color into t0. \n\
mul r0.rgb, v0, t0 ; blend vertex color into t0. \n\
mov r0.a, t0 ; keep vertex alpha from fading the base water. \n\
mul r1, t1, t2 ; mul\n\
add r0.rgb, r0, t3\n\
add r1.rgb, r1, t3\n\
mul r1.rgb, r1, v0.a\n\
+mul r0.a, r0, t3\n\
add r0.rgb, r0, r1\n";
hr = D3DXAssembleShader( shader, strlen(shader), 0, nullptr, &compiledShader, nullptr);
Expand Down
Loading