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/linearGradient.vert.glsl | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'assets/shaders/linearGradient.vert.glsl')

diff --git a/assets/shaders/linearGradient.vert.glsl b/assets/shaders/linearGradient.vert.glsl
index 165c2646..fcdc5e96 100755
--- a/assets/shaders/linearGradient.vert.glsl
+++ b/assets/shaders/linearGradient.vert.glsl
@@ -51,25 +51,25 @@ uniform mat4 u_normalMatrix;
 uniform mat4 u_projMatrix;
 uniform mat4 u_worldMatrix;
 
-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 4
+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 4
 uniform mat3 u_texTransform;
 
-varying		vec2 v_uv;
+varying     vec2 v_uv;
 
 
 void main(void)
 {
-	gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ;
-	//v_uv = texcoord;
-	vec3 tmp = u_texTransform * vec3( texcoord, 1.0);
-	v_uv = tmp.xy;
+    gl_Position = u_projMatrix * u_mvMatrix * vec4(vert,1.0) ;
+    //v_uv = texcoord;
+    vec3 tmp = u_texTransform * vec3( texcoord, 1.0);
+    v_uv = tmp.xy;
 }
-- 
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/linearGradient.vert.glsl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'assets/shaders/linearGradient.vert.glsl')

diff --git a/assets/shaders/linearGradient.vert.glsl b/assets/shaders/linearGradient.vert.glsl
index fcdc5e96..12b36c0f 100755
--- a/assets/shaders/linearGradient.vert.glsl
+++ b/assets/shaders/linearGradient.vert.glsl
@@ -51,14 +51,14 @@ uniform mat4 u_normalMatrix;
 uniform mat4 u_projMatrix;
 uniform mat4 u_worldMatrix;
 
-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 4
 uniform mat3 u_texTransform;
-- 
cgit v1.2.3