11 files changed, 141 insertions, 141 deletions

diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl
index dc984191..1149f11b 100644
--- a/assets/shaders/Cloud.frag.glsl
+++ b/assets/shaders/Cloud.frag.glsl
@@ -43,5 +43,5 @@ void main()
 {
     vec4 c = texture2D(u_tex0, v_texCoord0);
     gl_FragColor = c;
-}    
-  
+}
+
diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl
index c709bc27..a33429fe 100644
--- a/assets/shaders/Cloud.vert.glsl
+++ b/assets/shaders/Cloud.vert.glsl
@@ -70,6 +70,6 @@ void main()
     pos.z = z;
 
     gl_Position = u_projMatrix * u_mvMatrix * pos;
-        
+
     v_texCoord0 = texcoord;
 }
diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl
index 49eaaccb..51ec8f8b 100644
--- a/assets/shaders/Flag.vert.glsl
+++ b/assets/shaders/Flag.vert.glsl
@@ -70,6 +70,6 @@ void main()
     v.z *= u_waveHeight;
     v.z -=  2.0*u_waveHeight;
     v.z *= x * 0.09;
-    
+
     gl_Position = u_projMatrix * u_mvMatrix * vec4(v,1.0) ;
 }
diff --git a/assets/shaders/linearGradient.frag.glsl b/assets/shaders/linearGradient.frag.glsl
index 56a55d86..03310255 100755
--- a/assets/shaders/linearGradient.frag.glsl
+++ b/assets/shaders/linearGradient.frag.glsl
@@ -33,14 +33,14 @@ 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 4
 
@@ -73,4 +73,4 @@ void main(void)
         color = u_color4;
 
     gl_FragColor =color;
-}   
+}
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;
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)
diff --git a/assets/shaders/test_fshader.glsl b/assets/shaders/test_fshader.glsl
index 1fa78e44..de5da773 100755
--- a/assets/shaders/test_fshader.glsl
+++ b/assets/shaders/test_fshader.glsl
@@ -40,7 +40,7 @@ uniform vec4 u_light0Amb;
 // diffuse map
 uniform sampler2D u_colMap;
 
-// environment map  
+// environment map
 uniform sampler2D envMap;
 
 // normal map
@@ -77,7 +77,7 @@ void main()
     float dist = vShadowCoord.w/200.0;
     float d = dot(rgba_depth, bit_shift);
     float shadowCoef = (dist > d + 0.00779) ? (0.6) : (1.0);
-    
+
   vec4 colMapTexel = vec4(0);
   if (u_renderGlow <= 0.5) {
     colMapTexel = vec4(texture2D(u_colMap, vec2(vNormal.w, vECPos.w)).rgb, 1.0);
@@ -89,32 +89,32 @@ void main()
   vec3 normal = normalize(vNormal.xyz);
   vec3 mapNormal = texture2D(u_normalMap, vec2(vNormal.w, vECPos.w)).xyz * 2.0 - 1.0;
   mapNormal = normalize(mapNormal.x*vec3(normal.z, 0.0, -normal.x) + vec3(0.0, mapNormal.y, 0.0) + mapNormal.z*normal);
-  
+
   // create envmap coordinates
   vec3 r = reflect( normalize(vec3(vECPos.xyz - vEyePos.xyz)), mapNormal);
   float m = 2.0 * sqrt( r.x*r.x + r.y*r.y + r.z*r.z );
-  
+
   // calculate environment map texel
   vec4 envMapTexel = vec4(texture2D(envMap, vec2(r.x/m + 0.5, r.y/m + 0.5)).rgb, 0.0);
-  
+
   // lighting
   vec3 lightDirection = u_light0Pos - vECPos.xyz;
   float lightDist = length(lightDirection);
   lightDirection /= lightDist;
-  
+
   float attenuation = clamp(1.0 - lightDist * 0.01, 0.0, 1.0);
-  
+
   vec3 halfVec = normalize(lightDirection + vEyePos);
-  
+
   float diffuseIntensity = max(0.0, dot(mapNormal, lightDirection));
   float specularModifier = max(0.0, dot(mapNormal, halfVec));
-  
+
   float pf;
   if(diffuseIntensity == 0.0)
   pf = 0.0;
   else
   pf = pow(specularModifier, 76.0);
-  
+
   vec4 ambient = u_matAmbient * u_light0Amb;
 
   vec4 diffuse = u_matDiffuse * (colMapTexel + envMapTexel)*shadowCoef;
@@ -122,9 +122,9 @@ void main()
   if (u_renderGlow <= 0.5) {
     diffuse *= u_light0Diff;
   }
-  
+
   vec4 specular = 2.0 * pf * envMapTexel;
-  
+
   //gl_FragColor = vec4(dist, dist, dist, 1.0);
   gl_FragColor = ((colMapTexel*(ambient + diffuse)) + specular);
 }
@@ -141,40 +141,40 @@ void main()
     vec3 normal = normalize(vNormal.xyz);
 //   vec3 mapNormal = texture2D(u_normalMap, vec2(vNormal.w, vECPos.w)).xyz * 2.0 - 1.0;
 //   mapNormal = normalize(mapNormal.x*vec3(normal.z, 0.0, -normal.x) + vec3(0.0, mapNormal.y, 0.0) + mapNormal.z*normal);
-//   
+//
 //   // create envmap coordinates
 //   vec3 r = reflect( (vec3(vECPos.xyz - vEyePos.xyz)), mapNormal);