101 files changed, 560 insertions, 561 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_color1;
-uniform vec4    u_color2;                                   
+uniform vec4    u_color2;
-uniform vec4    u_color3;                                   
+uniform vec4    u_color3;
-uniform vec4    u_color4;                                   
+uniform vec4    u_color4;
-uniform float   u_colorStop1;                                   
+uniform float   u_colorStop1;
-uniform float   u_colorStop2;                                   
+uniform float   u_colorStop2;
-uniform float   u_colorStop3;                                   
+uniform float   u_colorStop3;
-uniform float   u_colorStop4;                                   
+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;
    g

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()
43	{	43	{
44	vec4 c = texture2D(u_tex0, v_texCoord0);	44	vec4 c = texture2D(u_tex0, v_texCoord0);
45	gl_FragColor = c;	45	gl_FragColor = c;
46	}	46	}
47		47


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()
70	pos.z = z;	70	pos.z = z;
71		71
72	gl_Position = u_projMatrix * u_mvMatrix * pos;	72	gl_Position = u_projMatrix * u_mvMatrix * pos;
73		73
74	v_texCoord0 = texcoord;	74	v_texCoord0 = texcoord;
75	}	75	}


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()
70	v.z *= u_waveHeight;	70	v.z *= u_waveHeight;
71	v.z -= 2.0*u_waveHeight;	71	v.z -= 2.0*u_waveHeight;
72	v.z = x 0.09;	72	v.z = x 0.09;
73		73
74	gl_Position = u_projMatrix * u_mvMatrix * vec4(v,1.0) ;	74	gl_Position = u_projMatrix * u_mvMatrix * vec4(v,1.0) ;
75	}	75	}


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;
33	#endif	33	#endif
34		34
35		35
36	uniform vec4 u_color1;	36	uniform vec4 u_color1;
37	uniform vec4 u_color2;	37	uniform vec4 u_color2;
38	uniform vec4 u_color3;	38	uniform vec4 u_color3;
39	uniform vec4 u_color4;	39	uniform vec4 u_color4;
40	uniform float u_colorStop1;	40	uniform float u_colorStop1;
41	uniform float u_colorStop2;	41	uniform float u_colorStop2;
42	uniform float u_colorStop3;	42	uniform float u_colorStop3;
43	uniform float u_colorStop4;	43	uniform float u_colorStop4;
44	uniform vec2 u_cos_sin_angle;	44	uniform vec2 u_cos_sin_angle;
45	//uniform int u_colorCount; // currently using 4	45	//uniform int u_colorCount; // currently using 4
46		46
@@ -73,4 +73,4 @@ void main(void)
73	color = u_color4;	73	color = u_color4;
74		74
75	g