aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/radialBlur.frag.glsl
diff options
context:
space:
mode:
authorEric Guzman2012-06-20 19:42:03 -0700
committerEric Guzman2012-06-20 19:42:03 -0700
commit3270aac4980c908f305fb53abadda5121ff6b9cb (patch)
tree6255aaab239fde71b1f4862dd70de7be62f48b85 /assets/shaders/radialBlur.frag.glsl
parenta5d93daf6fdccbfee160d6a8ba08f6b6d4b9d7cc (diff)
parent87377c81da06abf6d656017859830a3ab2902f0e (diff)
downloadninja-3270aac4980c908f305fb53abadda5121ff6b9cb.tar.gz
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
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);