More swirlytron

git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@50 84d2e878-0bd5-11dd-ad15-13eda11d74c5

1 files changed, 4 insertions, 2 deletions

diff --git a/data/shaders/swirlytron.frag b/data/shaders/swirlytron.frag
index f582aa7..b2a9d89 100644
--- a/data/shaders/swirlytron.frag
+++ b/data/shaders/swirlytron.frag
@@ -17,13 +17,15 @@ void main() {
 	
 	vec3 colour;
 	float f;
+	float r;
+	
+	r = pow(abs(coords.x), 2.0) + pow(abs(coords.y), 2.0);
 	
 	f = 1.0 + (0.5*cos(time/1000.0));
 	
-	colour.b  = 0.2 * abs( cos(2*f*3.141*coords.x + (time/100.0)) );
-	colour.b += 0.5 * abs( cos(2*f*3.141*coords.y + (time/100.0)) );
 	colour.r = 0.1;
 	colour.g = 0.0;
+	colour.b  = 0.5 * cos(2*f*3.141*r - (time/100.0) );
 	
 	gl_FragColor = vec4(colour.r, colour.g, colour.b, 1.0);