diff options
author | Karl Berry <karl@freefriends.org> | 2020-03-03 22:41:44 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-03-03 22:41:44 +0000 |
commit | 8b67398a304b54846d01ad667cf1fbb6eb0245d2 (patch) | |
tree | c5e045c9d36b21c8dffece4499e2a47e5dd4df8e /Master/texmf-dist/asymptote/shaders | |
parent | f76a89d7f9fc8837ce20a63e3a29b2ba75823159 (diff) |
asymptote 2.63 support files
git-svn-id: svn://tug.org/texlive/trunk@54036 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/asymptote/shaders')
-rwxr-xr-x | Master/texmf-dist/asymptote/shaders/fragment.glsl | 20 | ||||
-rwxr-xr-x | Master/texmf-dist/asymptote/shaders/vertex.glsl | 2 |
2 files changed, 9 insertions, 13 deletions
diff --git a/Master/texmf-dist/asymptote/shaders/fragment.glsl b/Master/texmf-dist/asymptote/shaders/fragment.glsl index cdcc0b49e83..057acbc744f 100755 --- a/Master/texmf-dist/asymptote/shaders/fragment.glsl +++ b/Master/texmf-dist/asymptote/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 diff --git a/Master/texmf-dist/asymptote/shaders/vertex.glsl b/Master/texmf-dist/asymptote/shaders/vertex.glsl index 9a54d3211ca..4b2a54b9897 100755 --- a/Master/texmf-dist/asymptote/shaders/vertex.glsl +++ b/Master/texmf-dist/asymptote/shaders/vertex.glsl @@ -34,7 +34,7 @@ void main() #ifndef ORTHOGRAPHIC ViewPosition=(viewMat*v).xyz; #endif - Normal=normal*normMat; + Normal=normalize(normal*normMat); #endif #ifdef COLOR |