ioquake
/
ioq3
mirror of https://github.com/ioquake/ioq3.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21 from cmf028/master 

Fix glsl DEFORM_BULGE calculation
This commit is contained in:
James Canete 2013-12-01 19:33:51 -08:00
parent 0a4da32d62 e01b66aef5
commit c02528cf1d
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/renderergl2/glsl/dlight_vp.glsl
View File

@ -32,7 +32,7 @@ vec3 DeformPosition(const vec3 pos, const vec3 normal, const vec2 st)
if (u_DeformGen == DGEN_BULGE)
{
phase *= M_PI * 0.25 * st.x;
phase *= st.x;
}
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH)
{

2
code/renderergl2/glsl/fogpass_vp.glsl
View File

@ -41,7 +41,7 @@ vec3 DeformPosition(const vec3 pos, const vec3 normal, const vec2 st)
if (u_DeformGen == DGEN_BULGE)
{
phase *= M_PI * 0.25 * st.x;
phase *= st.x;
}
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH)
{

2
code/renderergl2/glsl/generic_vp.glsl
View File

@ -73,7 +73,7 @@ vec3 DeformPosition(const vec3 pos, const vec3 normal, const vec2 st)
if (u_DeformGen == DGEN_BULGE)
{
phase *= M_PI * 0.25 * st.x;
phase *= st.x;
}
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH)
{

2
code/renderergl2/glsl/shadowfill_vp.glsl
View File

@ -38,7 +38,7 @@ vec3 DeformPosition(const vec3 pos, const vec3 normal, const vec2 st)
if (u_DeformGen == DGEN_BULGE)
{
phase *= M_PI * 0.25 * st.x;
phase *= st.x;
}
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH)
{