molstar 4.2.0 → 4.3.0

package/lib/mol-gl/shader/bloom/composite.frag.js

@@ -1,34 +1,34 @@
-export const composite_frag = `
-precision highp float;
-precision highp int;
-precision highp sampler2D;
-
-uniform vec2 uTexSizeInv;
-
-uniform sampler2D tBlur1;
-uniform sampler2D tBlur2;
-uniform sampler2D tBlur3;
-uniform sampler2D tBlur4;
-uniform sampler2D tBlur5;
-uniform float uBloomStrength;
-uniform float uBloomRadius;
-uniform float uBloomFactors[5];
-uniform vec3 uBloomTints[5];
-
-float lerpBloomFactor(const in float factor) {
-    float mirrorFactor = 1.2 - factor;
-    return mix(factor, mirrorFactor, uBloomRadius);
-}
-
-void main(void) {
-    vec2 coords = gl_FragCoord.xy * uTexSizeInv;
-
-    gl_FragColor = uBloomStrength * (
-        lerpBloomFactor(uBloomFactors[0]) * vec4(uBloomTints[0], 1.0) * texture2D(tBlur1, coords) +
-        lerpBloomFactor(uBloomFactors[1]) * vec4(uBloomTints[1], 1.0) * texture2D(tBlur2, coords) +
-        lerpBloomFactor(uBloomFactors[2]) * vec4(uBloomTints[2], 1.0) * texture2D(tBlur3, coords) +
-        lerpBloomFactor(uBloomFactors[3]) * vec4(uBloomTints[3], 1.0) * texture2D(tBlur4, coords) +
-        lerpBloomFactor(uBloomFactors[4]) * vec4(uBloomTints[4], 1.0) * texture2D(tBlur5, coords)
-    );
-}
+export const composite_frag = `
+precision highp float;
+precision highp int;
+precision highp sampler2D;
+
+uniform vec2 uTexSizeInv;
+
+uniform sampler2D tBlur1;
+uniform sampler2D tBlur2;
+uniform sampler2D tBlur3;
+uniform sampler2D tBlur4;
+uniform sampler2D tBlur5;
+uniform float uBloomStrength;
+uniform float uBloomRadius;
+uniform float uBloomFactors[5];
+uniform vec3 uBloomTints[5];
+
+float lerpBloomFactor(const in float factor) {
+    float mirrorFactor = 1.2 - factor;
+    return mix(factor, mirrorFactor, uBloomRadius);
+}
+
+void main(void) {
+    vec2 coords = gl_FragCoord.xy * uTexSizeInv;
+
+    gl_FragColor = uBloomStrength * (
+        lerpBloomFactor(uBloomFactors[0]) * vec4(uBloomTints[0], 1.0) * texture2D(tBlur1, coords) +
+        lerpBloomFactor(uBloomFactors[1]) * vec4(uBloomTints[1], 1.0) * texture2D(tBlur2, coords) +
+        lerpBloomFactor(uBloomFactors[2]) * vec4(uBloomTints[2], 1.0) * texture2D(tBlur3, coords) +
+        lerpBloomFactor(uBloomFactors[3]) * vec4(uBloomTints[3], 1.0) * texture2D(tBlur4, coords) +
+        lerpBloomFactor(uBloomFactors[4]) * vec4(uBloomTints[4], 1.0) * texture2D(tBlur5, coords)
+    );
+}
 `;

package/lib/mol-gl/shader/bloom/luminosity.frag.js

@@ -1,53 +1,53 @@
-export const luminosity_frag = `
-precision highp float;
-precision highp int;
-precision highp sampler2D;
-
-uniform sampler2D tColor;
-uniform sampler2D tEmissive;
-uniform sampler2D tDepth;
-uniform vec2 uTexSizeInv;
-
-uniform vec3 uDefaultColor;
-uniform float uDefaultOpacity;
-uniform float uLuminosityThreshold;
-uniform float uSmoothWidth;
-
-#include common
-
-float getDepth(const in vec2 coords) {
-    #ifdef depthTextureSupport
-        return texture2D(tDepth, coords).r;
-    #else
-        return unpackRGBAToDepth(texture2D(tDepth, coords));
-    #endif
-}
-
-bool isBackground(const in float depth) {
-    return depth == 1.0;
-}
-
-void main(void) {
-    vec2 coords = gl_FragCoord.xy * uTexSizeInv;
-    vec4 texel = texture2D(tColor, coords);
-    float emissive = texture2D(tEmissive, coords).a;
-    float depth = getDepth(coords);
-
-    if (isBackground(depth)) {
-        gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
-        return;
-    }
-
-    vec4 outputColor = vec4(uDefaultColor.rgb, uDefaultOpacity);
-
-    #if defined(dMode_luminosity)
-        vec3 luma = vec3(0.299, 0.587, 0.114);
-        float v = dot(texel.xyz, luma);
-        float alpha = smoothstep(uLuminosityThreshold, uLuminosityThreshold + uSmoothWidth, v);
-
-        gl_FragColor = mix(outputColor, texel, alpha);
-    #elif defined(dMode_emissive)
-        gl_FragColor = mix(outputColor, texel, emissive);
-    #endif
-}
+export const luminosity_frag = `
+precision highp float;
+precision highp int;
+precision highp sampler2D;
+
+uniform sampler2D tColor;
+uniform sampler2D tEmissive;
+uniform sampler2D tDepth;
+uniform vec2 uTexSizeInv;
+
+uniform vec3 uDefaultColor;
+uniform float uDefaultOpacity;
+uniform float uLuminosityThreshold;
+uniform float uSmoothWidth;
+
+#include common
+
+float getDepth(const in vec2 coords) {
+    #ifdef depthTextureSupport
+        return texture2D(tDepth, coords).r;
+    #else
+        return unpackRGBAToDepth(texture2D(tDepth, coords));
+    #endif
+}
+
+bool isBackground(const in float depth) {
+    return depth == 1.0;
+}
+
+void main(void) {
+    vec2 coords = gl_FragCoord.xy * uTexSizeInv;
+    vec4 texel = texture2D(tColor, coords);
+    float emissive = texture2D(tEmissive, coords).a;
+    float depth = getDepth(coords);
+
+    if (isBackground(depth)) {
+        gl_FragColor = vec4(0.0, 0.0, 0.0, 0.0);
+        return;
+    }
+
+    vec4 outputColor = vec4(uDefaultColor.rgb, uDefaultOpacity);
+
+    #if defined(dMode_luminosity)
+        vec3 luma = vec3(0.299, 0.587, 0.114);
+        float v = dot(texel.xyz, luma);
+        float alpha = smoothstep(uLuminosityThreshold, uLuminosityThreshold + uSmoothWidth, v);
+
+        gl_FragColor = mix(outputColor, texel, alpha);
+    #elif defined(dMode_emissive)
+        gl_FragColor = mix(outputColor, texel, emissive);
+    #endif
+}
 `;

