molstar 4.2.0 → 4.3.0

package/lib/mol-gl/shader/chunks/apply-light-color.glsl.js

@@ -6,81 +6,81 @@
  * adapted from three.js (https://github.com/mrdoob/three.js/)
  * which under the MIT License, Copyright © 2010-2021 three.js authors
  */
-export const apply_light_color = `
-#if defined(dIgnoreLight)
-    #ifdef bumpEnabled
-        if (uBumpFrequency > 0.0 && uBumpAmplitude > 0.0 && bumpiness > 0.0) {
-            material.rgb += fbm(vModelPosition * uBumpFrequency) * uBumpAmplitude * bumpiness;
-            material.rgb -= 0.5 * uBumpAmplitude * bumpiness;
-        }
-    #endif
-
-    #if defined(dRenderVariant_color)
-        material.rgb += material.rgb * emissive;
-    #endif
-
-    gl_FragColor = material;
-#else
-    #ifdef bumpEnabled
-        if (uBumpFrequency > 0.0 && uBumpAmplitude > 0.0 && bumpiness > 0.0) {
-            normal = perturbNormal(-vViewPosition, normal, fbm(vModelPosition * uBumpFrequency), (uBumpAmplitude * bumpiness) / uBumpFrequency);
-        }
-    #endif
-
-    vec4 color = material;
-
-    ReflectedLight reflectedLight = ReflectedLight(vec3(0.0), vec3(0.0), vec3(0.0), vec3(0.0));
-
-    PhysicalMaterial physicalMaterial;
-    physicalMaterial.diffuseColor = color.rgb * (1.0 - metalness);
-    #ifdef enabledFragDepth
-        physicalMaterial.roughness = min(max(roughness, 0.0525), 1.0);
-    #else
-        vec3 dxy = max(abs(dFdx(normal)), abs(dFdy(normal)));
-        float geometryRoughness = max(max(dxy.x, dxy.y), dxy.z);
-        physicalMaterial.roughness = min(max(roughness, 0.0525) + geometryRoughness, 1.0);
-    #endif
-    physicalMaterial.specularColor = mix(vec3(0.04), color.rgb, metalness);
-    physicalMaterial.specularF90 = 1.0;
-
-    GeometricContext geometry;
-    geometry.position = -vViewPosition;
-    geometry.normal = normal;
-    geometry.viewDir = normalize(vViewPosition);
-
-    IncidentLight directLight;
-    #pragma unroll_loop_start
-    for (int i = 0; i < dLightCount; ++i) {
-        directLight.direction = uLightDirection[i];
-        directLight.color = uLightColor[i] * PI; // * PI for punctual light
-        RE_Direct_Physical(directLight, geometry, physicalMaterial, reflectedLight);
-    }
-    #pragma unroll_loop_end
-
-    vec3 irradiance = uAmbientColor * PI; // * PI for punctual light
-    RE_IndirectDiffuse_Physical(irradiance, geometry, physicalMaterial, reflectedLight);
-
-    // indirect specular only metals
-    vec3 radiance = uAmbientColor * metalness;
-    vec3 iblIrradiance = uAmbientColor * metalness;
-    vec3 clearcoatRadiance = vec3(0.0);
-    RE_IndirectSpecular_Physical(radiance, iblIrradiance, clearcoatRadiance, geometry, physicalMaterial, reflectedLight);
-
-    vec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + reflectedLight.directSpecular + reflectedLight.indirectSpecular;
-    outgoingLight = clamp(outgoingLight, 0.01, 0.99); // prevents black artifacts on specular highlight with transparent background
-
-    #if defined(dRenderVariant_color)
-        outgoingLight += color.rgb * emissive;
-    #endif
-
-    gl_FragColor = vec4(outgoingLight, color.a);
-#endif
-
-#if defined(dXrayShaded_on)
-    gl_FragColor.a *= 1.0 - pow(abs(dot(normal, vec3(0.0, 0.0, 1.0))), uXrayEdgeFalloff);
-#elif defined(dXrayShaded_inverted)
-    gl_FragColor.a *= pow(abs(dot(normal, vec3(0.0, 0.0, 1.0))), uXrayEdgeFalloff);
-#endif
-
-gl_FragColor.rgb *= uExposure;
+export const apply_light_color = `
+#if defined(dIgnoreLight)
+    #ifdef bumpEnabled
+        if (uBumpFrequency > 0.0 && uBumpAmplitude > 0.0 && bumpiness > 0.0) {
+            material.rgb += fbm(vModelPosition * uBumpFrequency) * uBumpAmplitude * bumpiness;
+            material.rgb -= 0.5 * uBumpAmplitude * bumpiness;
+        }
+    #endif
+
+    #if defined(dRenderVariant_color)
+        material.rgb += material.rgb * emissive;
+    #endif
+
+    gl_FragColor = material;
+#else
+    #ifdef bumpEnabled
+        if (uBumpFrequency > 0.0 && uBumpAmplitude > 0.0 && bumpiness > 0.0) {
+            normal = perturbNormal(-vViewPosition, normal, fbm(vModelPosition * uBumpFrequency), (uBumpAmplitude * bumpiness) / uBumpFrequency);
+        }
+    #endif
+
+    vec4 color = material;
+
+    ReflectedLight reflectedLight = ReflectedLight(vec3(0.0), vec3(0.0), vec3(0.0), vec3(0.0));
+
+    PhysicalMaterial physicalMaterial;
+    physicalMaterial.diffuseColor = color.rgb * (1.0 - metalness);
+    #ifdef enabledFragDepth
+        physicalMaterial.roughness = min(max(roughness, 0.0525), 1.0);
+    #else
+        vec3 dxy = max(abs(dFdx(normal)), abs(dFdy(normal)));
+        float geometryRoughness = max(max(dxy.x, dxy.y), dxy.z);
+        physicalMaterial.roughness = min(max(roughness, 0.0525) + geometryRoughness, 1.0);
+    #endif
+    physicalMaterial.specularColor = mix(vec3(0.04), color.rgb, metalness);
+    physicalMaterial.specularF90 = 1.0;
+
+    GeometricContext geometry;
+    geometry.position = -vViewPosition;
+    geometry.normal = normal;
+    geometry.viewDir = normalize(vViewPosition);
+
+    IncidentLight directLight;
+    #pragma unroll_loop_start
+    for (int i = 0; i < dLightCount; ++i) {
+        directLight.direction = uLightDirection[i];
+        directLight.color = uLightColor[i] * PI; // * PI for punctual light
+        RE_Direct_Physical(directLight, geometry, physicalMaterial, reflectedLight);
+    }
+    #pragma unroll_loop_end
+
+    vec3 irradiance = uAmbientColor * PI; // * PI for punctual light
+    RE_IndirectDiffuse_Physical(irradiance, geometry, physicalMaterial, reflectedLight);
+
+    // indirect specular only metals
+    vec3 radiance = uAmbientColor * metalness;
+    vec3 iblIrradiance = uAmbientColor * metalness;
+    vec3 clearcoatRadiance = vec3(0.0);
+    RE_IndirectSpecular_Physical(radiance, iblIrradiance, clearcoatRadiance, geometry, physicalMaterial, reflectedLight);
+
+    vec3 outgoingLight = reflectedLight.directDiffuse + reflectedLight.indirectDiffuse + reflectedLight.directSpecular + reflectedLight.indirectSpecular;
+    outgoingLight = clamp(outgoingLight, 0.01, 0.99); // prevents black artifacts on specular highlight with transparent background
+
+    #if defined(dRenderVariant_color)
+        outgoingLight += color.rgb * emissive;
+    #endif
+
+    gl_FragColor = vec4(outgoingLight, color.a);
+#endif
+
+#if defined(dXrayShaded_on)
+    gl_FragColor.a *= 1.0 - pow(abs(dot(normal, vec3(0.0, 0.0, 1.0))), uXrayEdgeFalloff);
+#elif defined(dXrayShaded_inverted)
+    gl_FragColor.a *= pow(abs(dot(normal, vec3(0.0, 0.0, 1.0))), uXrayEdgeFalloff);
+#endif
+
+gl_FragColor.rgb *= uExposure;
 `;

package/lib/mol-gl/shader/chunks/apply-marker-color.glsl.js

@@ -1,17 +1,17 @@
-export const apply_marker_color = `
-
-#if defined(dColorMarker)
-    if (marker > 0.0) {
-        if ((uMarkerPriority == 1 && marker != 2.0) || (uMarkerPriority != 1 && marker == 1.0)) {
-            gl_FragColor.rgb = mix(gl_FragColor.rgb, uHighlightColor, uHighlightStrength);
-            gl_FragColor.a = max(gl_FragColor.a, uHighlightStrength * 0.002); // for direct-volume rendering
-        } else {
-            gl_FragColor.rgb = mix(gl_FragColor.rgb, uSelectColor, uSelectStrength);
-            gl_FragColor.a = max(gl_FragColor.a, uSelectStrength * 0.002); // for direct-volume rendering
-        }
-    } else if (uMarkerAverage > 0.0) {
-        gl_FragColor.rgb = mix(gl_FragColor.rgb, uDimColor, uDimStrength);
-        gl_FragColor.a = max(gl_FragColor.a, uDimStrength * 0.002); // for direct-volume rendering
-    }
-#endif
+export const apply_marker_color = `
+
+#if defined(dColorMarker)
+    if (marker > 0.0) {
+        if ((uMarkerPriority == 1 && marker != 2.0) || (uMarkerPriority != 1 && marker == 1.0)) {
+            gl_FragColor.rgb = mix(gl_FragColor.rgb, uHighlightColor, uHighlightStrength);
+            gl_FragColor.a = max(gl_FragColor.a, uHighlightStrength * 0.002); // for direct-volume rendering
+        } else {
+            gl_FragColor.rgb = mix(gl_FragColor.rgb, uSelectColor, uSelectStrength);
+            gl_FragColor.a = max(gl_FragColor.a, uSelectStrength * 0.002); // for direct-volume rendering
+        }
+    } else if (uMarkerAverage > 0.0) {
+        gl_FragColor.rgb = mix(gl_FragColor.rgb, uDimColor, uDimStrength);
+        gl_FragColor.a = max(gl_FragColor.a, uDimStrength * 0.002); // for direct-volume rendering
+    }
+#endif
 `;

package/lib/mol-gl/shader/chunks/assign-clipping-varying.glsl.js

@@ -1,9 +1,9 @@
-export const assign_clipping_varying = `
-#if dClipObjectCount != 0 && defined(dClipping)
-    #if defined(dClippingType_instance)
-        vClipping = readFromTexture(tClipping, aInstance, uClippingTexDim).a;
-    #elif defined(dMarkerType_groupInstance)
-        vClipping = readFromTexture(tClipping, aInstance * float(uGroupCount) + group, uClippingTexDim).a;
-    #endif
-#endif
+export const assign_clipping_varying = `
+#if dClipObjectCount != 0 && defined(dClipping)
+    #if defined(dClippingType_instance)
+        vClipping = readFromTexture(tClipping, aInstance, uClippingTexDim).a;
+    #elif defined(dMarkerType_groupInstance)
+        vClipping = readFromTexture(tClipping, aInstance * float(uGroupCount) + group, uClippingTexDim).a;
+    #endif
+#endif
 `;

package/lib/mol-gl/shader/chunks/assign-color-varying.glsl.js

@@ -1,141 +1,141 @@
-export const assign_color_varying = `
-#if defined(dRenderVariant_color)
-    #if defined(dColorType_attribute)
-        vColor.rgb = aColor;
-    #elif defined(dColorType_instance)
-        vColor.rgb = readFromTexture(tColor, aInstance, uColorTexDim).rgb;
-    #elif defined(dColorType_group)
-        #if defined(dDualColor)
-            vec4 color2;
-            if (aColorMode == 2.0) {
-                vColor.rgb = readFromTexture(tColor, group, uColorTexDim).rgb;
-            } else {
-                vColor.rgb = readFromTexture(tColor, group * 2.0, uColorTexDim).rgb;
-                color2.rgb = readFromTexture(tColor, group * 2.0 + 1.0, uColorTexDim).rgb;
-            }
-        #else
-            vColor.rgb = readFromTexture(tColor, group, uColorTexDim).rgb;
-        #endif
-    #elif defined(dColorType_groupInstance)
-        #if defined(dDualColor)
-            vec4 color2;
-            if (aColorMode == 2.0) {
-                vColor.rgb = readFromTexture(tColor, aInstance * float(uGroupCount) + group, uColorTexDim).rgb;
-            } else {
-                vColor.rgb = readFromTexture(tColor, (aInstance * float(uGroupCount) + group) * 2.0, uColorTexDim).rgb;
-                color2.rgb = readFromTexture(tColor, (aInstance * float(uGroupCount) + group) * 2.0 + 1.0, uColorTexDim).rgb;
-            }
-        #else
-            vColor.rgb = readFromTexture(tColor, aInstance * float(uGroupCount) + group, uColorTexDim).rgb;
-        #endif
-    #elif defined(dColorType_vertex)
-        vColor.rgb = readFromTexture(tColor, VertexID, uColorTexDim).rgb;
-    #elif defined(dColorType_vertexInstance)
-        vColor.rgb = readFromTexture(tColor, int(aInstance) * uVertexCount + VertexID, uColorTexDim).rgb;
-    #elif defined(dColorType_volume)
-        vec3 cgridPos = (uColorGridTransform.w * (position - uColorGridTransform.xyz)) / uColorGridDim;
-        vColor.rgb = texture3dFrom2dLinear(tColorGrid, cgridPos, uColorGridDim, uColorTexDim).rgb;
-    #elif defined(dColorType_volumeInstance)
-        vec3 cgridPos = (uColorGridTransform.w * (vModelPosition - uColorGridTransform.xyz)) / uColorGridDim;
-        vColor.rgb = texture3dFrom2dLinear(tColorGrid, cgridPos, uColorGridDim, uColorTexDim).rgb;
-    #endif
-
-    #ifdef dUsePalette
-        vPaletteV = ((vColor.r * 256.0 * 256.0 * 255.0 + vColor.g * 256.0 * 255.0 + vColor.b * 255.0) - 1.0) / 16777215.0;
-    #endif
-
-    #ifdef dOverpaint
-        #if defined(dOverpaintType_instance)
-            vOverpaint = readFromTexture(tOverpaint, aInstance, uOverpaintTexDim);
-        #elif defined(dOverpaintType_groupInstance)
-            vOverpaint = readFromTexture(tOverpaint, aInstance * float(uGroupCount) + group, uOverpaintTexDim);
-        #elif defined(dOverpaintType_vertexInstance)
-            vOverpaint = readFromTexture(tOverpaint, int(aInstance) * uVertexCount + VertexID, uOverpaintTexDim);
-        #elif defined(dOverpaintType_volumeInstance)
-            vec3 ogridPos = (uOverpaintGridTransform.w * (vModelPosition - uOverpaintGridTransform.xyz)) / uOverpaintGridDim;
-            vOverpaint = texture3dFrom2dLinear(tOverpaintGrid, ogridPos, uOverpaintGridDim, uOverpaintTexDim);
-        #endif
-
-        // pre-mix to avoid darkening due to empty overpaint
-        #ifdef dColorType_uniform
-            vOverpaint.rgb = mix(uColor.rgb, vOverpaint.rgb, vOverpaint.a);
-        #else
-            vOverpaint.rgb = mix(vColor.rgb, vOverpaint.rgb, vOverpaint.a);
-        #endif
-        vOverpaint *= uOverpaintStrength;
-    #endif
-
-    #ifdef dEmissive
-        #if defined(dEmissiveType_instance)
-            vEmissive = readFromTexture(tEmissive, aInstance, uEmissiveTexDim).a;
-        #elif defined(dEmissiveType_groupInstance)
-            vEmissive = readFromTexture(tEmissive, aInstance * float(uGroupCount) + group, uEmissiveTexDim).a;
-        #elif defined(dEmissiveType_vertexInstance)
-            vEmissive = readFromTexture(tEmissive, int(aInstance) * uVertexCount + VertexID, uEmissiveTexDim).a;
-        #elif defined(dEmissiveType_volumeInstance)
-            vec3 egridPos = (uEmissiveGridTransform.w * (vModelPosition - uEmissiveGridTransform.xyz)) / uEmissiveGridDim;
-            vEmissive = texture3dFrom2dLinear(tEmissiveGrid, egridPos, uEmissiveGridDim, uEmissiveTexDim).a;
-        #endif
-        vEmissive *= uEmissiveStrength;
-    #endif
-
-    #ifdef dSubstance
-        #if defined(dSubstanceType_instance)
-            vSubstance = readFromTexture(tSubstance, aInstance, uSubstanceTexDim);
-        #elif defined(dSubstanceType_groupInstance)
-            vSubstance = readFromTexture(tSubstance, aInstance * float(uGroupCount) + group, uSubstanceTexDim);
-        #elif defined(dSubstanceType_vertexInstance)
-            vSubstance = readFromTexture(tSubstance, int(aInstance) * uVertexCount + VertexID, uSubstanceTexDim);
-        #elif defined(dSubstanceType_volumeInstance)
-            vec3 sgridPos = (uSubstanceGridTransform.w * (vModelPosition - uSubstanceGridTransform.xyz)) / uSubstanceGridDim;
-            vSubstance = texture3dFrom2dLinear(tSubstanceGrid, sgridPos, uSubstanceGridDim, uSubstanceTexDim);
-        #endif
-
-        // pre-mix to avoid artifacts due to empty substance
-        vSubstance.rgb = mix(vec3(uMetalness, uRoughness, uBumpiness), vSubstance.rgb, vSubstance.a);
-        vSubstance *= uSubstanceStrength;
-    #endif
-#elif defined(dRenderVariant_emissive)
-    #ifdef dEmissive
-        #if defined(dEmissiveType_instance)
-            vEmissive = readFromTexture(tEmissive, aInstance, uEmissiveTexDim).a;
-        #elif defined(dEmissiveType_groupInstance)
-            vEmissive = readFromTexture(tEmissive, aInstance * float(uGroupCount) + group, uEmissiveTexDim).a;
-        #elif defined(dEmissiveType_vertexInstance)
-            vEmissive = readFromTexture(tEmissive, int(aInstance) * uVertexCount + VertexID, uEmissiveTexDim).a;
-        #elif defined(dEmissiveType_volumeInstance)
-            vec3 egridPos = (uEmissiveGridTransform.w * (vModelPosition - uEmissiveGridTransform.xyz)) / uEmissiveGridDim;
-            vEmissive = texture3dFrom2dLinear(tEmissiveGrid, egridPos, uEmissiveGridDim, uEmissiveTexDim).a;
-        #endif
-        vEmissive *= uEmissiveStrength;
-    #endif
-#elif defined(dRenderVariant_pick)
-    #ifdef requiredDrawBuffers
-        vObject = vec4(packIntToRGB(float(uObjectId)), 1.0);
-        vInstance = vec4(packIntToRGB(aInstance), 1.0);
-        vGroup = vec4(packIntToRGB(group), 1.0);
-    #else
-        if (uPickType == 1) {
-            vColor = vec4(packIntToRGB(float(uObjectId)), 1.0);
-        } else if (uPickType == 2) {
-            vColor = vec4(packIntToRGB(aInstance), 1.0);
-        } else {
-            vColor = vec4(packIntToRGB(group), 1.0);
-        }
-    #endif
-#endif
-
-#ifdef dTransparency
-    #if defined(dTransparencyType_instance)
-        vTransparency = readFromTexture(tTransparency, aInstance, uTransparencyTexDim).a;
-    #elif defined(dTransparencyType_groupInstance)
-        vTransparency = readFromTexture(tTransparency, aInstance * float(uGroupCount) + group, uTransparencyTexDim).a;
-    #elif defined(dTransparencyType_vertexInstance)
-        vTransparency = readFromTexture(tTransparency, int(aInstance) * uVertexCount + VertexID, uTransparencyTexDim).a;
-    #elif defined(dTransparencyType_volumeInstance)
-        vec3 tgridPos = (uTransparencyGridTransform.w * (vModelPosition - uTransparencyGridTransform.xyz)) / uTransparencyGridDim;
-        vTransparency = texture3dFrom2dLinear(tTransparencyGrid, tgridPos, uTransparencyGridDim, uTransparencyTexDim).a;
-    #endif
-    vTransparency *= uTransparencyStrength;
-#endif
+export const assign_color_varying = `
+#if defined(dRenderVariant_color)
+    #if defined(dColorType_attribute)
+        vColor.rgb = aColor;
+    #elif defined(dColorType_instance)
+        vColor.rgb = readFromTexture(tColor, aInstance, uColorTexDim).rgb;
+    #elif defined(dColorType_group)
+        #if defined(dDualColor)
+            vec4 color2;
+            if (aColorMode == 2.0) {
+                vColor.rgb = readFromTexture(tColor, group, uColorTexDim).rgb;
+            } else {
+                vColor.rgb = readFromTexture(tColor, group * 2.0, uColorTexDim).rgb;
+                color2.rgb = readFromTexture(tColor, group * 2.0 + 1.0, uColorTexDim).rgb;
+            }
+        #else
+            vColor.rgb = readFromTexture(tColor, group, uColorTexDim).rgb;
+        #endif
+    #elif defined(dColorType_groupInstance)
+        #if defined(dDualColor)
+            vec4 color2;
+            if (aColorMode == 2.0) {
+                vColor.rgb = readFromTexture(tColor, aInstance * float(uGroupCount) + group, uColorTexDim).rgb;
+            } else {
+                vColor.rgb = readFromTexture(tColor, (aInstance * float(uGroupCount) + group) * 2.0, uColorTexDim).rgb;
+                color2.rgb = readFromTexture(tColor, (aInstance * float(uGroupCount) + group) * 2.0 + 1.0, uColorTexDim).rgb;
+            }
+        #else
+            vColor.rgb = readFromTexture(tColor, aInstance * float(uGroupCount) + group, uColorTexDim).rgb;
+        #endif
+    #elif defined(dColorType_vertex)
+        vColor.rgb = readFromTexture(tColor, VertexID, uColorTexDim).rgb;
+    #elif defined(dColorType_vertexInstance)
+        vColor.rgb = readFromTexture(tColor, int(aInstance) * uVertexCount + VertexID, uColorTexDim).rgb;
+    #elif defined(dColorType_volume)
+        vec3 cgridPos = (uColorGridTransform.w * (position - uColorGridTransform.xyz)) / uColorGridDim;
+        vColor.rgb = texture3dFrom2dLinear(tColorGrid, cgridPos, uColorGridDim, uColorTexDim).rgb;
+    #elif defined(dColorType_volumeInstance)
+        vec3 cgridPos = (uColorGridTransform.w * (vModelPosition - uColorGridTransform.xyz)) / uColorGridDim;
+        vColor.rgb = texture3dFrom2dLinear(tColorGrid, cgridPos, uColorGridDim, uColorTexDim).rgb;
+    #endif
+
+    #ifdef dUsePalette
+        vPaletteV = ((vColor.r * 256.0 * 256.0 * 255.0 + vColor.g * 256.0 * 255.0 + vColor.b * 255.0) - 1.0) / 16777215.0;
+    #endif
+
+    #ifdef dOverpaint
+        #if defined(dOverpaintType_instance)
+            vOverpaint = readFromTexture(tOverpaint, aInstance, uOverpaintTexDim);
+        #elif defined(dOverpaintType_groupInstance)
+            vOverpaint = readFromTexture(tOverpaint, aInstance * float(uGroupCount) + group, uOverpaintTexDim);
+        #elif defined(dOverpaintType_vertexInstance)
+            vOverpaint = readFromTexture(tOverpaint, int(aInstance) * uVertexCount + VertexID, uOverpaintTexDim);
+        #elif defined(dOverpaintType_volumeInstance)
+            vec3 ogridPos = (uOverpaintGridTransform.w * (vModelPosition - uOverpaintGridTransform.xyz)) / uOverpaintGridDim;
+            vOverpaint = texture3dFrom2dLinear(tOverpaintGrid, ogridPos, uOverpaintGridDim, uOverpaintTexDim);
+        #endif
+
+        // pre-mix to avoid darkening due to empty overpaint
+        #ifdef dColorType_uniform
+            vOverpaint.rgb = mix(uColor.rgb, vOverpaint.rgb, vOverpaint.a);
+        #else
+            vOverpaint.rgb = mix(vColor.rgb, vOverpaint.rgb, vOverpaint.a);
+        #endif
+        vOverpaint *= uOverpaintStrength;
+    #endif
+
+    #ifdef dEmissive
+        #if defined(dEmissiveType_instance)
+            vEmissive = readFromTexture(tEmissive, aInstance, uEmissiveTexDim).a;
+        #elif defined(dEmissiveType_groupInstance)
+            vEmissive = readFromTexture(tEmissive, aInstance * float(uGroupCount) + group, uEmissiveTexDim).a;
+        #elif defined(dEmissiveType_vertexInstance)
+            vEmissive = readFromTexture(tEmissive, int(aInstance) * uVertexCount + VertexID, uEmissiveTexDim).a;
+        #elif defined(dEmissiveType_volumeInstance)
+            vec3 egridPos = (uEmissiveGridTransform.w * (vModelPosition - uEmissiveGridTransform.xyz)) / uEmissiveGridDim;
+            vEmissive = texture3dFrom2dLinear(tEmissiveGrid, egridPos, uEmissiveGridDim, uEmissiveTexDim).a;
+        #endif
+        vEmissive *= uEmissiveStrength;
+    #endif
+
+    #ifdef dSubstance
+        #if defined(dSubstanceType_instance)
+            vSubstance = readFromTexture(tSubstance, aInstance, uSubstanceTexDim);
+        #elif defined(dSubstanceType_groupInstance)
+            vSubstance = readFromTexture(tSubstance, aInstance * float(uGroupCount) + group, uSubstanceTexDim);
+        #elif defined(dSubstanceType_vertexInstance)
+            vSubstance = readFromTexture(tSubstance, int(aInstance) * uVertexCount + VertexID, uSubstanceTexDim);
+        #elif defined(dSubstanceType_volumeInstance)
+            vec3 sgridPos = (uSubstanceGridTransform.w * (vModelPosition - uSubstanceGridTransform.xyz)) / uSubstanceGridDim;
+            vSubstance = texture3dFrom2dLinear(tSubstanceGrid, sgridPos, uSubstanceGridDim, uSubstanceTexDim);
+        #endif
+
+        // pre-mix to avoid artifacts due to empty substance
+        vSubstance.rgb = mix(vec3(uMetalness, uRoughness, uBumpiness), vSubstance.rgb, vSubstance.a);
+        vSubstance *= uSubstanceStrength;
+    #endif
+#elif defined(dRenderVariant_emissive)
+    #ifdef dEmissive
+        #if defined(dEmissiveType_instance)
+            vEmissive = readFromTexture(tEmissive, aInstance, uEmissiveTexDim).a;
+        #elif defined(dEmissiveType_groupInstance)
+            vEmissive = readFromTexture(tEmissive, aInstance * float(uGroupCount) + group, uEmissiveTexDim).a;
+        #elif defined(dEmissiveType_vertexInstance)
+            vEmissive = readFromTexture(tEmissive, int(aInstance) * uVertexCount + VertexID, uEmissiveTexDim).a;
+        #elif defined(dEmissiveType_volumeInstance)
+            vec3 egridPos = (uEmissiveGridTransform.w * (vModelPosition - uEmissiveGridTransform.xyz)) / uEmissiveGridDim;
+            vEmissive = texture3dFrom2dLinear(tEmissiveGrid, egridPos, uEmissiveGridDim, uEmissiveTexDim).a;
+        #endif
+        vEmissive *= uEmissiveStrength;
+    #endif
+#elif defined(dRenderVariant_pick)
+    #ifdef requiredDrawBuffers
+        vObject = vec4(packIntToRGB(float(uObjectId)), 1.0);
+        vInstance = vec4(packIntToRGB(aInstance), 1.0);
+        vGroup = vec4(packIntToRGB(group), 1.0);
+    #else
+        if (uPickType == 1) {
+            vColor = vec4(packIntToRGB(float(uObjectId)), 1.0);
+        } else if (uPickType == 2) {
+            vColor = vec4(packIntToRGB(aInstance), 1.0);
+        } else {
+            vColor = vec4(packIntToRGB(group), 1.0);
+        }
+    #endif
+#endif
+
+#ifdef dTransparency
+    #if defined(dTransparencyType_instance)
+        vTransparency = readFromTexture(tTransparency, aInstance, uTransparencyTexDim).a;
+    #elif defined(dTransparencyType_groupInstance)
+        vTransparency = readFromTexture(tTransparency, aInstance * float(uGroupCount) + group, uTransparencyTexDim).a;
+    #elif defined(dTransparencyType_vertexInstance)
+        vTransparency = readFromTexture(tTransparency, int(aInstance) * uVertexCount + VertexID, uTransparencyTexDim).a;
+    #elif defined(dTransparencyType_volumeInstance)
+        vec3 tgridPos = (uTransparencyGridTransform.w * (vModelPosition - uTransparencyGridTransform.xyz)) / uTransparencyGridDim;
+        vTransparency = texture3dFrom2dLinear(tTransparencyGrid, tgridPos, uTransparencyGridDim, uTransparencyTexDim).a;
+    #endif
+    vTransparency *= uTransparencyStrength;
+#endif
 `;

package/lib/mol-gl/shader/chunks/assign-group.glsl.js

@@ -1,7 +1,7 @@
-export const assign_group = `
-#ifdef dGeometryType_textureMesh
-    float group = unpackRGBToInt(readFromTexture(tGroup, VertexID, uGeoTexDim).rgb);
-#else
-    float group = aGroup;
-#endif
+export const assign_group = `
+#ifdef dGeometryType_textureMesh
+    float group = unpackRGBToInt(readFromTexture(tGroup, VertexID, uGeoTexDim).rgb);
+#else
+    float group = aGroup;
+#endif
 `;

package/lib/mol-gl/shader/chunks/assign-marker-varying.glsl.js

@@ -1,9 +1,9 @@
-export const assign_marker_varying = `
-#if defined(dNeedsMarker)
-    #if defined(dMarkerType_instance)
-        vMarker = readFromTexture(tMarker, aInstance, uMarkerTexDim).a;
-    #elif defined(dMarkerType_groupInstance)
-        vMarker = readFromTexture(tMarker, aInstance * float(uGroupCount) + group, uMarkerTexDim).a;
-    #endif
-#endif
+export const assign_marker_varying = `
+#if defined(dNeedsMarker)
+    #if defined(dMarkerType_instance)
+        vMarker = readFromTexture(tMarker, aInstance, uMarkerTexDim).a;
+    #elif defined(dMarkerType_groupInstance)
+        vMarker = readFromTexture(tMarker, aInstance * float(uGroupCount) + group, uMarkerTexDim).a;
+    #endif
+#endif
 `;