molstar 4.2.0 → 4.3.0

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

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply_marker_color = void 0;
-exports.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
+exports.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/commonjs/mol-gl/shader/chunks/assign-clipping-varying.glsl.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assign_clipping_varying = void 0;
-exports.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
+exports.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/commonjs/mol-gl/shader/chunks/assign-color-varying.glsl.js

@@ -1,144 +1,144 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assign_color_varying = void 0;
-exports.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
+exports.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/commonjs/mol-gl/shader/chunks/assign-group.glsl.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assign_group = void 0;
-exports.assign_group = `
-#ifdef dGeometryType_textureMesh
-    float group = unpackRGBToInt(readFromTexture(tGroup, VertexID, uGeoTexDim).rgb);
-#else
-    float group = aGroup;
-#endif
+exports.assign_group = `
+#ifdef dGeometryType_textureMesh
+    float group = unpackRGBToInt(readFromTexture(tGroup, VertexID, uGeoTexDim).rgb);
+#else
+    float group = aGroup;
+#endif
 `;

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

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assign_marker_varying = void 0;
-exports.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
+exports.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/commonjs/mol-gl/shader/chunks/assign-material-color.glsl.js

@@ -1,116 +1,116 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assign_material_color = void 0;
-exports.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
+exports.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/commonjs/mol-gl/shader/chunks/assign-position.glsl.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assign_position = void 0;
-exports.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;
+exports.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;
 `;