aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/Tunnel.frag.glsl
diff options
context:
space:
mode:
authorValerio Virgillito2012-06-20 11:17:47 -0700
committerValerio Virgillito2012-06-20 11:17:47 -0700
commit3f5aa43b5b545cd551c5585ef5f2d478c2d49cad (patch)
treefe5beec45a8d7f45a90659e95c4f13a679ae35d5 /assets/shaders/Tunnel.frag.glsl
parent5c4ff40d7950282a179dcfd49c5ea9234e0a8185 (diff)
parentfcb6309915161d16a74a4385b905742f35b7d62d (diff)
downloadninja-3f5aa43b5b545cd551c5585ef5f2d478c2d49cad.tar.gz
Merge branch 'refs/heads/master' into montage-v11-integration
Conflicts: js/io/system/ninjalibrary.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'assets/shaders/Tunnel.frag.glsl')
-rw-r--r--assets/shaders/Tunnel.frag.glsl3
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;
4 4
5uniform vec2 u_resolution; 5uniform vec2 u_resolution;
6uniform float u_time; 6uniform float u_time;
7uniform float u_speed;
7uniform sampler2D u_tex0; 8uniform sampler2D u_tex0;
8 9
9void main(void) 10void main(void)
@@ -14,7 +15,7 @@ void main(void)
14 float a = atan(p.y,p.x); 15 float a = atan(p.y,p.x);
15 float r = sqrt(dot(p,p)); 16 float r = sqrt(dot(p,p));
16 17
17 uv.x = .75*u_time+.1/r; 18 uv.x = .75*u_time*u_speed + .1/r;
18 uv.y = a/3.1416; 19 uv.y = a/3.1416;
19 20
20 vec3 col = texture2D(u_tex0,uv).xyz; 21 vec3 col = texture2D(u_tex0,uv).xyz;