package/lib/mol-gl/shader/cas.frag.js

@@ -1,145 +1,145 @@
-export const cas_frag = `
-precision mediump float;
-precision mediump sampler2D;
-
-uniform sampler2D tColor;
-uniform vec2 uTexSizeInv;
-
-uniform float uSharpness;
-
-// adapted from https://www.shadertoy.com/view/stXSWB
-
-/*
-* FidelityFX Super Resolution scales up a low resolution
-* image, while adding fine detail.
-*
-* MIT Open License
-*
-* https://gpuopen.com/fsr
-*
-* Left: FSR processed
-* Right: Original texture, bilinear interpolation
-*
-* Mouse at top: Sharpness 0 stops (maximum)
-* Mouse at bottom: Sharpness 2 stops (minimum)
-*
-* It works in two passes-
-*   EASU upsamples the image with a clamped Lanczos kernel.
-*   RCAS sharpens the image at the target resolution.
-*
-* I needed to make a few changes to improve readability and
-* WebGL compatibility in an algorithm I don't fully understand.
-* Expect bugs.
-*
-* Shader not currently running for WebGL1 targets (eg. mobile Safari)
-*
-* There is kind of no point to using FSR in Shadertoy, as it renders buffers
-* at full target resolution. But this might be useful for WebGL based demos
-* running smaller-than-target render buffers.
-*
-* For sharpening with a full resolution render buffer,
-* FidelityFX CAS is a better option.
-* https://www.shadertoy.com/view/ftsXzM
-*
-* For readability and compatibility, these optimisations have been removed:
-*   * Fast approximate inverse and inversesqrt
-*   * textureGather fetches (not WebGL compatible)
-*   * Multiplying by reciprocal instead of division
-*
-* Apologies to AMD for the numerous slowdowns and errors I have introduced.
-*
-*/
-
-/***** RCAS *****/
-#define FSR_RCAS_LIMIT (0.25-(1.0/16.0))
-
-// Input callback prototypes that need to be implemented by calling shader
-vec4 FsrRcasLoadF(vec2 p);
-//------------------------------------------------------------------------------------------------------------------------------
-void FsrRcasCon(
-    out float con,
-    // The scale is {0.0 := maximum, to N>0, where N is the number of stops (halving) of the reduction of sharpness}.
-    float sharpness
-) {
-    // Transform from stops to linear value.
-    con = exp2(-sharpness);
-}
-
-vec3 FsrRcasF(
-    vec2 ip, // Integer pixel position in output.
-    float con
-) {
-    // Constant generated by RcasSetup().
-    // Algorithm uses minimal 3x3 pixel neighborhood.
-    //    b
-    //  d e f
-    //    h
-    vec2 sp = vec2(ip);
-    vec3 b = FsrRcasLoadF(sp + vec2( 0,-1)).rgb;
-    vec3 d = FsrRcasLoadF(sp + vec2(-1, 0)).rgb;
-    vec3 e = FsrRcasLoadF(sp).rgb;
-    vec3 f = FsrRcasLoadF(sp + vec2( 1, 0)).rgb;
-    vec3 h = FsrRcasLoadF(sp + vec2( 0, 1)).rgb;
-
-    // Luma times 2.
-    float bL = b.g + .5 * (b.b + b.r);
-    float dL = d.g + .5 * (d.b + d.r);
-    float eL = e.g + .5 * (e.b + e.r);
-    float fL = f.g + .5 * (f.b + f.r);
-    float hL = h.g + .5 * (h.b + h.r);
-
-    // Noise detection.
-    #ifdef dDenoise
-        float nz = .25 * (bL + dL + fL + hL) - eL;
-        nz=clamp(
-            abs(nz)
-            /(
-                max(max(bL,dL),max(eL,max(fL,hL)))
-                -min(min(bL,dL),min(eL,min(fL,hL)))
-            ),
-            0., 1.
-        );
-        nz=1.-.5*nz;
-    #endif
-
-    // Min and max of ring.
-    vec3 mn4 = min(b, min(f, h));
-    vec3 mx4 = max(b, max(f, h));
-
-    // Immediate constants for peak range.
-    vec2 peakC = vec2(1., -4.);
-
-    // Limiters, these need to be high precision RCPs.
-    vec3 hitMin = mn4 / (4. * mx4);
-    vec3 hitMax = (peakC.x - mx4) / (4.* mn4 + peakC.y);
-    vec3 lobeRGB = max(-hitMin, hitMax);
-    float lobe = max(
-        -FSR_RCAS_LIMIT,
-        min(max(lobeRGB.r, max(lobeRGB.g, lobeRGB.b)), 0.)
-    )*con;
-
-    // Apply noise removal.
-    #ifdef dDenoise
-        lobe *= nz;
-    #endif
-
-    // Resolve, which needs the medium precision rcp approximation to avoid visible tonality changes.
-    return (lobe * (b + d + h + f) + e) / (4. * lobe + 1.);
-}
-
-
-vec4 FsrRcasLoadF(vec2 p) {
-    return texture2D(tColor, p * uTexSizeInv);
-}
-
-void main() {
-    // Set up constants
-    float con;
-    FsrRcasCon(con, uSharpness);
-
-    // Perform RCAS pass
-    vec3 col = FsrRcasF(gl_FragCoord.xy, con);
-
-    gl_FragColor = vec4(col, FsrRcasLoadF(gl_FragCoord.xy).a);
-}
+export const cas_frag = `
+precision mediump float;
+precision mediump sampler2D;
+
+uniform sampler2D tColor;
+uniform vec2 uTexSizeInv;
+
+uniform float uSharpness;
+
+// adapted from https://www.shadertoy.com/view/stXSWB
+
+/*
+* FidelityFX Super Resolution scales up a low resolution
+* image, while adding fine detail.
+*
+* MIT Open License
+*
+* https://gpuopen.com/fsr
+*
+* Left: FSR processed
+* Right: Original texture, bilinear interpolation
+*
+* Mouse at top: Sharpness 0 stops (maximum)
+* Mouse at bottom: Sharpness 2 stops (minimum)
+*
+* It works in two passes-
+*   EASU upsamples the image with a clamped Lanczos kernel.
+*   RCAS sharpens the image at the target resolution.
+*
+* I needed to make a few changes to improve readability and
+* WebGL compatibility in an algorithm I don't fully understand.
+* Expect bugs.
+*
+* Shader not currently running for WebGL1 targets (eg. mobile Safari)
+*
+* There is kind of no point to using FSR in Shadertoy, as it renders buffers
+* at full target resolution. But this might be useful for WebGL based demos
+* running smaller-than-target render buffers.
+*
+* For sharpening with a full resolution render buffer,
+* FidelityFX CAS is a better option.
+* https://www.shadertoy.com/view/ftsXzM
+*
+* For readability and compatibility, these optimisations have been removed:
+*   * Fast approximate inverse and inversesqrt
+*   * textureGather fetches (not WebGL compatible)
+*   * Multiplying by reciprocal instead of division
+*
+* Apologies to AMD for the numerous slowdowns and errors I have introduced.
+*
+*/
+
+/***** RCAS *****/
+#define FSR_RCAS_LIMIT (0.25-(1.0/16.0))
+
+// Input callback prototypes that need to be implemented by calling shader
+vec4 FsrRcasLoadF(vec2 p);
+//------------------------------------------------------------------------------------------------------------------------------
+void FsrRcasCon(
+    out float con,
+    // The scale is {0.0 := maximum, to N>0, where N is the number of stops (halving) of the reduction of sharpness}.
+    float sharpness
+) {
+    // Transform from stops to linear value.
+    con = exp2(-sharpness);
+}
+
+vec3 FsrRcasF(
+    vec2 ip, // Integer pixel position in output.
+    float con
+) {
+    // Constant generated by RcasSetup().
+    // Algorithm uses minimal 3x3 pixel neighborhood.
+    //    b
+    //  d e f
+    //    h
+    vec2 sp = vec2(ip);
+    vec3 b = FsrRcasLoadF(sp + vec2( 0,-1)).rgb;
+    vec3 d = FsrRcasLoadF(sp + vec2(-1, 0)).rgb;
+    vec3 e = FsrRcasLoadF(sp).rgb;
+    vec3 f = FsrRcasLoadF(sp + vec2( 1, 0)).rgb;
+    vec3 h = FsrRcasLoadF(sp + vec2( 0, 1)).rgb;
+
+    // Luma times 2.
+    float bL = b.g + .5 * (b.b + b.r);
+    float dL = d.g + .5 * (d.b + d.r);
+    float eL = e.g + .5 * (e.b + e.r);
+    float fL = f.g + .5 * (f.b + f.r);
+    float hL = h.g + .5 * (h.b + h.r);
+
+    // Noise detection.
+    #ifdef dDenoise
+        float nz = .25 * (bL + dL + fL + hL) - eL;
+        nz=clamp(
+            abs(nz)
+            /(
+                max(max(bL,dL),max(eL,max(fL,hL)))
+                -min(min(bL,dL),min(eL,min(fL,hL)))
+            ),
+            0., 1.
+        );
+        nz=1.-.5*nz;
+    #endif
+
+    // Min and max of ring.
+    vec3 mn4 = min(b, min(f, h));
+    vec3 mx4 = max(b, max(f, h));
+
+    // Immediate constants for peak range.
+    vec2 peakC = vec2(1., -4.);
+
+    // Limiters, these need to be high precision RCPs.
+    vec3 hitMin = mn4 / (4. * mx4);
+    vec3 hitMax = (peakC.x - mx4) / (4.* mn4 + peakC.y);
+    vec3 lobeRGB = max(-hitMin, hitMax);
+    float lobe = max(
+        -FSR_RCAS_LIMIT,
+        min(max(lobeRGB.r, max(lobeRGB.g, lobeRGB.b)), 0.)
+    )*con;
+
+    // Apply noise removal.
+    #ifdef dDenoise
+        lobe *= nz;
+    #endif
+
+    // Resolve, which needs the medium precision rcp approximation to avoid visible tonality changes.
+    return (lobe * (b + d + h + f) + e) / (4. * lobe + 1.);
+}
+
+
+vec4 FsrRcasLoadF(vec2 p) {
+    return texture2D(tColor, p * uTexSizeInv);
+}
+
+void main() {
+    // Set up constants
+    float con;
+    FsrRcasCon(con, uSharpness);
+
+    // Perform RCAS pass
+    vec3 col = FsrRcasF(gl_FragCoord.xy, con);
+
+    gl_FragColor = vec4(col, FsrRcasLoadF(gl_FragCoord.xy).a);
+}
 `;

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

@@ -1,32 +1,32 @@
-export const apply_fog = `
-float preFogAlpha = gl_FragColor.a;
-if (uFog) {
-    float viewZ = depthToViewZ(uIsOrtho, fragmentDepth, uNear, uFar);
-    float fogFactor = smoothstep(uFogNear, uFogFar, abs(viewZ));
-    float fogAlpha = (1.0 - fogFactor) * gl_FragColor.a;
-    if (!uTransparentBackground) {
-        if (gl_FragColor.a < 1.0) {
-            // transparent objects are blended with background color
-            gl_FragColor.a = fogAlpha;
-        } else {
-            // mix opaque objects with background color
-            gl_FragColor.rgb = mix(gl_FragColor.rgb, uFogColor, fogFactor);
-        }
-    } else {
-        #if defined(dRenderVariant_colorDpoit)
-            if (gl_FragColor.a < 1.0) {
-                // transparent objects are blended with background color
-                gl_FragColor.a = fogAlpha;
-            } else {
-                // opaque objects need to be pre-multiplied alpha
-                gl_FragColor.rgb *= fogAlpha;
-                gl_FragColor.a = fogAlpha;
-            }
-        #else
-            // pre-multiplied alpha expected for transparent background
-            gl_FragColor.rgb *= fogAlpha;
-            gl_FragColor.a = fogAlpha;
-        #endif
-    }
-}
+export const apply_fog = `
+float preFogAlpha = gl_FragColor.a;
+if (uFog) {
+    float viewZ = depthToViewZ(uIsOrtho, fragmentDepth, uNear, uFar);
+    float fogFactor = smoothstep(uFogNear, uFogFar, abs(viewZ));
+    float fogAlpha = (1.0 - fogFactor) * gl_FragColor.a;
+    if (!uTransparentBackground) {
+        if (gl_FragColor.a < 1.0) {
+            // transparent objects are blended with background color
+            gl_FragColor.a = fogAlpha;
+        } else {
+            // mix opaque objects with background color
+            gl_FragColor.rgb = mix(gl_FragColor.rgb, uFogColor, fogFactor);
+        }
+    } else {
+        #if defined(dRenderVariant_colorDpoit)
+            if (gl_FragColor.a < 1.0) {
+                // transparent objects are blended with background color
+                gl_FragColor.a = fogAlpha;
+            } else {
+                // opaque objects need to be pre-multiplied alpha
+                gl_FragColor.rgb *= fogAlpha;
+                gl_FragColor.a = fogAlpha;
+            }
+        #else
+            // pre-multiplied alpha expected for transparent background
+            gl_FragColor.rgb *= fogAlpha;
+            gl_FragColor.a = fogAlpha;
+        #endif
+    }
+}
 `;

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

@@ -1,13 +1,13 @@
-export const apply_interior_color = `
-if (interior) {
-    if (uInteriorColorFlag) {
-        gl_FragColor.rgb = uInteriorColor;
-    } else {
-        gl_FragColor.rgb *= 1.0 - uInteriorDarkening;
-    }
-
-    #ifdef dTransparentBackfaces_opaque
-        gl_FragColor.a = 1.0;
-    #endif
-}
+export const apply_interior_color = `
+if (interior) {
+    if (uInteriorColorFlag) {
+        gl_FragColor.rgb = uInteriorColor;
+    } else {
+        gl_FragColor.rgb *= 1.0 - uInteriorDarkening;
+    }
+
+    #ifdef dTransparentBackfaces_opaque
+        gl_FragColor.a = 1.0;
+    #endif
+}
 `;