Emissive textures don't reflect light

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

1 files changed, 1 insertions, 4 deletions

diff --git a/data/shaders/lighting.frag b/data/shaders/lighting.frag
index 0b11b36..1bc0afd 100644
--- a/data/shaders/lighting.frag
+++ b/data/shaders/lighting.frag
@@ -88,10 +88,7 @@ void main() {
 		vec3 tex = texture2D(texture, gl_TexCoord[0].st).rgb;
 		
 		if ( texture_emits ) {
-			gl_FragColor = vec4(min(emit.r + ambi.r + diff.r + spec.r + tex.r, 1.0),
-					    min(emit.g + ambi.g + diff.g + spec.g + tex.g, 1.0),
-					    min(emit.b + ambi.b + diff.b + spec.b + tex.b, 1.0),
-					    alpha);
+			gl_FragColor = vec4(tex.r, tex.g, tex.b, alpha);
 		} else {
 			gl_FragColor = vec4(min(tex.r * (ambi.r + diff.r) + spec.r, 1.0),
 					    min(tex.g * (ambi.g + diff.g) + spec.g, 1.0),