diff options
author | Nivesh Rajbhandari | 2012-03-13 13:05:33 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-03-13 13:05:33 -0700 |
commit | 92fc2e3c4bca2edb04102431b4959aafe022f329 (patch) | |
tree | d48c090f71ed2cd6bd6ce38ff68c36ab69299985 /assets/shaders | |
parent | efb92cf52680d31f05fed3757e74862592cc2d4c (diff) | |
parent | f56b8cf4d3316d250c0f0045fb78f0dbd5c56e94 (diff) | |
download | ninja-92fc2e3c4bca2edb04102431b4959aafe022f329.tar.gz |
Merge branch 'refs/heads/ninja-internal' into ToolFixes
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 | } |