Fun with shaders

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

3 files changed, 52 insertions, 4 deletions

diff --git a/data/shaders/lighting.frag b/data/shaders/lighting.frag
index 1008734..265f494 100644
--- a/data/shaders/lighting.frag
+++ b/data/shaders/lighting.frag
@@ -19,6 +19,7 @@ varying vec3 light2hvc;
 uniform sampler2D texture;
 uniform bool fill_light_enabled;
 uniform bool texture_enabled;
+uniform bool texture_only;
 
 varying vec3 col_ambi_diff;
 varying vec3 col_emit;
@@ -55,10 +56,14 @@ void main() {
 		spec += vec3(1.0, 1.0, 1.0) * gl_LightSource[2].specular.rgb * pow(ndothv, 80.0);
 	}
 	
-	gl_FragColor = vec4(min(emit.r + ambi.r + diff.r + spec.r, 1.0),
-			    min(emit.g + ambi.g + diff.g + spec.g, 1.0),
-			    min(emit.b + ambi.b + diff.b + spec.b, 1.0),
-			    1.0);
+	if ( !texture_only ) {
+		gl_FragColor = vec4(min(emit.r + ambi.r + diff.r + spec.r, 1.0),
+				    min(emit.g + ambi.g + diff.g + spec.g, 1.0),
+				    min(emit.b + ambi.b + diff.b + spec.b, 1.0),
+				    1.0);
+	} else {
+		gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
+	}
 	
 	if ( texture_enabled ) {
 		gl_FragColor *= texture2D(texture, gl_TexCoord[0].st);
diff --git a/data/shaders/swirlytron.frag b/data/shaders/swirlytron.frag
new file mode 100644
index 0000000..d152636
--- /dev/null
+++ b/data/shaders/swirlytron.frag
@@ -0,0 +1,19 @@
+/*
+ * swirlytron.vert
+ *
+ * Swirly stuff for rendering onto swirly things...
+ *
+ * (c) 2007-2008 Thomas White <taw27@cam.ac.uk>
+ *
+ *  thrust3d - a silly game
+ *
+ */
+
+varying vec2 coords;
+
+void main() {
+	
+	gl_FragColor = vec4(coords.x, 0.0, coords.y, 1.0);
+	
+}
+
diff --git a/data/shaders/swirlytron.vert b/data/shaders/swirlytron.vert
new file mode 100644
index 0000000..0c6dc73
--- /dev/null
+++ b/data/shaders/swirlytron.vert
@@ -0,0 +1,24 @@
+/*
+ * swirlytron.vert
+ *
+ * Swirly stuff for rendering onto swirly things...
+ *
+ * (c) 2007-2008 Thomas White <taw27@cam.ac.uk>
+ *
+ *  thrust3d - a silly game
+ *
+ */
+
+varying vec2 coords;
+
+void main() {
+	
+	coords.x = (gl_Vertex.x + 1.0)/2.0;
+	coords.y = (gl_Vertex.y + 1.0)/2.0;
+	
+	/* Coordinates */
+	gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+	gl_Position = ftransform();
+	
+}
+