molstar 4.0.1 → 4.2.0

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

@@ -1,113 +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 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_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
 `;

package/lib/mol-gl/shader/chunks/assign-material-color.glsl.d.ts

@@ -1 +1 @@
-export declare const assign_material_color = "\n#if defined(dNeedsMarker)\n    float marker = uMarker;\n    if (uMarker == -1.0) {\n        marker = floor(vMarker * 255.0 + 0.5); // rounding required to work on some cards on win\n    }\n#endif\n\n#if defined(dRenderVariant_color)\n    #if defined(dUsePalette)\n        vec4 material = vec4(texture2D(tPalette, vec2(vPaletteV, 0.5)).rgb, uAlpha);\n    #elif defined(dColorType_uniform)\n        vec4 material = vec4(uColor, uAlpha);\n    #elif defined(dColorType_varying)\n        vec4 material = vec4(vColor.rgb, uAlpha);\n    #endif\n\n    // mix material with overpaint\n    #if defined(dOverpaint)\n        material.rgb = mix(material.rgb, vOverpaint.rgb, vOverpaint.a);\n    #endif\n\n    float metalness = uMetalness;\n    float roughness = uRoughness;\n    float bumpiness = uBumpiness;\n    #ifdef dSubstance\n        metalness = mix(metalness, vSubstance.r, vSubstance.a);\n        roughness = mix(roughness, vSubstance.g, vSubstance.a);\n        bumpiness = mix(bumpiness, vSubstance.b, vSubstance.a);\n    #endif\n#elif defined(dRenderVariant_depth)\n    if (fragmentDepth > getDepth(gl_FragCoord.xy / uDrawingBufferSize)) {\n        discard;\n    }\n\n    #ifndef dXrayShaded\n        #if defined(dTransparency)\n            float dta = 1.0 - vTransparency;\n            if (vTransparency < 0.2) dta = 1.0; // hard cutoff looks better\n\n            if (uRenderMask == MaskTransparent && uAlpha * dta == 1.0) {\n                discard;\n            } else if (uRenderMask == MaskOpaque && uAlpha * dta < 1.0) {\n                discard;\n            }\n        #else\n            if (uRenderMask == MaskTransparent && uAlpha == 1.0) {\n                discard;\n            } else if (uRenderMask == MaskOpaque && uAlpha < 1.0) {\n                discard;\n            }\n        #endif\n    #else\n        if (uRenderMask == MaskOpaque) {\n            discard;\n        }\n    #endif\n\n    vec4 material = packDepthToRGBA(fragmentDepth);\n#elif defined(dRenderVariant_marking)\n    vec4 material;\n    if(uMarkingType == 1) {\n        if (marker > 0.0)\n            discard;\n        #ifdef enabledFragDepth\n            material = packDepthToRGBA(gl_FragDepthEXT);\n        #else\n            material = packDepthToRGBA(gl_FragCoord.z);\n        #endif\n    } else {\n        if (marker == 0.0)\n            discard;\n        float depthTest = 1.0;\n        if (uMarkingDepthTest) {\n            depthTest = (fragmentDepth >= getDepthPacked(gl_FragCoord.xy / uDrawingBufferSize)) ? 1.0 : 0.0;\n        }\n        bool isHighlight = intMod(marker, 2.0) > 0.1;\n        float viewZ = depthToViewZ(uIsOrtho, fragmentDepth, uNear, uFar);\n        float fogFactor = smoothstep(uFogNear, uFogFar, abs(viewZ));\n        if (fogFactor == 1.0)\n            discard;\n        material = vec4(0.0, depthTest, isHighlight ? 1.0 : 0.0, 1.0 - fogFactor);\n    }\n#endif\n\n// apply per-group transparency\n#if defined(dTransparency) && (defined(dRenderVariant_pick) || defined(dRenderVariant_color))\n    float ta = 1.0 - vTransparency;\n    if (vTransparency < 0.09) ta = 1.0; // hard cutoff looks better\n\n    #if defined(dRenderVariant_pick)\n        if (ta < uPickingAlphaThreshold)\n            discard; // ignore so the element below can be picked\n    #elif defined(dRenderVariant_color)\n        material.a *= ta;\n\n        #if defined(dRenderVariant_colorBlended)\n            #if defined(dTransparentBackfaces_off)\n                if ((uRenderMask == MaskOpaque && material.a < 1.0) ||\n                    (uRenderMask == MaskTransparent && material.a == 1.0) ||\n                    (interior && material.a < 1.0)\n                ) {\n                    discard;\n                }\n            #elif defined(dTransparentBackfaces_on)\n                if ((uRenderMask == MaskOpaque && material.a < 1.0) ||\n                    (uRenderMask == MaskTransparent && material.a == 1.0)\n                ) {\n                    discard;\n                }\n            #elif defined(dTransparentBackfaces_opaque)\n                if (interior) {\n                    material.a = 1.0;\n                } else if (\n                    (uRenderMask == MaskOpaque && material.a < 1.0) ||\n                    (uRenderMask == MaskTransparent && material.a == 1.0)\n                ) {\n                    discard;\n                }\n            #endif\n        #endif\n    #endif\n#endif\n";
+export declare const assign_material_color = "\n#if defined(dNeedsMarker)\n    float marker = uMarker;\n    if (uMarker == -1.0) {\n        marker = floor(vMarker * 255.0 + 0.5); // rounding required to work on some cards on win\n    }\n#endif\n\n#if defined(dRenderVariant_color)\n    #if defined(dUsePalette)\n        vec4 material = vec4(texture2D(tPalette, vec2(vPaletteV, 0.5)).rgb, uAlpha);\n    #elif defined(dColorType_uniform)\n        vec4 material = vec4(uColor, uAlpha);\n    #elif defined(dColorType_varying)\n        vec4 material = vec4(vColor.rgb, uAlpha);\n    #endif\n\n    // mix material with overpaint\n    #if defined(dOverpaint)\n        material.rgb = mix(material.rgb, vOverpaint.rgb, vOverpaint.a);\n    #endif\n\n    float emissive = uEmissive;\n    #ifdef dEmissive\n        emissive += vEmissive;\n    #endif\n\n    float metalness = uMetalness;\n    float roughness = uRoughness;\n    float bumpiness = uBumpiness;\n    #ifdef dSubstance\n        float sf = clamp(vSubstance.a, 0.0, 0.99); // clamp to avoid artifacts\n        metalness = mix(metalness, vSubstance.r, sf);\n        roughness = mix(roughness, vSubstance.g, sf);\n        bumpiness = mix(bumpiness, vSubstance.b, sf);\n    #endif\n#elif defined(dRenderVariant_depth)\n    if (fragmentDepth > getDepth(gl_FragCoord.xy / uDrawingBufferSize)) {\n        discard;\n    }\n\n    #ifndef dXrayShaded\n        #if defined(dTransparency)\n            float dta = 1.0 - vTransparency;\n            if (vTransparency < 0.2) dta = 1.0; // hard cutoff looks better\n\n            if (uRenderMask == MaskTransparent && uAlpha * dta == 1.0) {\n                discard;\n            } else if (uRenderMask == MaskOpaque && uAlpha * dta < 1.0) {\n                discard;\n            }\n        #else\n            if (uRenderMask == MaskTransparent && uAlpha == 1.0) {\n                discard;\n            } else if (uRenderMask == MaskOpaque && uAlpha < 1.0) {\n                discard;\n            }\n        #endif\n    #else\n        if (uRenderMask == MaskOpaque) {\n            discard;\n        }\n    #endif\n\n    vec4 material = packDepthToRGBA(fragmentDepth);\n#elif defined(dRenderVariant_marking)\n    vec4 material;\n    if(uMarkingType == 1) {\n        if (marker > 0.0)\n            discard;\n        #ifdef enabledFragDepth\n            material = packDepthToRGBA(gl_FragDepthEXT);\n        #else\n            material = packDepthToRGBA(gl_FragCoord.z);\n        #endif\n    } else {\n        if (marker == 0.0)\n            discard;\n        float depthTest = 1.0;\n        if (uMarkingDepthTest) {\n            depthTest = (fragmentDepth >= getDepthPacked(gl_FragCoord.xy / uDrawingBufferSize)) ? 1.0 : 0.0;\n        }\n        bool isHighlight = intMod(marker, 2.0) > 0.1;\n        float viewZ = depthToViewZ(uIsOrtho, fragmentDepth, uNear, uFar);\n        float fogFactor = smoothstep(uFogNear, uFogFar, abs(viewZ));\n        if (fogFactor == 1.0)\n            discard;\n        material = vec4(0.0, depthTest, isHighlight ? 1.0 : 0.0, 1.0 - fogFactor);\n    }\n#elif defined(dRenderVariant_emissive)\n    float emissive = uEmissive;\n    #ifdef dEmissive\n        emissive += vEmissive;\n    #endif\n    vec4 material = vec4(emissive);\n#endif\n\n// apply per-group transparency\n#if defined(dTransparency) && (defined(dRenderVariant_pick) || defined(dRenderVariant_color) || defined(dRenderVariant_emissive))\n    float ta = 1.0 - vTransparency;\n    if (vTransparency < 0.09) ta = 1.0; // hard cutoff looks better\n\n    #if defined(dRenderVariant_pick)\n        if (ta * uAlpha < uPickingAlphaThreshold)\n            discard; // ignore so the element below can be picked\n    #elif defined(dRenderVariant_emissive)\n        if (ta < 1.0)\n            discard; // emissive not supported with transparency\n    #elif defined(dRenderVariant_color)\n        material.a *= ta;\n    #endif\n#endif\n";

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

@@ -1,124 +1,113 @@
-export const assign_material_color = `
-#if defined(dNeedsMarker)
-    float marker = uMarker;
-    if (uMarker == -1.0) {
-        marker = floor(vMarker * 255.0 + 0.5); // rounding required to work on some cards on win
-    }
-#endif
-
-#if defined(dRenderVariant_color)
-    #if defined(dUsePalette)
-        vec4 material = vec4(texture2D(tPalette, vec2(vPaletteV, 0.5)).rgb, uAlpha);
-    #elif defined(dColorType_uniform)
-        vec4 material = vec4(uColor, uAlpha);
-    #elif defined(dColorType_varying)
-        vec4 material = vec4(vColor.rgb, uAlpha);
-    #endif
-
-    // mix material with overpaint
-    #if defined(dOverpaint)
-        material.rgb = mix(material.rgb, vOverpaint.rgb, vOverpaint.a);
-    #endif
-
-    float metalness = uMetalness;
-    float roughness = uRoughness;
-    float bumpiness = uBumpiness;
-    #ifdef dSubstance
-        metalness = mix(metalness, vSubstance.r, vSubstance.a);
-        roughness = mix(roughness, vSubstance.g, vSubstance.a);
-        bumpiness = mix(bumpiness, vSubstance.b, vSubstance.a);
-    #endif
-#elif defined(dRenderVariant_depth)
-    if (fragmentDepth > getDepth(gl_FragCoord.xy / uDrawingBufferSize)) {
-        discard;
-    }
-
-    #ifndef dXrayShaded
-        #if defined(dTransparency)
-            float dta = 1.0 - vTransparency;
-            if (vTransparency < 0.2) dta = 1.0; // hard cutoff looks better
-
-            if (uRenderMask == MaskTransparent && uAlpha * dta == 1.0) {
-                discard;
-            } else if (uRenderMask == MaskOpaque && uAlpha * dta < 1.0) {
-                discard;
-            }
-        #else
-            if (uRenderMask == MaskTransparent && uAlpha == 1.0) {
-                discard;
-            } else if (uRenderMask == MaskOpaque && uAlpha < 1.0) {
-                discard;
-            }
-        #endif
-    #else
-        if (uRenderMask == MaskOpaque) {
-            discard;
-        }
-    #endif
-
-    vec4 material = packDepthToRGBA(fragmentDepth);
-#elif defined(dRenderVariant_marking)
-    vec4 material;
-    if(uMarkingType == 1) {
-        if (marker > 0.0)
-            discard;
-        #ifdef enabledFragDepth
-            material = packDepthToRGBA(gl_FragDepthEXT);
-        #else
-            material = packDepthToRGBA(gl_FragCoord.z);
-        #endif
-    } else {
-        if (marker == 0.0)
-            discard;
-        float depthTest = 1.0;
-        if (uMarkingDepthTest) {
-            depthTest = (fragmentDepth >= getDepthPacked(gl_FragCoord.xy / uDrawingBufferSize)) ? 1.0 : 0.0;
-        }
-        bool isHighlight = intMod(marker, 2.0) > 0.1;
-        float viewZ = depthToViewZ(uIsOrtho, fragmentDepth, uNear, uFar);
-        float fogFactor = smoothstep(uFogNear, uFogFar, abs(viewZ));
-        if (fogFactor == 1.0)
-            discard;
-        material = vec4(0.0, depthTest, isHighlight ? 1.0 : 0.0, 1.0 - fogFactor);
-    }
-#endif
-
-// apply per-group transparency
-#if defined(dTransparency) && (defined(dRenderVariant_pick) || defined(dRenderVariant_color))
-    float ta = 1.0 - vTransparency;
-    if (vTransparency < 0.09) ta = 1.0; // hard cutoff looks better
-
-    #if defined(dRenderVariant_pick)
-        if (ta < uPickingAlphaThreshold)
-            discard; // ignore so the element below can be picked
-    #elif defined(dRenderVariant_color)
-        material.a *= ta;
-
-        #if defined(dRenderVariant_colorBlended)
-            #if defined(dTransparentBackfaces_off)
-                if ((uRenderMask == MaskOpaque && material.a < 1.0) ||
-                    (uRenderMask == MaskTransparent && material.a == 1.0) ||
-                    (interior && material.a < 1.0)
-                ) {
-                    discard;
-                }
-            #elif defined(dTransparentBackfaces_on)
-                if ((uRenderMask == MaskOpaque && material.a < 1.0) ||
-                    (uRenderMask == MaskTransparent && material.a == 1.0)
-                ) {
-                    discard;
-                }
-            #elif defined(dTransparentBackfaces_opaque)
-                if (interior) {
-                    material.a = 1.0;
-                } else if (
-                    (uRenderMask == MaskOpaque && material.a < 1.0) ||
-                    (uRenderMask == MaskTransparent && material.a == 1.0)
-                ) {
-                    discard;
-                }
-            #endif
-        #endif
-    #endif
-#endif
+export const assign_material_color = `
+#if defined(dNeedsMarker)
+    float marker = uMarker;
+    if (uMarker == -1.0) {
+        marker = floor(vMarker * 255.0 + 0.5); // rounding required to work on some cards on win
+    }
+#endif
+
+#if defined(dRenderVariant_color)
+    #if defined(dUsePalette)
+        vec4 material = vec4(texture2D(tPalette, vec2(vPaletteV, 0.5)).rgb, uAlpha);
+    #elif defined(dColorType_uniform)
+        vec4 material = vec4(uColor, uAlpha);
+    #elif defined(dColorType_varying)
+        vec4 material = vec4(vColor.rgb, uAlpha);
+    #endif
+
+    // mix material with overpaint
+    #if defined(dOverpaint)
+        material.rgb = mix(material.rgb, vOverpaint.rgb, vOverpaint.a);
+    #endif
+
+    float emissive = uEmissive;
+    #ifdef dEmissive
+        emissive += vEmissive;
+    #endif
+
+    float metalness = uMetalness;
+    float roughness = uRoughness;
+    float bumpiness = uBumpiness;
+    #ifdef dSubstance
+        float sf = clamp(vSubstance.a, 0.0, 0.99); // clamp to avoid artifacts
+        metalness = mix(metalness, vSubstance.r, sf);
+        roughness = mix(roughness, vSubstance.g, sf);
+        bumpiness = mix(bumpiness, vSubstance.b, sf);
+    #endif
+#elif defined(dRenderVariant_depth)
+    if (fragmentDepth > getDepth(gl_FragCoord.xy / uDrawingBufferSize)) {
+        discard;
+    }
+
+    #ifndef dXrayShaded
+        #if defined(dTransparency)
+            float dta = 1.0 - vTransparency;
+            if (vTransparency < 0.2) dta = 1.0; // hard cutoff looks better
+
+            if (uRenderMask == MaskTransparent && uAlpha * dta == 1.0) {
+                discard;
+            } else if (uRenderMask == MaskOpaque && uAlpha * dta < 1.0) {
+                discard;
+            }
+        #else
+            if (uRenderMask == MaskTransparent && uAlpha == 1.0) {
+                discard;
+            } else if (uRenderMask == MaskOpaque && uAlpha < 1.0) {
+                discard;
+            }
+        #endif
+    #else
+        if (uRenderMask == MaskOpaque) {
+            discard;
+        }
+    #endif
+
+    vec4 material = packDepthToRGBA(fragmentDepth);
+#elif defined(dRenderVariant_marking)
+    vec4 material;
+    if(uMarkingType == 1) {
+        if (marker > 0.0)
+            discard;
+        #ifdef enabledFragDepth
+            material = packDepthToRGBA(gl_FragDepthEXT);
+        #else
+            material = packDepthToRGBA(gl_FragCoord.z);
+        #endif
+    } else {
+        if (marker == 0.0)
+            discard;
+        float depthTest = 1.0;
+        if (uMarkingDepthTest) {
+            depthTest = (fragmentDepth >= getDepthPacked(gl_FragCoord.xy / uDrawingBufferSize)) ? 1.0 : 0.0;
+        }
+        bool isHighlight = intMod(marker, 2.0) > 0.1;
+        float viewZ = depthToViewZ(uIsOrtho, fragmentDepth, uNear, uFar);
+        float fogFactor = smoothstep(uFogNear, uFogFar, abs(viewZ));
+        if (fogFactor == 1.0)
+            discard;
+        material = vec4(0.0, depthTest, isHighlight ? 1.0 : 0.0, 1.0 - fogFactor);
+    }
+#elif defined(dRenderVariant_emissive)
+    float emissive = uEmissive;
+    #ifdef dEmissive
+        emissive += vEmissive;
+    #endif
+    vec4 material = vec4(emissive);
+#endif
+
+// apply per-group transparency
+#if defined(dTransparency) && (defined(dRenderVariant_pick) || defined(dRenderVariant_color) || defined(dRenderVariant_emissive))
+    float ta = 1.0 - vTransparency;
+    if (vTransparency < 0.09) ta = 1.0; // hard cutoff looks better
+
+    #if defined(dRenderVariant_pick)
+        if (ta * uAlpha < uPickingAlphaThreshold)
+            discard; // ignore so the element below can be picked
+    #elif defined(dRenderVariant_emissive)
+        if (ta < 1.0)
+            discard; // emissive not supported with transparency
+    #elif defined(dRenderVariant_color)
+        material.a *= ta;
+    #endif
+#endif
 `;

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

