From 9e812f35ffa751e9215c5427c0c44005bd357924 Mon Sep 17 00:00:00 2001
From: hwc487
Date: Wed, 7 Mar 2012 17:18:38 -0800
Subject: Fixed a few problems with Plasma material.

---
 assets/shaders/plasma.frag.glsl | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'assets/shaders')

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)
 {
 	float x = v_uv.x ;
 	float y = v_uv.y ;
-	float time = color.x;
+	float time = u_time;
 	float wave =	(cos(time + y / 0.2  + cos(x / 0.3 + cos((y / 0.1)))));
 	float wave1 =	(sin(abs(wave + y/0.6)));
 	float wave2 =	(sin(abs(wave1 + y/0.8)));
-	float tmp = u_time * 0.1;
 	gl_FragColor = vec4( abs(vec3(wave2,wave1,wave)),1.0);
-	//gl_FragColor = color;
 }	
-- 
cgit v1.2.3