From 19d25b8009801aa98ea2f46b45c37c257f990491 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 4 Mar 2020 03:02:32 +0000 Subject: CTAN sync 202003040302 --- graphics/asymptote/webgl/vertex.glsl | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'graphics/asymptote/webgl/vertex.glsl') diff --git a/graphics/asymptote/webgl/vertex.glsl b/graphics/asymptote/webgl/vertex.glsl index 250c0b7b4a..bf55fc0042 100644 --- a/graphics/asymptote/webgl/vertex.glsl +++ b/graphics/asymptote/webgl/vertex.glsl @@ -40,34 +40,30 @@ void main(void) #ifndef ORTHOGRAPHIC ViewPosition=(viewMat*v).xyz; #endif - Normal=normal*normMat; + Normal=normalize(normal*normMat); Material m; #ifdef TRANSPARENT m=Materials[int(abs(materialIndex))-1]; + emissive=m.emissive; if(materialIndex >= 0.0) { diffuse=m.diffuse; - emissive=m.emissive; } 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 specular=m.specular.rgb; -- cgit v1.2.3