diff options
| author | Eric Guzman | 2012-06-20 19:42:03 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-06-20 19:42:03 -0700 |
| commit | 3270aac4980c908f305fb53abadda5121ff6b9cb (patch) | |
| tree | 6255aaab239fde71b1f4862dd70de7be62f48b85 /assets/shaders/Twist.frag.glsl | |
| parent | a5d93daf6fdccbfee160d6a8ba08f6b6d4b9d7cc (diff) | |
| parent | 87377c81da06abf6d656017859830a3ab2902f0e (diff) | |
| download | ninja-3270aac4980c908f305fb53abadda5121ff6b9cb.tar.gz | |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Diffstat (limited to 'assets/shaders/Twist.frag.glsl')
| -rw-r--r-- | assets/shaders/Twist.frag.glsl | 7 |
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 | ||
| 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,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 | ||