summaryrefslogtreecommitdiff
path: root/graphics/asymptote/base/shaders/fragment.glsl
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-03-04 03:02:32 +0000
committerNorbert Preining <norbert@preining.info>2020-03-04 03:02:32 +0000
commit19d25b8009801aa98ea2f46b45c37c257f990491 (patch)
treec0da70fbab26feff40e87df289ae797917df8419 /graphics/asymptote/base/shaders/fragment.glsl
parentb78f5a6705512314d6fe42fd5144c5f8e5d484ce (diff)
CTAN sync 202003040302
Diffstat (limited to 'graphics/asymptote/base/shaders/fragment.glsl')
-rw-r--r--graphics/asymptote/base/shaders/fragment.glsl20
1 files changed, 8 insertions, 12 deletions
diff --git a/graphics/asymptote/base/shaders/fragment.glsl b/graphics/asymptote/base/shaders/fragment.glsl
index cdcc0b49e8..057acbc744 100644
--- a/graphics/asymptote/base/shaders/fragment.glsl
+++ b/graphics/asymptote/base/shaders/fragment.glsl
@@ -135,29 +135,25 @@ void main()
Material m;
#ifdef TRANSPARENT
m=Materials[abs(materialIndex)-1];
- if(materialIndex >= 0) {
+ emissive=m.emissive;
+ if(materialIndex >= 0)
diffuse=m.diffuse;
- emissive=m.emissive;
- } else {
+ else {
diffuse=Color;
-#if Nlights > 0
- emissive=vec4(0.0);
-#else
- emissive=Color;
+#if Nlights == 0
+ emissive += Color;
#endif
}
#else
m=Materials[int(materialIndex)];
+ emissive=m.emissive;
#ifdef COLOR
diffuse=Color;
-#if Nlights > 0
- emissive=vec4(0.0);
-#else
- emissive=Color;
+#if Nlights == 0
+ emissive += Color;
#endif
#else
diffuse=m.diffuse;
- emissive=m.emissive;
#endif
#endif