From e01b66aef5ac89052ef4766010bc265d20637760 Mon Sep 17 00:00:00 2001 From: cmf028 Date: Sun, 1 Dec 2013 21:19:26 -0600 Subject: [PATCH] Fix glsl DEFORM_BULGE calculation --- code/renderergl2/glsl/dlight_vp.glsl | 2 +- code/renderergl2/glsl/fogpass_vp.glsl | 2 +- code/renderergl2/glsl/generic_vp.glsl | 2 +- code/renderergl2/glsl/shadowfill_vp.glsl | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/renderergl2/glsl/dlight_vp.glsl b/code/renderergl2/glsl/dlight_vp.glsl index d9fd71d0..61531ad6 100644 --- a/code/renderergl2/glsl/dlight_vp.glsl +++ b/code/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/code/renderergl2/glsl/fogpass_vp.glsl b/code/renderergl2/glsl/fogpass_vp.glsl index 40d14d9f..354a6468 100644 --- a/code/renderergl2/glsl/fogpass_vp.glsl +++ b/code/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/code/renderergl2/glsl/generic_vp.glsl b/code/renderergl2/glsl/generic_vp.glsl index 9ad4489b..ef648ade 100644 --- a/code/renderergl2/glsl/generic_vp.glsl +++ b/code/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/code/renderergl2/glsl/shadowfill_vp.glsl b/code/renderergl2/glsl/shadowfill_vp.glsl index 10802eca..af5a14ff 100644 --- a/code/renderergl2/glsl/shadowfill_vp.glsl +++ b/code/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) {