aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/SquareTunnel.frag.glsl
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-06-19 15:56:23 -0700
committerNivesh Rajbhandari2012-06-19 15:56:23 -0700
commit3ed06c2a55b1ae840334efeb47f7743944ecb3ca (patch)
tree0ad3e94248a1d4828386c8743a670c709357a470 /assets/shaders/SquareTunnel.frag.glsl
parenta0d18963d746e410511c29edd32bc1775d2d5851 (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-3ed06c2a55b1ae840334efeb47f7743944ecb3ca.tar.gz
Merge branch 'refs/heads/ninja-internal' into GIO_Fixes
Diffstat (limited to 'assets/shaders/SquareTunnel.frag.glsl')
-rw-r--r--assets/shaders/SquareTunnel.frag.glsl3
1 files changed, 2 insertions, 1 deletions
diff --git a/assets/shaders/SquareTunnel.frag.glsl b/assets/shaders/SquareTunnel.frag.glsl
index 51ef7b7c..1298a03a 100644
--- a/assets/shaders/SquareTunnel.frag.glsl
+++ b/assets/shaders/SquareTunnel.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)
@@ -12,7 +13,7 @@ void main(void)
12 vec2 uv; 13 vec2 uv;
13 14
14 float r = pow( pow(p.x*p.x,16.0) + pow(p.y*p.y,16.0), 1.0/32.0 ); 15 float r = pow( pow(p.x*p.x,16.0) + pow(p.y*p.y,16.0), 1.0/32.0 );
15 uv.x = .5*u_time + 0.5/r; 16 uv.x = 0.5*u_time*u_speed + 0.5/r;
16 uv.y = 1.0*atan(p.y,p.x)/3.1416; 17 uv.y = 1.0*atan(p.y,p.x)/3.1416;
17 18
18 vec3 col = texture2D(u_tex0,uv).xyz; 19 vec3 col = texture2D(u_tex0,uv).xyz;