molstar 4.2.0 → 4.3.0

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

@@ -7,108 +7,108 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.common_clip = void 0;
-exports.common_clip = `
-#if dClipObjectCount != 0
-    vec3 quaternionTransform(const in vec4 q, const in vec3 v) {
-        vec3 t = 2.0 * cross(q.xyz, v);
-        return v + q.w * t + cross(q.xyz, t);
-    }
-
-    vec4 computePlane(const in vec3 normal, const in vec3 inPoint) {
-        return vec4(normalize(normal), -dot(normal, inPoint));
-    }
-
-    float planeSD(const in vec4 plane, const in vec3 center) {
-        return -dot(plane.xyz, center - plane.xyz * -plane.w);
-    }
-
-    float sphereSD(const in vec3 position, const in vec4 rotation, const in vec3 size, const in vec3 center) {
-        return (
-            length(quaternionTransform(vec4(-rotation.x, -rotation.y, -rotation.z, rotation.w), center - position) / size) - 1.0
-        ) * min(min(size.x, size.y), size.z);
-    }
-
-    float cubeSD(const in vec3 position, const in vec4 rotation, const in vec3 size, const in vec3 center) {
-        vec3 d = abs(quaternionTransform(vec4(-rotation.x, -rotation.y, -rotation.z, rotation.w), center - position)) - size;
-        return min(max(d.x, max(d.y, d.z)), 0.0) + length(max(d, 0.0));
-    }
-
-    float cylinderSD(const in vec3 position, const in vec4 rotation, const in vec3 size, const in vec3 center) {
-        vec3 t = quaternionTransform(vec4(-rotation.x, -rotation.y, -rotation.z, rotation.w), center - position);
-
-        vec2 d = abs(vec2(length(t.xz), t.y)) - size.xy;
-        return min(max(d.x, d.y), 0.0) + length(max(d, 0.0));
-    }
-
-    float infiniteConeSD(const in vec3 position, const in vec4 rotation, const in vec3 size, const in vec3 center) {
-        vec3 t = quaternionTransform(vec4(-rotation.x, -rotation.y, -rotation.z, rotation.w), center - position);
-
-        float q = length(t.xy);
-        return dot(size.xy, vec2(q, t.z));
-    }
-
-    float getSignedDistance(const in vec3 center, const in int type, const in vec3 position, const in vec4 rotation, const in vec3 scale) {
-        if (type == 1) {
-            vec3 normal = quaternionTransform(rotation, vec3(0.0, 1.0, 0.0));
-            vec4 plane = computePlane(normal, position);
-            return planeSD(plane, center);
-        } else if (type == 2) {
-            return sphereSD(position, rotation, scale * 0.5, center);
-        } else if (type == 3) {
-            return cubeSD(position, rotation, scale * 0.5, center);
-        } else if (type == 4) {
-            return cylinderSD(position, rotation, scale * 0.5, center);
-        } else if (type == 5) {
-            return infiniteConeSD(position, rotation, scale * 0.5, center);
-        } else {
-            return 0.1;
-        }
-    }
-
-    #if __VERSION__ == 100
-        // 8-bit
-        int bitwiseAnd(in int a, in int b) {
-            int d = 128;
-            int result = 0;
-            for (int i = 0; i < 8; ++i) {
-                if (d <= 0) break;
-                if (a >= d && b >= d) result += d;
-                if (a >= d) a -= d;
-                if (b >= d) b -= d;
-                d /= 2;
-            }
-            return result;
-        }
-
-        bool hasBit(const in int mask, const in int bit) {
-            return bitwiseAnd(mask, bit) == 0;
-        }
-    #else
-        bool hasBit(const in int mask, const in int bit) {
-            return (mask & bit) == 0;
-        }
-    #endif
-
-    bool clipTest(const in vec4 sphere) {
-        // flag is a bit-flag for clip-objects to ignore (note, object ids start at 1 not 0)
-        #if defined(dClipping)
-            int flag = int(floor(vClipping * 255.0 + 0.5));
-        #else
-            int flag = 0;
-        #endif
-
-        #pragma unroll_loop_start
-        for (int i = 0; i < dClipObjectCount; ++i) {
-            if (flag == 0 || hasBit(flag, UNROLLED_LOOP_INDEX + 1)) {
-                // TODO take sphere radius into account?
-                bool test = getSignedDistance(sphere.xyz, uClipObjectType[i], uClipObjectPosition[i], uClipObjectRotation[i], uClipObjectScale[i]) <= 0.0;
-                if ((!uClipObjectInvert[i] && test) || (uClipObjectInvert[i] && !test)) {
-                    return true;
-                }
-            }
-        }
-        #pragma unroll_loop_end
-        return false;
-    }
-#endif
+exports.common_clip = `
+#if dClipObjectCount != 0
+    vec3 quaternionTransform(const in vec4 q, const in vec3 v) {
+        vec3 t = 2.0 * cross(q.xyz, v);
+        return v + q.w * t + cross(q.xyz, t);
+    }
+
+    vec4 computePlane(const in vec3 normal, const in vec3 inPoint) {
+        return vec4(normalize(normal), -dot(normal, inPoint));
+    }
+
+    float planeSD(const in vec4 plane, const in vec3 center) {
+        return -dot(plane.xyz, center - plane.xyz * -plane.w);
+    }
+
+    float sphereSD(const in vec3 position, const in vec4 rotation, const in vec3 size, const in vec3 center) {
+        return (
+            length(quaternionTransform(vec4(-rotation.x, -rotation.y, -rotation.z, rotation.w), center - position) / size) - 1.0
+        ) * min(min(size.x, size.y), size.z);
+    }
+
+    float cubeSD(const in vec3 position, const in vec4 rotation, const in vec3 size, const in vec3 center) {
+        vec3 d = abs(quaternionTransform(vec4(-rotation.x, -rotation.y, -rotation.z, rotation.w), center - position)) - size;
+        return min(max(d.x, max(d.y, d.z)), 0.0) + length(max(d, 0.0));
+    }
+
+    float cylinderSD(const in vec3 position, const in vec4 rotation, const in vec3 size, const in vec3 center) {
+        vec3 t = quaternionTransform(vec4(-rotation.x, -rotation.y, -rotation.z, rotation.w), center - position);
+
+        vec2 d = abs(vec2(length(t.xz), t.y)) - size.xy;
+        return min(max(d.x, d.y), 0.0) + length(max(d, 0.0));
+    }
+
+    float infiniteConeSD(const in vec3 position, const in vec4 rotation, const in vec3 size, const in vec3 center) {
+        vec3 t = quaternionTransform(vec4(-rotation.x, -rotation.y, -rotation.z, rotation.w), center - position);
+
+        float q = length(t.xy);
+        return dot(size.xy, vec2(q, t.z));
+    }
+
+    float getSignedDistance(const in vec3 center, const in int type, const in vec3 position, const in vec4 rotation, const in vec3 scale) {
+        if (type == 1) {
+            vec3 normal = quaternionTransform(rotation, vec3(0.0, 1.0, 0.0));
+            vec4 plane = computePlane(normal, position);
+            return planeSD(plane, center);
+        } else if (type == 2) {
+            return sphereSD(position, rotation, scale * 0.5, center);
+        } else if (type == 3) {
+            return cubeSD(position, rotation, scale * 0.5, center);
+        } else if (type == 4) {
+            return cylinderSD(position, rotation, scale * 0.5, center);
+        } else if (type == 5) {
+            return infiniteConeSD(position, rotation, scale * 0.5, center);
+        } else {
+            return 0.1;
+        }
+    }
+
+    #if __VERSION__ == 100
+        // 8-bit
+        int bitwiseAnd(in int a, in int b) {
+            int d = 128;
+            int result = 0;
+            for (int i = 0; i < 8; ++i) {
+                if (d <= 0) break;
+                if (a >= d && b >= d) result += d;
+                if (a >= d) a -= d;
+                if (b >= d) b -= d;
+                d /= 2;
+            }
+            return result;
+        }
+
+        bool hasBit(const in int mask, const in int bit) {
+            return bitwiseAnd(mask, bit) == 0;
+        }
+    #else
+        bool hasBit(const in int mask, const in int bit) {
+            return (mask & bit) == 0;
+        }
+    #endif
+
+    bool clipTest(const in vec4 sphere) {
+        // flag is a bit-flag for clip-objects to ignore (note, object ids start at 1 not 0)
+        #if defined(dClipping)
+            int flag = int(floor(vClipping * 255.0 + 0.5));
+        #else
+            int flag = 0;
+        #endif
+
+        #pragma unroll_loop_start
+        for (int i = 0; i < dClipObjectCount; ++i) {
+            if (flag == 0 || hasBit(flag, UNROLLED_LOOP_INDEX + 1)) {
+                // TODO take sphere radius into account?
+                bool test = getSignedDistance(sphere.xyz, uClipObjectType[i], uClipObjectPosition[i], uClipObjectRotation[i], uClipObjectScale[i]) <= 0.0;
+                if ((!uClipObjectInvert[i] && test) || (uClipObjectInvert[i] && !test)) {
+                    return true;
+                }
+            }
+        }
+        #pragma unroll_loop_end
+        return false;
+    }
+#endif
 `;

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

@@ -1,154 +1,154 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.common_frag_params = void 0;
-exports.common_frag_params = `
-uniform int uObjectId;
-uniform int uInstanceCount;
-uniform int uGroupCount;
-
-uniform int uPickType;
-uniform int uMarkingType;
-
-uniform vec4 uCameraPlane;
-uniform vec4 uLod;
-
-#if dClipObjectCount != 0
-    uniform int uClipObjectType[dClipObjectCount];
-    uniform bool uClipObjectInvert[dClipObjectCount];
-    uniform vec3 uClipObjectPosition[dClipObjectCount];
-    uniform vec4 uClipObjectRotation[dClipObjectCount];
-    uniform vec3 uClipObjectScale[dClipObjectCount];
-
-    #if defined(dClipping)
-        #if __VERSION__ == 100 || defined(dClippingType_instance) || !defined(dVaryingGroup)
-            varying float vClipping;
-        #else
-            flat in float vClipping;
-        #endif
-    #endif
-#endif
-
-#if defined(dColorMarker)
-    uniform vec3 uHighlightColor;
-    uniform vec3 uSelectColor;
-    uniform vec3 uDimColor;
-    uniform float uHighlightStrength;
-    uniform float uSelectStrength;
-    uniform float uDimStrength;
-    uniform int uMarkerPriority;
-    uniform float uMarkerAverage;
-#endif
-
-#if defined(dNeedsMarker)
-    uniform float uMarker;
-    #if __VERSION__ == 100 || defined(dMarkerType_instance) || !defined(dVaryingGroup)
-        varying float vMarker;
-    #else
-        flat in float vMarker;
-    #endif
-#endif
-
-#if defined(dRenderVariant_colorDpoit)
-    #define MAX_DPOIT_DEPTH 99999.0 // NOTE constant also set in TypeScript
-    uniform sampler2D tDpoitDepth;
-    uniform sampler2D tDpoitFrontColor;
-#endif
-
-varying vec3 vModelPosition;
-varying vec3 vViewPosition;
-
-uniform vec2 uViewOffset;
-
-uniform float uNear;
-uniform float uFar;
-uniform float uIsOrtho;
-
-uniform bool uFog;
-uniform float uFogNear;
-uniform float uFogFar;
-uniform vec3 uFogColor;
-
-uniform float uAlpha;
-uniform float uPickingAlphaThreshold;
-uniform bool uTransparentBackground;
-
-uniform bool uDoubleSided;
-uniform float uInteriorDarkening;
-uniform bool uInteriorColorFlag;
-uniform vec3 uInteriorColor;
-bool interior;
-
-uniform float uXrayEdgeFalloff;
-uniform float uExposure;
-
-uniform mat4 uProjection;
-
-uniform int uRenderMask;
-uniform bool uMarkingDepthTest;
-
-uniform sampler2D tDepth;
-uniform vec2 uDrawingBufferSize;
-
-float getDepthPacked(const in vec2 coords) {
-    return unpackRGBAToDepth(texture2D(tDepth, coords));
-}
-
-float getDepth(const in vec2 coords) {
-    #ifdef depthTextureSupport
-        return texture2D(tDepth, coords).r;
-    #else
-        return unpackRGBAToDepth(texture2D(tDepth, coords));
-    #endif
-}
-
-float calcDepth(const in vec3 pos) {
-    vec2 clipZW = pos.z * uProjection[2].zw + uProjection[3].zw;
-    return 0.5 + 0.5 * clipZW.x / clipZW.y;
-}
-
-// "Bump Mapping Unparametrized Surfaces on the GPU" Morten S. Mikkelsen
-// https://mmikk.github.io/papers3d/mm_sfgrad_bump.pdf
-vec3 perturbNormal(in vec3 position, in vec3 normal, in float height, in float scale) {
-    vec3 sigmaS = dFdx(position);
-    vec3 sigmaT = dFdy(position);
-
-    vec3 r1 = cross(sigmaT, normal);
-    vec3 r2 = cross(normal, sigmaS);
-    float det = dot(sigmaS, r1);
-    if (det == 0.0) return normal;
-
-    float bs = dFdx(height);
-    float bt = dFdy(height);
-
-    vec3 surfGrad = sign(det) * (bs * r1 + bt * r2);
-    return normalize(abs(det) * normal - scale * surfGrad);
-}
-
-float hash(in float h) {
-    return fract(sin(h) * 43758.5453123);
-}
-
-float noise(in vec3 x) {
-    vec3 p = floor(x);
-    vec3 f = fract(x);
-    f = f * f * (3.0 - 2.0 * f);
-
-    float n = p.x + p.y * 157.0 + 113.0 * p.z;
-    return mix(
-        mix(mix(hash(n + 0.0), hash(n + 1.0), f.x),
-            mix(hash(n + 157.0), hash(n + 158.0), f.x), f.y),
-        mix(mix(hash(n + 113.0), hash(n + 114.0), f.x),
-            mix(hash(n + 270.0), hash(n + 271.0), f.x), f.y), f.z);
-}
-
-float fbm(in vec3 p) {
-    float f = 0.0;
-    f += 0.5 * noise(p);
-    p *= 2.01;
-    f += 0.25 * noise(p);
-    p *= 2.02;
-    f += 0.125 * noise(p);
-
-    return f;
-}
+exports.common_frag_params = `
+uniform int uObjectId;
+uniform int uInstanceCount;
+uniform int uGroupCount;
+
+uniform int uPickType;
+uniform int uMarkingType;
+
+uniform vec4 uCameraPlane;
+uniform vec4 uLod;
+
+#if dClipObjectCount != 0
+    uniform int uClipObjectType[dClipObjectCount];
+    uniform bool uClipObjectInvert[dClipObjectCount];
+    uniform vec3 uClipObjectPosition[dClipObjectCount];
+    uniform vec4 uClipObjectRotation[dClipObjectCount];
+    uniform vec3 uClipObjectScale[dClipObjectCount];
+
+    #if defined(dClipping)
+        #if __VERSION__ == 100 || defined(dClippingType_instance) || !defined(dVaryingGroup)
+            varying float vClipping;
+        #else
+            flat in float vClipping;
+        #endif
+    #endif
+#endif
+
+#if defined(dColorMarker)
+    uniform vec3 uHighlightColor;
+    uniform vec3 uSelectColor;
+    uniform vec3 uDimColor;
+    uniform float uHighlightStrength;
+    uniform float uSelectStrength;
+    uniform float uDimStrength;
+    uniform int uMarkerPriority;
+    uniform float uMarkerAverage;
+#endif
+
+#if defined(dNeedsMarker)
+    uniform float uMarker;
+    #if __VERSION__ == 100 || defined(dMarkerType_instance) || !defined(dVaryingGroup)
+        varying float vMarker;
+    #else
+        flat in float vMarker;
+    #endif
+#endif
+
+#if defined(dRenderVariant_colorDpoit)
+    #define MAX_DPOIT_DEPTH 99999.0 // NOTE constant also set in TypeScript
+    uniform sampler2D tDpoitDepth;
+    uniform sampler2D tDpoitFrontColor;
+#endif
+
+varying vec3 vModelPosition;
+varying vec3 vViewPosition;
+
+uniform vec2 uViewOffset;
+
+uniform float uNear;
+uniform float uFar;
+uniform float uIsOrtho;
+
+uniform bool uFog;
+uniform float uFogNear;
+uniform float uFogFar;
+uniform vec3 uFogColor;
+
+uniform float uAlpha;
+uniform float uPickingAlphaThreshold;
+uniform bool uTransparentBackground;
+
+uniform bool uDoubleSided;
+uniform float uInteriorDarkening;
+uniform bool uInteriorColorFlag;
+uniform vec3 uInteriorColor;
+bool interior;
+
+uniform float uXrayEdgeFalloff;
+uniform float uExposure;
+
+uniform mat4 uProjection;
+
+uniform int uRenderMask;
+uniform bool uMarkingDepthTest;
+
+uniform sampler2D tDepth;
+uniform vec2 uDrawingBufferSize;
+
+float getDepthPacked(const in vec2 coords) {
+    return unpackRGBAToDepth(texture2D(tDepth, coords));
+}
+
+float getDepth(const in vec2 coords) {
+    #ifdef depthTextureSupport
+        return texture2D(tDepth, coords).r;
+    #else
+        return unpackRGBAToDepth(texture2D(tDepth, coords));
+    #endif
+}
+
+float calcDepth(const in vec3 pos) {
+    vec2 clipZW = pos.z * uProjection[2].zw + uProjection[3].zw;
+    return 0.5 + 0.5 * clipZW.x / clipZW.y;
+}
+
+// "Bump Mapping Unparametrized Surfaces on the GPU" Morten S. Mikkelsen
+// https://mmikk.github.io/papers3d/mm_sfgrad_bump.pdf
+vec3 perturbNormal(in vec3 position, in vec3 normal, in float height, in float scale) {
+    vec3 sigmaS = dFdx(position);
+    vec3 sigmaT = dFdy(position);
+
+    vec3 r1 = cross(sigmaT, normal);
+    vec3 r2 = cross(normal, sigmaS);
+    float det = dot(sigmaS, r1);
+    if (det == 0.0) return normal;
+
+    float bs = dFdx(height);
+    float bt = dFdy(height);
+
+    vec3 surfGrad = sign(det) * (bs * r1 + bt * r2);
+    return normalize(abs(det) * normal - scale * surfGrad);
+}
+
+float hash(in float h) {
+    return fract(sin(h) * 43758.5453123);
+}
+
+float noise(in vec3 x) {
+    vec3 p = floor(x);
+    vec3 f = fract(x);
+    f = f * f * (3.0 - 2.0 * f);
+
+    float n = p.x + p.y * 157.0 + 113.0 * p.z;
+    return mix(
+        mix(mix(hash(n + 0.0), hash(n + 1.0), f.x),
+            mix(hash(n + 157.0), hash(n + 158.0), f.x), f.y),
+        mix(mix(hash(n + 113.0), hash(n + 114.0), f.x),
+            mix(hash(n + 270.0), hash(n + 271.0), f.x), f.y), f.z);
+}
+
+float fbm(in vec3 p) {
+    float f = 0.0;
+    f += 0.5 * noise(p);
+    p *= 2.01;
+    f += 0.25 * noise(p);
+    p *= 2.02;
+    f += 0.125 * noise(p);
+
+    return f;
+}
 `;

