diff options
author | Norbert Preining <norbert@preining.info> | 2020-03-04 03:02:32 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-03-04 03:02:32 +0000 |
commit | 19d25b8009801aa98ea2f46b45c37c257f990491 (patch) | |
tree | c0da70fbab26feff40e87df289ae797917df8419 /graphics/asymptote/webgl/vertex.glsl | |
parent | b78f5a6705512314d6fe42fd5144c5f8e5d484ce (diff) |
CTAN sync 202003040302
Diffstat (limited to 'graphics/asymptote/webgl/vertex.glsl')
-rw-r--r-- | graphics/asymptote/webgl/vertex.glsl | 18 |
1 files changed, 7 insertions, 11 deletions
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; |