aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-08-06 12:00:59 +0000
committertaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-08-06 12:00:59 +0000
commitaa6b6e1eb038fcc38057f81fdaa3f4225580a228 (patch)
tree529f779ef51d9dd7a8c518c99e46c2b03f91b37b
parent610231f47989858c7a17c3387c0d11fbccf0edb9 (diff)
Fussiness
git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@221 84d2e878-0bd5-11dd-ad15-13eda11d74c5
-rw-r--r--data/shaders/lighting.frag6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/shaders/lighting.frag b/data/shaders/lighting.frag
index 632f870..1a20e89 100644
--- a/data/shaders/lighting.frag
+++ b/data/shaders/lighting.frag
@@ -79,9 +79,9 @@ void main() {
diff += col_ambi_diff * gl_LightSource[1].diffuse.rgb * max(0.0, dot(vec3(light1vc), norm));
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),
- min(tex.b * (ambi.b + diff.b) + spec.b, 1.0),
- alpha);
+ min(tex.g * (ambi.g + diff.g) + spec.g, 1.0),
+ min(tex.b * (ambi.b + diff.b) + spec.b, 1.0),
+ alpha);
}