zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Use g_sin for the SoftPoly warp effects as Graf suggested. (#1061)

This commit is contained in:
dondiego 2020-03-31 16:25:46 +02:00 committed by GitHub
parent cfafe65069
commit cc0594df2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rendering/polyrenderer/drawers/screen_scanline_setup.cpp
View File

@ -421,8 +421,8 @@ static void WriteVaryingWarp1(float posU, float posV, float stepU, float stepV,
float u = posU * w[x]; float u = posU * w[x];
float v = posV * w[x]; float v = posV * w[x];
v += sin(pi2 * (u + timer)) * 0.1f; v += g_sin(pi2 * (u + timer)) * 0.1f;
u += sin(pi2 * (v + timer)) * 0.1f; u += g_sin(pi2 * (v + timer)) * 0.1f;
u = u - std::floor(u); u = u - std::floor(u);
v = v - std::floor(v); v = v - std::floor(v);
@ -448,8 +448,8 @@ static void WriteVaryingWarp2(float posU, float posV, float stepU, float stepV,
float u = posU * w[x]; float u = posU * w[x];
float v = posV * w[x]; float v = posV * w[x];
v += (0.5f + sin(pi2 * (v + timer * 0.61f + 900.f/8192.f)) + sin(pi2 * (u * 2.0f + timer * 0.36f + 300.0f/8192.0f))) * 0.025f; v += (0.5f + g_sin(pi2 * (v + timer * 0.61f + 900.f/8192.f)) + g_sin(pi2 * (u * 2.0f + timer * 0.36f + 300.0f/8192.0f))) * 0.025f;
u += (0.5f + sin(pi2 * (v + timer * 0.49f + 700.f/8192.f)) + sin(pi2 * (u * 2.0f + timer * 0.49f + 1200.0f/8192.0f))) * 0.025f; u += (0.5f + g_sin(pi2 * (v + timer * 0.49f + 700.f/8192.f)) + g_sin(pi2 * (u * 2.0f + timer * 0.49f + 1200.0f/8192.0f))) * 0.025f;
u = u - std::floor(u); u = u - std::floor(u);
v = v - std::floor(v); v = v - std::floor(v);