aboutsummaryrefslogtreecommitdiff
path: root/assets/shaders
diff options
context:
space:
mode:
authorPushkar Joshi2012-03-13 11:36:11 -0700
committerPushkar Joshi2012-03-13 11:36:11 -0700
commit6023f7c8258e660388ee33730601f1161f9299e9 (patch)
tree632484428b398f71b8481aa8e30180895ff2483c /assets/shaders
parent76f2021618c0a6a99a1b855233e353e84ca99467 (diff)
parent4ad1650f629e7e345eade52ed6dadc233b27cc45 (diff)
downloadninja-6023f7c8258e660388ee33730601f1161f9299e9.tar.gz
Merge branch 'pentool' into brushtool
Diffstat (limited to 'assets/shaders')
-rw-r--r--assets/shaders/plasma.frag.glsl4
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}