molstar 4.2.0 → 4.3.0

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

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

package/lib/mol-gl/shader/chunks/check-picking-alpha.glsl.js

@@ -1,13 +1,13 @@
-export const check_picking_alpha = `
-float viewZ = depthToViewZ(uIsOrtho, fragmentDepth, uNear, uFar);
-float fogFactor = smoothstep(uFogNear, uFogFar, abs(viewZ));
-float alpha = (1.0 - fogFactor) * uAlpha;
-// if not opaque enough ignore so the element below can be picked
-if (uAlpha < uPickingAlphaThreshold || alpha < 0.1) {
-    #ifdef dTransparentBackfaces_opaque
-        if (!interior) discard;
-    #else
-        discard;
-    #endif
-}
+export const check_picking_alpha = `
+float viewZ = depthToViewZ(uIsOrtho, fragmentDepth, uNear, uFar);
+float fogFactor = smoothstep(uFogNear, uFogFar, abs(viewZ));
+float alpha = (1.0 - fogFactor) * uAlpha;
+// if not opaque enough ignore so the element below can be picked
+if (uAlpha < uPickingAlphaThreshold || alpha < 0.1) {
+    #ifdef dTransparentBackfaces_opaque
+        if (!interior) discard;
+    #else
+        discard;
+    #endif
+}
 `;

package/lib/mol-gl/shader/chunks/check-transparency.glsl.js

@@ -1,17 +1,17 @@
-export const check_transparency = `
-#if defined(dRenderVariant_color)
-    #if defined(dTransparentBackfaces_off)
-        if (interior && material.a < 1.0) discard;
-    #elif defined(dTransparentBackfaces_opaque)
-        if (interior) material.a = 1.0;
-    #endif
-
-    #if !defined(dXrayShaded_on) && !defined(dXrayShaded_inverted)
-        if ((uRenderMask == MaskOpaque && material.a < 1.0) ||
-            (uRenderMask == MaskTransparent && material.a == 1.0)
-        ) {
-            discard;
-        }
-    #endif
-#endif
+export const check_transparency = `
+#if defined(dRenderVariant_color)
+    #if defined(dTransparentBackfaces_off)
+        if (interior && material.a < 1.0) discard;
+    #elif defined(dTransparentBackfaces_opaque)
+        if (interior) material.a = 1.0;
+    #endif
+
+    #if !defined(dXrayShaded_on) && !defined(dXrayShaded_inverted)
+        if ((uRenderMask == MaskOpaque && material.a < 1.0) ||
+            (uRenderMask == MaskTransparent && material.a == 1.0)
+        ) {
+            discard;
+        }
+    #endif
+#endif
 `;

package/lib/mol-gl/shader/chunks/clip-instance.glsl.js

@@ -1,8 +1,8 @@
-export const clip_instance = `
-#if defined(dClipVariant_instance) && dClipObjectCount != 0
-    vec4 mCenter = uModel * aTransform * vec4(uInvariantBoundingSphere.xyz, 1.0);
-    if (clipTest(vec4(mCenter.xyz, uInvariantBoundingSphere.w)))
-        // move out of [ -w, +w ] to 'discard' in vert shader
-        gl_Position.z = 2.0 * gl_Position.w;
-#endif
+export const clip_instance = `
+#if defined(dClipVariant_instance) && dClipObjectCount != 0
+    vec4 mCenter = uModel * aTransform * vec4(uInvariantBoundingSphere.xyz, 1.0);
+    if (clipTest(vec4(mCenter.xyz, uInvariantBoundingSphere.w)))
+        // move out of [ -w, +w ] to 'discard' in vert shader
+        gl_Position.z = 2.0 * gl_Position.w;
+#endif
 `;

package/lib/mol-gl/shader/chunks/clip-pixel.glsl.js

@@ -1,6 +1,6 @@
-export const clip_pixel = `
-#if defined(dClipVariant_pixel) && dClipObjectCount != 0
-    if (clipTest(vec4(vModelPosition, 0.0)))
-        discard;
-#endif
+export const clip_pixel = `
+#if defined(dClipVariant_pixel) && dClipObjectCount != 0
+    if (clipTest(vec4(vModelPosition, 0.0)))
+        discard;
+#endif
 `;

