diff options
| author | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-06-20 11:17:47 -0700 |
| commit | 3f5aa43b5b545cd551c5585ef5f2d478c2d49cad (patch) | |
| tree | fe5beec45a8d7f45a90659e95c4f13a679ae35d5 /assets/shaders/Twist.frag.glsl | |
| parent | 5c4ff40d7950282a179dcfd49c5ea9234e0a8185 (diff) | |
| parent | fcb6309915161d16a74a4385b905742f35b7d62d (diff) | |
| download | ninja-3f5aa43b5b545cd551c5585ef5f2d478c2d49cad.tar.gz | |
Merge branch 'refs/heads/master' into montage-v11-integration
Conflicts:
js/io/system/ninjalibrary.json
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
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 | ||