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/Fly.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/Fly.frag.glsl')
-rw-r--r-- | assets/shaders/Fly.frag.glsl | 5 |
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 | ||
5 | uniform vec2 u_resolution; | 5 | uniform vec2 u_resolution; |
6 | uniform float u_time; | 6 | uniform float u_time; |
7 | uniform float u_speed; | ||
7 | uniform sampler2D u_tex0; | 8 | uniform sampler2D u_tex0; |
8 | 9 | ||
9 | void main(void) | 10 | void 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 | } |