okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21 from cmf028/master

Browse source 
Fix glsl DEFORM_BULGE calculation
This commit is contained in:
James Canete 2013-12-01 19:33:51 -08:00
commit c02528cf1d
4 changed files with 4 additions and 4 deletions
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) if (u_DeformGen == DGEN_BULGE)
{ {
phase *= M_PI * 0.25 * st.x; phase *= st.x;
} }
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH) 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) if (u_DeformGen == DGEN_BULGE)
{ {
phase *= M_PI * 0.25 * st.x; phase *= st.x;
} }
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH) 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) if (u_DeformGen == DGEN_BULGE)
{ {
phase *= M_PI * 0.25 * st.x; phase *= st.x;
} }
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH) 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) if (u_DeformGen == DGEN_BULGE)
{ {
phase *= M_PI * 0.25 * st.x; phase *= st.x;
} }
else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH) else // if (u_DeformGen <= DGEN_WAVE_INVERSE_SAWTOOTH)
{ {