Merge branch 'refs/heads/Ninja-Internal' into FileIO

25 files changed, 228 insertions, 65 deletions

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..cd70d1a0
--- /dev/null
+++ b/assets/shaders/Cloud.frag.glsl
@@ -0,0 +1,23 @@
+/* <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);
+        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/Deform.frag.glsl b/assets/shaders/Deform.frag.glsl
index 1dbe45a0..a2bb4fa0 100644
--- a/assets/shaders/Deform.frag.glsl
+++ b/assets/shaders/Deform.frag.glsl
@@ -3,6 +3,7 @@ precision highp float;
 #endif
 
 uniform float u_time;
+uniform float u_speed;
 uniform vec2 u_resolution;
 //uniform vec4 mouse;
 uniform sampler2D u_tex0;
@@ -19,7 +20,7 @@ void main(void)
     float r2 = sqrt(dot(p+m,p+m));
 
     vec2 uv;
-    uv.x = 0.2*u_time + (r1-r2)*0.25;
+    uv.x = 0.2*u_time*u_speed + (r1-r2)*0.25;
     uv.y = sin(2.0*(a1-a2));
 
     float w = r1*r2*0.8;
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..1c842cb0 100644
--- a/assets/shaders/Flag.vert.glsl
+++ b/assets/shaders/Flag.vert.glsl
@@ -16,20 +16,36 @@ attribute vec2 texcoord;
 
 // scalar uniforms
 uniform float u_time;
+uniform float u_speed;
+uniform float u_waveWidth;
+uniform float u_waveHeight;
 
 // matrix uniforms
 uniform mat4 u_mvMatrix;
 uniform mat4 u_projMatrix;
 uniform mat4 u_worldMatrix;
 
-void main()
-{
-        float angle = (u_time%360)*2;
+// varying variables
+varying vec2 v_uv;
 
-        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) ;
 
-        gl_FragColor = v_color;
+void main()
+{
+        float time = u_time * u_speed;
+        const float pi = 3.14159;
+        float angle = time;