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

diff --git a/assets/shaders/Tunnel.frag.glsl b/assets/shaders/Tunnel.frag.glsl
index 9deb52fb..def28e2e 100644
--- a/assets/shaders/Tunnel.frag.glsl
+++ b/assets/shaders/Tunnel.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)
@@ -14,7 +15,7 @@ void main(void)
     float a = atan(p.y,p.x);
     float r = sqrt(dot(p,p));
 
-    uv.x = .75*u_time+.1/r;
+    uv.x = .75*u_time*u_speed + .1/r;
     uv.y = a/3.1416;
 
     vec3 col =  texture2D(u_tex0,uv).xyz;