aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders/Fly.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/Fly.frag.glsl
parent616b31a644ee221edcbc19f821b2194e8edf9fad (diff)
parent483ad57efcd6475776f580c3af5b60e6deeaf781 (diff)
downloadninja-4d2a5acd1631f0cf4e38f127c886f481668ddce0.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into FileIO
Diffstat (limited to 'assets/shaders/Fly.frag.glsl')
-rw-r--r--assets/shaders/Fly.frag.glsl5
1 files changed, 3 insertions, 2 deletions
diff --git a/assets/shaders/Fly.frag.glsl b/assets/shaders/Fly.frag.glsl
index f99b5ab8..d36928a1 100644
--- a/assets/shaders/Fly.frag.glsl
+++ b/assets/shaders/Fly.frag.glsl
@@ -4,6 +4,7 @@ precision highp float;
4 4
5uniform vec2 u_resolution; 5uniform vec2 u_resolution;
6uniform float u_time; 6uniform float u_time;
7uniform float u_speed;
7uniform sampler2D u_tex0; 8uniform sampler2D u_tex0;
8 9
9void main(void) 10void main(void)
@@ -11,13 +12,13 @@ void main(void)
11 vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy; 12 vec2 p = -1.0 + 2.0 * gl_FragCoord.xy / u_resolution.xy;
12 vec2 uv; 13 vec2 uv;
13 14
14 float an = u_time*.25; 15 float an = u_time*u_speed*.25;
15 16
16 float x = p.x*cos(an)-p.y*sin(an); 17 float x = p.x*cos(an)-p.y*sin(an);
17 float y = p.x*sin(an)+p.y*cos(an); 18 float y = p.x*sin(an)+p.y*cos(an);
18 19
19 uv.x = .25*x/abs(y); 20 uv.x = .25*x/abs(y);
20 uv.y = .20*u_time + .25/abs(y); 21 uv.y = .20*u_time*u_speed + .25/abs(y);
21 22
22 gl_FragColor = vec4(texture2D(u_tex0,uv).xyz * y*y, 1.0); 23 gl_FragColor = vec4(texture2D(u_tex0,uv).xyz * y*y, 1.0);
23} 24}