aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/Twist.frag.glsl
diff options
context:
space:
mode:
authorAnanya Sen2012-06-19 11:00:49 -0700
committerAnanya Sen2012-06-19 11:00:49 -0700
commitf1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch)
tree31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /assets/shaders/Twist.frag.glsl
parent9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'assets/shaders/Twist.frag.glsl')
-rw-r--r--assets/shaders/Twist.frag.glsl7
1 files changed, 5 insertions, 2 deletions
diff --git a/assets/shaders/Twist.frag.glsl b/assets/shaders/Twist.frag.glsl
index b7477747..ab66cdae 100644
--- a/assets/shaders/Twist.frag.glsl
+++ b/assets/shaders/Twist.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,8 +15,10 @@ 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 = r - .25*u_time; 18 float time = u_time * u_speed;
18 uv.y = cos(a*5.0 + 2.0*sin(u_time+7.0*r)) ; 19
20 uv.x = r - .25*time;
21 uv.y = cos(a*5.0 + 2.0*sin(time+7.0*r)) ;
19 22
20 vec3 col = (.5+.5*uv.y)*texture2D(u_tex0,uv).xyz; 23 vec3 col = (.5+.5*uv.y)*texture2D(u_tex0,uv).xyz;
21 24