sydney/q3-sydney-qvm
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #21 from cmf028/master

Browse Source 
Fix glsl DEFORM_BULGE calculation
This commit is contained in:
James Canete committed 2013-12-01 19:33:51 -08:00
2 parents 0a4da32d62 e01b66aef5
commit c02528cf1d
4 files changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/renderergl2/glsl/dlight_vp.glsl
+1 -1
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)
{ {
code/renderergl2/glsl/fogpass_vp.glsl
+1 -1
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)
{ {
code/renderergl2/glsl/generic_vp.glsl
+1 -1
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)
{ {
code/renderergl2/glsl/shadowfill_vp.glsl
+1 -1
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)
{ {