From 648ee61ae84216d0236e0dbc211addc13b2cfa3a Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 11:52:06 -0700 Subject: Expand tabs --- assets/shaders/radialGradient.frag.glsl | 70 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'assets/shaders/radialGradient.frag.glsl') diff --git a/assets/shaders/radialGradient.frag.glsl b/assets/shaders/radialGradient.frag.glsl index 1544e457..b78e38bb 100644 --- a/assets/shaders/radialGradient.frag.glsl +++ b/assets/shaders/radialGradient.frag.glsl @@ -32,44 +32,44 @@ POSSIBILITY OF SUCH DAMAGE. precision highp float; #endif -uniform vec4 u_color1; -uniform vec4 u_color2; -uniform vec4 u_color3; -uniform vec4 u_color4; -uniform float u_colorStop1; -uniform float u_colorStop2; -uniform float u_colorStop3; -uniform float u_colorStop4; -uniform vec2 u_cos_sin_angle; -//uniform int u_colorCount; // currently using all 4 - -varying vec2 v_uv; +uniform vec4 u_color1; +uniform vec4 u_color2; +uniform vec4 u_color3; +uniform vec4 u_color4; +uniform float u_colorStop1; +uniform float u_colorStop2; +uniform float u_colorStop3; +uniform float u_colorStop4; +uniform vec2 u_cos_sin_angle; +//uniform int u_colorCount; // currently using all 4 + +varying vec2 v_uv; void main(void) { - vec2 pt = vec2( v_uv.x - 0.5, v_uv.y - 0.5); - float t = sqrt( dot(pt, pt) ); + vec2 pt = vec2( v_uv.x - 0.5, v_uv.y - 0.5); + float t = sqrt( dot(pt, pt) ); - vec4 color; - if (t < u_colorStop1) - color = u_color1; - else if (t < u_colorStop2) - { - float tLocal = (t - u_colorStop1)/(u_colorStop2 - u_colorStop1); - color = mix(u_color1,u_color2,tLocal); - } - else if (t < u_colorStop3) - { - float tLocal = (t - u_colorStop2)/(u_colorStop3 - u_colorStop2); - color = mix(u_color2,u_color3,tLocal); - } - else if (t < u_colorStop4) - { - float tLocal = (t - u_colorStop3)/(u_colorStop4 - u_colorStop3); - color = mix(u_color3,u_color4,tLocal); - } - else - color = u_color4; + vec4 color; + if (t < u_colorStop1) + color = u_color1; + else if (t < u_colorStop2) + { + float tLocal = (t - u_colorStop1)/(u_colorStop2 - u_colorStop1); + color = mix(u_color1,u_color2,tLocal); + } + else if (t < u_colorStop3) + { + float tLocal = (t - u_colorStop2)/(u_colorStop3 - u_colorStop2); + color = mix(u_color2,u_color3,tLocal); + } + else if (t < u_colorStop4) + { + float tLocal = (t - u_colorStop3)/(u_colorStop4 - u_colorStop3); + color = mix(u_color3,u_color4,tLocal); + } + else + color = u_color4; - gl_FragColor = color; + gl_FragColor = color; } -- cgit v1.2.3 From 6803c0abd279fcb640c38b3881b751bab982cbe0 Mon Sep 17 00:00:00 2001 From: Kris Kowal Date: Fri, 6 Jul 2012 12:42:16 -0700 Subject: Remove trailing spaces --- assets/shaders/radialGradient.frag.glsl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'assets/shaders/radialGradient.frag.glsl') diff --git a/assets/shaders/radialGradient.frag.glsl b/assets/shaders/radialGradient.frag.glsl index b78e38bb..58b43a74 100644 --- a/assets/shaders/radialGradient.frag.glsl +++ b/assets/shaders/radialGradient.frag.glsl @@ -32,17 +32,17 @@ POSSIBILITY OF SUCH DAMAGE. precision highp float; #endif -uniform vec4 u_color1; -uniform vec4 u_color2; -uniform vec4 u_color3; -uniform vec4 u_color4; -uniform float u_colorStop1; -uniform float u_colorStop2; -uniform float u_colorStop3; -uniform float u_colorStop4; +uniform vec4 u_color1; +uniform vec4 u_color2; +uniform vec4 u_color3; +uniform vec4 u_color4; +uniform float u_colorStop1; +uniform float u_colorStop2; +uniform float u_colorStop3; +uniform float u_colorStop4; uniform vec2 u_cos_sin_angle; //uniform int u_colorCount; // currently using all 4 - + varying vec2 v_uv; void main(void) -- cgit v1.2.3