package/lib/mol-gl/shader/chunks/color-frag-params.glsl.js

@@ -1,61 +1,61 @@
-export const color_frag_params = `
-uniform float uMetalness;
-uniform float uRoughness;
-uniform float uBumpiness;
-#ifdef bumpEnabled
-    uniform float uBumpFrequency;
-    uniform float uBumpAmplitude;
-#endif
-uniform float uEmissive;
-
-#if defined(dRenderVariant_color)
-    #if defined(dColorType_uniform)
-        uniform vec3 uColor;
-    #elif defined(dColorType_varying)
-        varying vec4 vColor;
-    #endif
-
-    #ifdef dUsePalette
-        uniform sampler2D tPalette;
-        varying float vPaletteV;
-    #endif
-
-    #ifdef dOverpaint
-        varying vec4 vOverpaint;
-    #endif
-
-    #ifdef dEmissive
-        varying float vEmissive;
-    #endif
-
-    #ifdef dSubstance
-        varying vec4 vSubstance;
-    #endif
-#elif defined(dRenderVariant_emissive)
-    #ifdef dEmissive
-        varying float vEmissive;
-    #endif
-#elif defined(dRenderVariant_pick)
-    #if __VERSION__ == 100 || !defined(dVaryingGroup)
-        #ifdef requiredDrawBuffers
-            varying vec4 vObject;
-            varying vec4 vInstance;
-            varying vec4 vGroup;
-        #else
-            varying vec4 vColor;
-        #endif
-    #else
-        #ifdef requiredDrawBuffers
-            flat in vec4 vObject;
-            flat in vec4 vInstance;
-            flat in vec4 vGroup;
-        #else
-            flat in vec4 vColor;
-        #endif
-    #endif
-#endif
-
-#ifdef dTransparency
-    varying float vTransparency;
-#endif
+export const color_frag_params = `
+uniform float uMetalness;
+uniform float uRoughness;
+uniform float uBumpiness;
+#ifdef bumpEnabled
+    uniform float uBumpFrequency;
+    uniform float uBumpAmplitude;
+#endif
+uniform float uEmissive;
+
+#if defined(dRenderVariant_color)
+    #if defined(dColorType_uniform)
+        uniform vec3 uColor;
+    #elif defined(dColorType_varying)
+        varying vec4 vColor;
+    #endif
+
+    #ifdef dUsePalette
+        uniform sampler2D tPalette;
+        varying float vPaletteV;
+    #endif
+
+    #ifdef dOverpaint
+        varying vec4 vOverpaint;
+    #endif
+
+    #ifdef dEmissive
+        varying float vEmissive;
+    #endif
+
+    #ifdef dSubstance
+        varying vec4 vSubstance;
+    #endif
+#elif defined(dRenderVariant_emissive)
+    #ifdef dEmissive
+        varying float vEmissive;
+    #endif
+#elif defined(dRenderVariant_pick)
+    #if __VERSION__ == 100 || !defined(dVaryingGroup)
+        #ifdef requiredDrawBuffers
+            varying vec4 vObject;
+            varying vec4 vInstance;
+            varying vec4 vGroup;
+        #else
+            varying vec4 vColor;
+        #endif
+    #else
+        #ifdef requiredDrawBuffers
+            flat in vec4 vObject;
+            flat in vec4 vInstance;
+            flat in vec4 vGroup;
+        #else
+            flat in vec4 vColor;
+        #endif
+    #endif
+#endif
+
+#ifdef dTransparency
+    varying float vTransparency;
+#endif
 `;