fix xrayShader & ignoreLight not working together

CHANGELOG.md

@@ -6,6 +6,8 @@ Note that since we don't clearly distinguish between a public and private interf
 
 ## [Unreleased]
 
+- Fix xrayShader & ignoreLight not working at the same time
+
 ## [v3.0.2] - 2022-01-30
 
 - Fix color smoothing of elongated structures (by fixing ``Sphere.expand`` for spheres with highly directional extrema)

src/mol-gl/shader/chunks/apply-light-color.glsl.ts

 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  *
@@ -8,6 +8,9 @@
  */
 
 export const apply_light_color = `
+#ifdef dIgnoreLight
+    gl_FragColor = material;
+#else
     #ifdef bumpEnabled
         if (uBumpFrequency > 0.0 && uBumpAmplitude > 0.0) {
             vec3 bumpNormal = perturbNormal(-vViewPosition, normal, fbm(vModelPosition * uBumpFrequency), (uBumpAmplitude * bumpiness) / uBumpFrequency);
@@ -63,6 +66,7 @@ RE_IndirectSpecular_Physical(radiance, iblIrradiance, clearcoatRadiance, geometr
     vec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + reflectedLight.directSpecular + reflectedLight.indirectSpecular;
 
     gl_FragColor = vec4(outgoingLight, color.a);
+#endif
 
 #ifdef dXrayShaded
     gl_FragColor.a *= 1.0 - pow(abs(dot(normal, vec3(0.0, 0.0, 1.0))), uXrayEdgeFalloff);

src/mol-gl/shader/cylinders.frag.ts

 /**
- * Copyright (c) 2020-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -127,13 +127,9 @@ void main() {
     #elif defined(dRenderVariant_marking)
         gl_FragColor = material;
     #elif defined(dRenderVariant_color)
-        #ifdef dIgnoreLight
-            gl_FragColor = material;
-        #else
         mat3 normalMatrix = transpose3(inverse3(mat3(uView)));
         vec3 normal = normalize(normalMatrix * -normalize(intersection.yzw));
         #include apply_light_color
-        #endif
 
         #include apply_interior_color
         #include apply_marker_color

src/mol-gl/shader/direct-volume.frag.ts

 /**
- * Copyright (c) 2017-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Michael Krone <michael.krone@uni-tuebingen.de>
@@ -166,9 +166,7 @@ vec3 v3m4(vec3 p, mat4 m) {
 float preFogAlphaBlended = 0.0;
 
 vec4 raymarch(vec3 startLoc, vec3 step, vec3 rayDir) {
-    #if !defined(dIgnoreLight)
     mat3 normalMatrix = transpose3(inverse3(mat3(uModelView * vTransform)));
-    #endif
     mat4 cartnToUnit = uCartnToUnit * inverse4(vTransform);
     #if defined(dClipVariant_pixel) && dClipObjectCount != 0
         mat4 modelTransform = uModel * vTransform * uTransform;
@@ -296,9 +294,6 @@ vec4 raymarch(vec3 startLoc, vec3 step, vec3 rayDir) {
             material.rgb = mix(material.rgb, overpaint.rgb, overpaint.a);
         #endif
 
-        #ifdef dIgnoreLight
-            gl_FragColor.rgb = material.rgb;
-        #else
         if (material.a >= 0.01) {
             #ifdef dPackedGroup
                 // compute gradient by central differences
@@ -313,7 +308,6 @@ vec4 raymarch(vec3 startLoc, vec3 step, vec3 rayDir) {
         } else {
             gl_FragColor.rgb = material.rgb;
         }
-        #endif
 
         gl_FragColor.a = material.a * uAlpha * uTransferScale;
 

src/mol-gl/shader/mesh.frag.ts

 /**
- * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -43,9 +43,6 @@ void main() {
     #elif defined(dRenderVariant_marking)
         gl_FragColor = material;
     #elif defined(dRenderVariant_color)
-        #ifdef dIgnoreLight
-            gl_FragColor = material;
-        #else
         #if defined(dFlatShaded)
             vec3 normal = -faceNormal;
         #else
@@ -53,7 +50,6 @@ void main() {
             if (uDoubleSided) normal *= float(frontFacing) * 2.0 - 1.0;
         #endif
         #include apply_light_color
-        #endif
 
         #include apply_interior_color
         #include apply_marker_color

src/mol-gl/shader/spheres.frag.ts

 /**
- * Copyright (c) 2019-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -92,12 +92,8 @@ void main(void){
     #elif defined(dRenderVariant_marking)
         gl_FragColor = material;
     #elif defined(dRenderVariant_color)
-        #ifdef dIgnoreLight
-            gl_FragColor = material;
-        #else
         vec3 normal = -cameraNormal;
         #include apply_light_color
-        #endif
 
         #include apply_interior_color
         #include apply_marker_color