direct-volume define cleanup

src/mol-gl/renderer.ts

@@ -246,7 +246,7 @@ namespace Renderer {
             }
 
             if (r.values.dGeometryType.ref.value === 'directVolume') {
-                if (!variant.startsWith('color')) {
+                if (variant !== 'colorWboit' && variant !== 'colorBlended') {
                     return; // only color supported
                 }
 

src/mol-gl/shader-code.ts

@@ -198,7 +198,7 @@ export const MeshShaderCode = ShaderCode('mesh', mesh_vert, mesh_frag, { drawBuf
 
 import { directVolume_vert } from './shader/direct-volume.vert';
 import { directVolume_frag } from './shader/direct-volume.frag';
-export const DirectVolumeShaderCode = ShaderCode('direct-volume', directVolume_vert, directVolume_frag, { fragDepth: 'optional', drawBuffers: 'optional' });
+export const DirectVolumeShaderCode = ShaderCode('direct-volume', directVolume_vert, directVolume_frag, { fragDepth: 'optional', drawBuffers: 'optional' }, {}, ignoreDefine);
 
 import { image_vert } from './shader/image.vert';
 import { image_frag } from './shader/image.frag';

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

@@ -101,7 +101,6 @@ uniform mat4 uCartnToUnit;
     uniform sampler3D tGridTex;
 #endif
 
-#if defined(dRenderVariant_color)
 #if defined(dColorType_uniform)
     uniform vec3 uColor;
 #elif defined(dColorType_texture)
@@ -119,7 +118,6 @@ uniform mat4 uCartnToUnit;
 #ifdef dUsePalette
     uniform sampler2D tPalette;
 #endif
-#endif
 
 #if defined(dGridTexType_2d)
     vec4 textureVal(vec3 pos) {
@@ -168,7 +166,7 @@ vec3 v3m4(vec3 p, mat4 m) {
 float preFogAlphaBlended = 0.0;
 
 vec4 raymarch(vec3 startLoc, vec3 step, vec3 rayDir) {
-    #if defined(dRenderVariant_color) && !defined(dIgnoreLight)
+    #if !defined(dIgnoreLight)
         mat3 normalMatrix = transpose3(inverse3(mat3(uModelView * vTransform)));
     #endif
     mat4 cartnToUnit = uCartnToUnit * inverse4(vTransform);
@@ -249,7 +247,6 @@ vec4 raymarch(vec3 startLoc, vec3 step, vec3 rayDir) {
             }
         #endif
 
-        #if defined(dRenderVariant_color)
         vec3 vViewPosition = mvPosition.xyz;
         material.a = transferFunction(value);
 
@@ -325,7 +322,6 @@ vec4 raymarch(vec3 startLoc, vec3 step, vec3 rayDir) {
             src.rgb *= src.a;
         }
         dst = (1.0 - dst.a) * src + dst; // standard blending
-        #endif
 
         // break if the color is opaque enough
         if (dst.a > 0.95)
@@ -344,16 +340,6 @@ void main() {
     if (gl_FrontFacing)
         discard;
 
-    #ifdef dRenderVariant_marking
-        // not supported
-        discard;
-    #endif
-
-    #if defined(dRenderVariant_pick) || defined(dRenderVariant_depth)
-        // always ignore pick & depth for volume
-        discard;
-    #endif
-
     vec3 rayDir = mix(normalize(vOrigPos - uCameraPosition), uCameraDir, uIsOrtho);
     vec3 step = rayDir * uStepScale;
 
@@ -362,11 +348,9 @@ void main() {
     vec3 start = mix(uCameraPosition, vOrigPos, uIsOrtho) + (d * rayDir);
     gl_FragColor = raymarch(start, step, rayDir);
 
-    #if defined(dRenderVariant_color)
     float fragmentDepth = calcDepth((uModelView * vec4(start, 1.0)).xyz);
     float preFogAlpha = clamp(preFogAlphaBlended, 0.0, 1.0);
     bool interior = false;
     #include wboit_write
-    #endif
 }
 `;
\ No newline at end of file