10 files changed, 154 insertions, 18 deletions

diff --git a/assets/images/CL13.png b/assets/images/CL13.png
new file mode 100644
index 00000000..236eb3f8
--- /dev/null
+++ b/assets/images/CL13.png
diff --git a/assets/images/cloud10.png b/assets/images/cloud10.png
new file mode 100644
index 00000000..2d87a4de
--- /dev/null
+++ b/assets/images/cloud10.png
diff --git a/assets/images/us_flag.png b/assets/images/us_flag.png
new file mode 100644
index 00000000..1545edc2
--- /dev/null
+++ b/assets/images/us_flag.png
diff --git a/assets/shaders/Basic.vert.glsl b/assets/shaders/Basic.vert.glsl
index 0d5b8d63..f96f8322 100755
--- a/assets/shaders/Basic.vert.glsl
+++ b/assets/shaders/Basic.vert.glsl
@@ -14,6 +14,8 @@ precision highp float;
 attribute vec3 a_pos;
 attribute vec2 texcoord;
 
+// varying
+varying vec2    v_texCoord0;
 
 // matrix uniforms
 uniform mat4 u_mvMatrix;
@@ -22,5 +24,6 @@ uniform mat4 u_worldMatrix;
 
 void main(void)
 {
+        v_texCoord0 = texcoord;
         gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;
 }
\ No newline at end of file
diff --git a/assets/shaders/BasicTex.frag.glsl b/assets/shaders/BasicTex.frag.glsl
new file mode 100644
index 00000000..a716e77d
--- /dev/null
+++ b/assets/shaders/BasicTex.frag.glsl
@@ -0,0 +1,19 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+uniform sampler2D u_tex0;
+
+varying vec2    v_texCoord0;
+
+
+void main() {
+   gl_FragColor = texture2D(u_tex0, v_texCoord0);
+}
diff --git a/assets/shaders/Cloud.frag.glsl b/assets/shaders/Cloud.frag.glsl
new file mode 100644
index 00000000..2447fd79
--- /dev/null
+++ b/assets/shaders/Cloud.frag.glsl
@@ -0,0 +1,25 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+uniform sampler2D u_tex0;
+uniform float u_surfaceAlpha;
+
+varying vec2    v_texCoord0;
+
+
+void main()
+{
+        vec4 c = texture2D(u_tex0, v_texCoord0);
+        //c.a *= u_surfaceAlpha;
+        //if ((c.r == 0.0) && (c.b == 0.0) && (c.g == 0.0) && (c.a == 1.0))  c = vec4( 0.0, 0.0, 1.0, 1.0 );
+        gl_FragColor = c;
+}    
+  
\ No newline at end of file
diff --git a/assets/shaders/Cloud.vert.glsl b/assets/shaders/Cloud.vert.glsl
new file mode 100644
index 00000000..acd581fc
--- /dev/null
+++ b/assets/shaders/Cloud.vert.glsl
@@ -0,0 +1,51 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+// attributes
+attribute vec3  a_pos;
+attribute vec2  texcoord;
+
+// uniforms
+uniform float u_time;
+uniform float u_zmin;
+uniform float u_zmax;
+uniform float u_surfaceAlpha;
+
+// matrix uniforms
+uniform mat4 u_mvMatrix;
+uniform mat4 u_projMatrix;
+
+// varying
+varying vec2    v_texCoord0;
+
+// constants
+const float zSpeed = 10.0;
+
+
+void main()
+{
+    // Transform position
+        vec4 pos = vec4(a_pos,1);
+
+        float dz = u_time*zSpeed;
+        float n = floor( dz/(u_zmax-u_zmin) );
+        dz -= n*(u_zmax - u_zmin);
+        float z = pos.z + dz;
+        if (z > u_zmax)
+        {
+                z = u_zmin + (z - u_zmax);
+        }
+        pos.z = z;
+
+        gl_Position = u_projMatrix * u_mvMatrix * pos;
+            
+    v_texCoord0 = texcoord;
+}
\ No newline at end of file
diff --git a/assets/shaders/Flag.frag.glsl b/assets/shaders/Flag.frag.glsl
new file mode 100644
index 00000000..b05b4888
--- /dev/null
+++ b/assets/shaders/Flag.frag.glsl
@@ -0,0 +1,20 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+#ifdef GL_ES
+precision highp float;
+#endif
+
+uniform sampler2D u_tex0;
+
+varying vec2 v_uv;
+
+void main(void)
+{
+    vec3 col = texture2D(u_tex0, v_uv).xyz;
+    gl_FragColor = vec4(col,1.0);
+}
\ No newline at end of file
diff --git a/assets/shaders/Flag.vert.glsl b/assets/shaders/Flag.vert.glsl
index 7dc932a7..a5e8b2f7 100644
--- a/assets/shaders/Flag.vert.glsl
+++ b/assets/shaders/Flag.vert.glsl
@@ -16,20 +16,32 @@ attribute vec2 texcoord;
 
 // scalar uniforms
 uniform float u_time;
+uniform float u_waveWidth;
+uniform float u_waveHeight;
 
 // matrix uniforms
 uniform mat4 u_mvMatrix;
 uniform mat4 u_projMatrix;
 uniform mat4 u_worldMatrix;
 
+// varying variables
+varying vec2 v_uv;
+
+
 void main()
 {
-        float angle = (u_time%360)*2;
+        float pi = 3.14159;
+        float angle = u_time;
+
+    v_uv = texcoord;
 
-        a_pos.z  = sin( a_pos.x + angle);
-        a_pos.z += sin( a_pos.y/2 + angle);
-        a_pos.z *= a_pos.x * 0.09;
-        gl_Position = u_projMatrix * u_mvMatrix * vec4(a_pos,1.0) ;
+        float x = 2.0*pi*texcoord.x/u_waveWidth;
+        float y = 2.0*pi*texcoord.y;
 
-        gl_FragColor = v_color;
+    vec3 v = a_pos;
+        v.z  = sin( x + angle ) - 2.0*u_waveHeight;
+        v.z += sin( 0.2*y + angle);
+        v.z *= x * 0.09 * u_waveHeight;
+        
+    gl_Position = u_projMatrix * u_mvMatrix * vec4(v,1.0) ;
 }
diff --git a/assets/shaders/Water2.frag.glsl b/assets/shaders/Water2.frag.glsl
index 39b6aa55..49b2b647 100644
--- a/assets/shaders/Water2.frag.glsl
+++ b/assets/shaders/Water2.frag.glsl
@@ -8,20 +8,27 @@ uniform vec2 u_resolution;
 const float PI = 3.1415926535897932;
 
 //speed
-const float speed = 0.2;
+//const float speed = 0.2;
 const float speed_x = 0.3;
 const float speed_y = 0.3;
 
 // geometry
-const float intensity = 3.;
+//const float intensity = 3.;
 const int steps = 8;
 const float frequency = 4.0;
 const int angle = 7; // better when a prime
 
 // reflection and emboss
-const float delta = 20.;
+//const float delta = 20.;
 const float intence = 400.;
-const float emboss = 0.3;
+//const float emboss = 0.3;
+
+// uniforms
+uniform float u_emboss;
+uniform float u_delta;
+//uniform float u_intence;
+uniform float u_intensity;
+uniform float u_speed;
 
 //---------- crystals effect