aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/radialBlur.frag.glsl
diff options
context:
space:
mode:
authorJonathan Duran2012-06-19 08:40:26 -0700
committerJonathan Duran2012-06-19 08:40:26 -0700
commit6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39 (patch)
tree253e5f6dd5923218e3155f78fa67ff3e43de0ebc /assets/shaders/radialBlur.frag.glsl
parentb51c9448bc187f9bfa3ab39c366657ec2bb9e2fb (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-6f25a2e70079de6bcbb8c3411ddef88c2ed1ea39.tar.gz
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Diffstat (limited to 'assets/shaders/radialBlur.frag.glsl')
-rw-r--r--assets/shaders/radialBlur.frag.glsl5
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
4uniform vec2 u_resolution; 4uniform vec2 u_resolution;
5uniform float u_time; 5uniform float u_time;
6uniform vec4 color; 6uniform float u_speed;
7uniform sampler2D u_tex0; 7uniform sampler2D u_tex0;
8 8
9vec3 deform( in vec2 p ) 9vec3 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);