diff options
author | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
---|---|---|
committer | Jonathan Duran | 2012-03-14 08:59:17 -0700 |
commit | e065244ac75d1d0f25fd5c75cb58e714a13fe16b (patch) | |
tree | 6b49a85a45fdd41b81be5603fbbc2e0d197eb187 /assets/shaders | |
parent | e8f207dc50ad942ee8c1c1db6b146c0110ce3216 (diff) | |
download | ninja-e065244ac75d1d0f25fd5c75cb58e714a13fe16b.tar.gz |
Squashed commit of the following:
merge master into timeline
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'assets/shaders')
-rw-r--r-- | assets/shaders/plasma.frag.glsl | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/assets/shaders/plasma.frag.glsl b/assets/shaders/plasma.frag.glsl index 2ab8f49c..248288a6 100644 --- a/assets/shaders/plasma.frag.glsl +++ b/assets/shaders/plasma.frag.glsl | |||
@@ -22,11 +22,9 @@ void main(void) | |||
22 | { | 22 | { |
23 | float x = v_uv.x ; | 23 | float x = v_uv.x ; |
24 | float y = v_uv.y ; | 24 | float y = v_uv.y ; |
25 | float time = color.x; | 25 | float time = u_time; |
26 | float wave = (cos(time + y / 0.2 + cos(x / 0.3 + cos((y / 0.1))))); | 26 | float wave = (cos(time + y / 0.2 + cos(x / 0.3 + cos((y / 0.1))))); |
27 | float wave1 = (sin(abs(wave + y/0.6))); | 27 | float wave1 = (sin(abs(wave + y/0.6))); |
28 | float wave2 = (sin(abs(wave1 + y/0.8))); | 28 | float wave2 = (sin(abs(wave1 + y/0.8))); |
29 | float tmp = u_time * 0.1; | ||
30 | gl_FragColor = vec4( abs(vec3(wave2,wave1,wave)),1.0); | 29 | gl_FragColor = vec4( abs(vec3(wave2,wave1,wave)),1.0); |
31 | //gl_FragColor = color; | ||
32 | } | 30 | } |