package/lib/commonjs/mol-gl/shader/chunks/common-vert-params.glsl.js

@@ -1,65 +1,65 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.common_vert_params = void 0;
-exports.common_vert_params = `
-uniform mat4 uProjection, uModel, uView;
-uniform vec3 uCameraPosition;
-uniform vec4 uCameraPlane;
-
-uniform int uObjectId;
-uniform int uVertexCount;
-uniform int uInstanceCount;
-uniform int uGroupCount;
-uniform vec4 uInvariantBoundingSphere;
-uniform vec4 uLod;
-
-uniform bool uDoubleSided;
-uniform int uPickType;
-
-#if dClipObjectCount != 0
-    uniform int uClipObjectType[dClipObjectCount];
-    uniform bool uClipObjectInvert[dClipObjectCount];
-    uniform vec3 uClipObjectPosition[dClipObjectCount];
-    uniform vec4 uClipObjectRotation[dClipObjectCount];
-    uniform vec3 uClipObjectScale[dClipObjectCount];
-
-    #if defined(dClipping)
-        uniform vec2 uClippingTexDim;
-        uniform sampler2D tClipping;
-        #if __VERSION__ == 100 || defined(dClippingType_instance) || !defined(dVaryingGroup)
-            varying float vClipping;
-        #else
-            flat out float vClipping;
-        #endif
-    #endif
-#endif
-
-#if defined(dNeedsMarker)
-    uniform float uMarker;
-    uniform vec2 uMarkerTexDim;
-    uniform sampler2D tMarker;
-    #if __VERSION__ == 100 || defined(dMarkerType_instance) || !defined(dVaryingGroup)
-        varying float vMarker;
-    #else
-        flat out float vMarker;
-    #endif
-#endif
-
-varying vec3 vModelPosition;
-varying vec3 vViewPosition;
-
-#if defined(noNonInstancedActiveAttribs)
-    // int() is needed for some Safari versions
-    // see https://bugs.webkit.org/show_bug.cgi?id=244152
-    #define VertexID int(gl_VertexID)
-#else
-    attribute float aVertex;
-    #define VertexID int(aVertex)
-#endif
-
-#if defined(enabledMultiDraw)
-    #define DrawID gl_DrawID
-#else
-    #define DrawID uDrawId
-#endif
+exports.common_vert_params = `
+uniform mat4 uProjection, uModel, uView;
+uniform vec3 uCameraPosition;
+uniform vec4 uCameraPlane;
+
+uniform int uObjectId;
+uniform int uVertexCount;
+uniform int uInstanceCount;
+uniform int uGroupCount;
+uniform vec4 uInvariantBoundingSphere;
+uniform vec4 uLod;
+
+uniform bool uDoubleSided;
+uniform int uPickType;
+
+#if dClipObjectCount != 0
+    uniform int uClipObjectType[dClipObjectCount];
+    uniform bool uClipObjectInvert[dClipObjectCount];
+    uniform vec3 uClipObjectPosition[dClipObjectCount];
+    uniform vec4 uClipObjectRotation[dClipObjectCount];
+    uniform vec3 uClipObjectScale[dClipObjectCount];
+
+    #if defined(dClipping)
+        uniform vec2 uClippingTexDim;
+        uniform sampler2D tClipping;
+        #if __VERSION__ == 100 || defined(dClippingType_instance) || !defined(dVaryingGroup)
+            varying float vClipping;
+        #else
+            flat out float vClipping;
+        #endif
+    #endif
+#endif
+
+#if defined(dNeedsMarker)
+    uniform float uMarker;
+    uniform vec2 uMarkerTexDim;
+    uniform sampler2D tMarker;
+    #if __VERSION__ == 100 || defined(dMarkerType_instance) || !defined(dVaryingGroup)
+        varying float vMarker;
+    #else
+        flat out float vMarker;
+    #endif
+#endif
+
+varying vec3 vModelPosition;
+varying vec3 vViewPosition;
+
+#if defined(noNonInstancedActiveAttribs)
+    // int() is needed for some Safari versions
+    // see https://bugs.webkit.org/show_bug.cgi?id=244152
+    #define VertexID int(gl_VertexID)
+#else
+    attribute float aVertex;
+    #define VertexID int(aVertex)
+#endif
+
+#if defined(enabledMultiDraw)
+    #define DrawID gl_DrawID
+#else
+    #define DrawID uDrawId
+#endif
 `;