diff options
author | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
---|---|---|
committer | Jose Antonio Marquez Russo | 2012-03-08 10:49:06 -0800 |
commit | 85f21e020ac281e8e545df1cf269034de99a00b1 (patch) | |
tree | 441834fa8b02b1cc2a970210020d27e06d2c99be /assets | |
parent | d9813946dc28d8c28033a68b68300b9d9eda115c (diff) | |
parent | 11a6f18e274d7232cdbb8f6e9e65e0a5ab756451 (diff) | |
download | ninja-85f21e020ac281e8e545df1cf269034de99a00b1.tar.gz |
Merge pull request #29 from ericmueller/integration
Integration
Diffstat (limited to 'assets')
-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 | } |