@@ -1,15 +1,15 @@
-export const assign_position = `
-mat4 model = uModel * aTransform;
-mat4 modelView = uView * model;
-#ifdef dGeometryType_textureMesh
-    vec3 position = readFromTexture(tPosition, VertexID, uGeoTexDim).xyz;
-#else
-    vec3 position = aPosition;
-#endif
-vec4 position4 = vec4(position, 1.0);
-// for accessing tColorGrid in vert shader and for clipping in frag shader
-vModelPosition = (model * position4).xyz;
-vec4 mvPosition = modelView * position4;
-vViewPosition = mvPosition.xyz;
-gl_Position = uProjection * mvPosition;
+export const assign_position = `
+mat4 model = uModel * aTransform;
+mat4 modelView = uView * model;
+#ifdef dGeometryType_textureMesh
+    vec3 position = readFromTexture(tPosition, VertexID, uGeoTexDim).xyz;
+#else
+    vec3 position = aPosition;
+#endif
+vec4 position4 = vec4(position, 1.0);
+// for accessing tColorGrid in vert shader and for clipping in frag shader
+vModelPosition = (model * position4).xyz;
+vec4 mvPosition = modelView * position4;
+vViewPosition = mvPosition.xyz;
+gl_Position = uProjection * mvPosition;
 `;

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

@@ -1,19 +1,19 @@
-export const assign_size = `
-#if defined(dSizeType_uniform)
-    float size = uSize;
-#elif defined(dSizeType_attribute)
-    float size = aSize;
-#elif defined(dSizeType_instance)
-    float size = unpackRGBToInt(readFromTexture(tSize, aInstance, uSizeTexDim).rgb);
-#elif defined(dSizeType_group)
-    float size = unpackRGBToInt(readFromTexture(tSize, group, uSizeTexDim).rgb);
-#elif defined(dSizeType_groupInstance)
-    float size = unpackRGBToInt(readFromTexture(tSize, aInstance * float(uGroupCount) + group, uSizeTexDim).rgb);
-#endif
-
-#if defined(dSizeType_instance) || defined(dSizeType_group) || defined(dSizeType_groupInstance)
-    size /= 100.0; // NOTE factor also set in TypeScript
-#endif
-
-size *= uSizeFactor;
+export const assign_size = `
+#if defined(dSizeType_uniform)
+    float size = uSize;
+#elif defined(dSizeType_attribute)
+    float size = aSize;
+#elif defined(dSizeType_instance)
+    float size = unpackRGBToInt(readFromTexture(tSize, aInstance, uSizeTexDim).rgb);
+#elif defined(dSizeType_group)
+    float size = unpackRGBToInt(readFromTexture(tSize, group, uSizeTexDim).rgb);
+#elif defined(dSizeType_groupInstance)
+    float size = unpackRGBToInt(readFromTexture(tSize, aInstance * float(uGroupCount) + group, uSizeTexDim).rgb);
+#endif
+
+#if defined(dSizeType_instance) || defined(dSizeType_group) || defined(dSizeType_groupInstance)
+    size /= 100.0; // NOTE factor also set in TypeScript
+#endif
+
+size *= uSizeFactor;
 `;