master #36

Merged
sin365 merged 4 commits from Alienjack/AxibugEmuOnline:master into master 2024-09-13 18:05:32 +08:00
Showing only changes of commit fea833734d - Show all commits

View File

@ -138,10 +138,8 @@
float waveCol2 = waveColor(uv, waveHeight2, maxHeight2, frequency2, power2);
float3 col = bg;
if (uv.y < waveHeight1)
col = waveCol1 * col;
if (uv.y < waveHeight2)
col = waveCol2 * col;
col = lerp(col, waveCol1 * col, step(uv.y, waveHeight1));
col = lerp(col, waveCol2 * col, step(uv.y, waveHeight2));
// Output to screen
fixed4 fragColor = float4(col,1.0);