diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /assets/shaders/Tunnel.frag.glsl | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'assets/shaders/Tunnel.frag.glsl')
-rw-r--r-- | assets/shaders/Tunnel.frag.glsl | 3 |
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 | ||
5 | uniform vec2 u_resolution; | 5 | uniform vec2 u_resolution; |
6 | uniform float u_time; | 6 | uniform float u_time; |
7 | uniform float u_speed; | ||
7 | uniform sampler2D u_tex0; | 8 | uniform sampler2D u_tex0; |
8 | 9 | ||
9 | void main(void) | 10 | void 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; |