diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /assets/shaders/radialBlur.frag.glsl | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'assets/shaders/radialBlur.frag.glsl')
-rw-r--r-- | assets/shaders/radialBlur.frag.glsl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/assets/shaders/radialBlur.frag.glsl b/assets/shaders/radialBlur.frag.glsl index 673d082a..c4520e58 100644 --- a/assets/shaders/radialBlur.frag.glsl +++ b/assets/shaders/radialBlur.frag.glsl | |||
@@ -3,15 +3,14 @@ precision highp float; | |||
3 | 3 | ||
4 | uniform vec2 u_resolution; | 4 | uniform vec2 u_resolution; |
5 | uniform float u_time; | 5 | uniform float u_time; |
6 | uniform vec4 color; | 6 | uniform float u_speed; |
7 | uniform sampler2D u_tex0; | 7 | uniform sampler2D u_tex0; |
8 | 8 | ||
9 | vec3 deform( in vec2 p ) | 9 | vec3 deform( in vec2 p ) |
10 | { | 10 | { |
11 | vec2 uv; | 11 | vec2 uv; |
12 | 12 | ||
13 | //float time = color.x; | 13 | float time = u_time * u_speed; |
14 | float time = u_time; | ||
15 | vec2 q = vec2( sin(1.1*time+p.x),sin(1.2*time+p.y) ); | 14 | vec2 q = vec2( sin(1.1*time+p.x),sin(1.2*time+p.y) ); |
16 | 15 | ||
17 | float a = atan(q.y,q.x); | 16 | float a = atan(q.y,q.x); |