Merge branch 'refs/heads/master' into montage-v11-integration

Conflicts:
	js/io/system/ninjalibrary.json

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 24 insertions, 8 deletions

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;
+
+    v_uv = texcoord;
+
+        float x = 2.0*pi*texcoord.x/u_waveWidth;
+        float y = 2.0*pi*texcoord.y;
+
+    vec3 v = a_pos;
+        v.z  = sin( x + angle );
+        v.z += sin( 0.2*y + angle);
+        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) ;
 }