aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authortaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-06-21 20:26:20 +0000
committertaw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5>2008-06-21 20:26:20 +0000
commit185bd5685d17fa0d1b379d4e1f53e141e72931f2 (patch)
treea9f2b66c45dff682f01f6f134da74e6e2309768d /data
parentb61d2a449cbe92441fe7c90daf2a90e54de64bab (diff)
Show transparent back faces
git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@101 84d2e878-0bd5-11dd-ad15-13eda11d74c5
Diffstat (limited to 'data')
-rw-r--r--data/shaders/lighting.frag7
1 files changed, 4 insertions, 3 deletions
diff --git a/data/shaders/lighting.frag b/data/shaders/lighting.frag
index 4616feb..ef7ce18 100644
--- a/data/shaders/lighting.frag
+++ b/data/shaders/lighting.frag
@@ -20,6 +20,7 @@ uniform sampler2D texture;
uniform bool fill_light_enabled;
uniform bool texture_enabled;
uniform bool texture_emits;
+uniform float alpha;
varying vec3 col_ambi_diff;
varying vec3 col_emit;
@@ -70,12 +71,12 @@ void main() {
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),
- 1.0);
+ alpha);
} else {
gl_FragColor = vec4(tex.r * min(emit.r + ambi.r + diff.r + spec.r, 1.0),
tex.g * min(emit.g + ambi.g + diff.g + spec.g, 1.0),
tex.b * min(emit.b + ambi.b + diff.b + spec.b, 1.0),
- 1.0);
+ alpha);
}
} else {
@@ -83,7 +84,7 @@ void main() {
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);
+ alpha);
}