diff options
| author | Valerio Virgillito | 2012-06-19 07:58:10 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-19 07:58:10 -0700 |
| commit | 483ad57efcd6475776f580c3af5b60e6deeaf781 (patch) | |
| tree | 3bc8f2b21826c0ee6d37bc77753d45a882783cbf /assets/shaders/Twist.frag.glsl | |
| parent | 918a4f5870e972b6e4e301c3237e065a1ffd26f5 (diff) | |
| parent | c65c532d081afd73e4a325abe4ab97c6726c02db (diff) | |
| download | ninja-483ad57efcd6475776f580c3af5b60e6deeaf781.tar.gz | |
Merge pull request #298 from ericmueller/Textures
Textures
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 | ||