diff options
| author | cmf028 <cmf1292@hotmail.com> | 2013-12-01 21:19:26 -0600 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2014-06-17 17:43:37 +0100 |
| commit | e16578155885685774c09e64f31e2b1466cebcf8 (patch) | |
| tree | cb45e55b3d9c1f95b78b48846b2f437164afb280 | |
| parent | 57fa04dc9be750ec4a3e32c991f93734accaa32c (diff) | |
Fix glsl DEFORM_BULGE calculation
| -rw-r--r-- | src/renderergl2/glsl/dlight_vp.glsl | 2 | ||||
| -rw-r--r-- | src/renderergl2/glsl/fogpass_vp.glsl | 2 | ||||
| -rw-r--r-- | src/renderergl2/glsl/generic_vp.glsl | 2 | ||||
| -rw-r--r-- | src/renderergl2/glsl/shadowfill_vp.glsl | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/renderergl2/glsl/dlight_vp.glsl b/src/renderergl2/glsl/dlight_vp.glsl index d9fd71d0..61531ad6 100644 --- a/src/renderergl2/glsl/dlight_vp.glsl +++ b/src/renderergl2/glsl/dlight_vp.glsl @@ -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) { diff --git a/src/renderergl2/glsl/fogpass_vp.glsl b/src/renderergl2/glsl/fogpass_vp.glsl index ce0e015b..a07a5fdd 100644 --- a/src/renderergl2/glsl/fogpass_vp.glsl +++ b/src/renderergl2/glsl/fogpass_vp.glsl @@ -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) { diff --git a/src/renderergl2/glsl/generic_vp.glsl b/src/renderergl2/glsl/generic_vp.glsl index baae6046..b8cfff07 100644 --- a/src/renderergl2/glsl/generic_vp.glsl +++ b/src/renderergl2/glsl/generic_vp.glsl @@ -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) { diff --git a/src/renderergl2/glsl/shadowfill_vp.glsl b/src/renderergl2/glsl/shadowfill_vp.glsl index 10802eca..af5a14ff 100644 --- a/src/renderergl2/glsl/shadowfill_vp.glsl +++ b/src/renderergl2/glsl/shadowfill_vp.glsl @@ -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) { |