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, 3 insertions, 2 deletions

diff --git a/assets/shaders/Fly.frag.glsl b/assets/shaders/Fly.frag.glsl
index f99b5ab8..d36928a1 100644
--- a/assets/shaders/Fly.frag.glsl
+++ b/assets/shaders/Fly.frag.glsl
@@ -4,6 +4,7 @@ precision highp float;
 
 uniform vec2 u_resolution;
 uniform float u_time;
+uniform float u_speed;
 uniform sampler2D u_tex0;
 
 void main(void)
@@ -11,13 +12,13 @@ void main(void)
     vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
     vec2 uv;
 
-    float an = u_time*.25;
+    float an = u_time*u_speed*.25;
 
     float x = p.x*cos(an)-p.y*sin(an);
     float y = p.x*sin(an)+p.y*cos(an);
      
     uv.x = .25*x/abs(y);
-    uv.y = .20*u_time + .25/abs(y);
+    uv.y = .20*u_time*u_speed + .25/abs(y);
 
     gl_FragColor = vec4(texture2D(u_tex0,uv).xyz * y*y, 1.0);
 }