aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/Deform.frag.glsl
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-19 10:25:16 -0700
committerJose Antonio Marquez2012-06-19 10:25:16 -0700
commit4d2a5acd1631f0cf4e38f127c886f481668ddce0 (patch)
tree3bc8f2b21826c0ee6d37bc77753d45a882783cbf /assets/shaders/Deform.frag.glsl
parent616b31a644ee221edcbc19f821b2194e8edf9fad (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-4d2a5acd1631f0cf4e38f127c886f481668ddce0.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'assets/shaders/Deform.frag.glsl')
-rw-r--r--assets/shaders/Deform.frag.glsl3
1 files changed, 2 insertions, 1 deletions
diff --git a/assets/shaders/Deform.frag.glsl b/assets/shaders/Deform.frag.glsl
index 1dbe45a0..a2bb4fa0 100644
--- a/assets/shaders/Deform.frag.glsl
+++ b/assets/shaders/Deform.frag.glsl
@@ -3,6 +3,7 @@ precision highp float;
3#endif 3#endif
4 4
5uniform float u_time; 5uniform float u_time;
6uniform float u_speed;
6uniform vec2 u_resolution; 7uniform vec2 u_resolution;
7//uniform vec4 mouse; 8//uniform vec4 mouse;
8uniform sampler2D u_tex0; 9uniform sampler2D u_tex0;
@@ -19,7 +20,7 @@ void main(void)
19 float r2 = sqrt(dot(p+m,p+m)); 20 float r2 = sqrt(dot(p+m,p+m));
20 21
21 vec2 uv; 22 vec2 uv;
22 uv.x = 0.2*u_time + (r1-r2)*0.25; 23 uv.x = 0.2*u_time*u_speed + (r1-r2)*0.25;
23 uv.y = sin(2.0*(a1-a2)); 24 uv.y = sin(2.0*(a1-a2));
24 25
25 float w = r1*r2*0.8; 26 float w = r1*r2*0.8;