molstar 4.2.0 → 4.3.0

package/lib/commonjs/mol-gl/shader/direct-volume.vert.js

@@ -7,45 +7,45 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.directVolume_vert = void 0;
-exports.directVolume_vert = `
-precision highp float;
-
-attribute vec3 aPosition;
-attribute mat4 aTransform;
-attribute float aInstance;
-
-uniform mat4 uModelView;
-uniform mat4 uProjection;
-uniform vec4 uInvariantBoundingSphere;
-
-varying vec3 vOrigPos;
-varying float vInstance;
-varying vec4 vBoundingSphere;
-varying mat4 vTransform;
-
-uniform vec3 uBboxSize;
-uniform vec3 uBboxMin;
-uniform vec3 uBboxMax;
-uniform vec3 uGridDim;
-uniform mat4 uTransform;
-
-uniform mat4 uUnitToCartn;
-
-void main() {
-    vec4 unitCoord = vec4(aPosition + vec3(0.5), 1.0);
-    vec4 mvPosition = uModelView * aTransform * uUnitToCartn * unitCoord;
-
-    vOrigPos = (aTransform * uUnitToCartn * unitCoord).xyz;
-    vInstance = aInstance;
-    vBoundingSphere = vec4(
-        (aTransform * vec4(uInvariantBoundingSphere.xyz, 1.0)).xyz,
-        uInvariantBoundingSphere.w
-    );
-    vTransform = aTransform;
-
-    gl_Position = uProjection * mvPosition;
-
-    // move z position to near clip plane (but not too close to get precision issues)
-    gl_Position.z = gl_Position.w - 0.01;
-}
+exports.directVolume_vert = `
+precision highp float;
+
+attribute vec3 aPosition;
+attribute mat4 aTransform;
+attribute float aInstance;
+
+uniform mat4 uModelView;
+uniform mat4 uProjection;
+uniform vec4 uInvariantBoundingSphere;
+
+varying vec3 vOrigPos;
+varying float vInstance;
+varying vec4 vBoundingSphere;
+varying mat4 vTransform;
+
+uniform vec3 uBboxSize;
+uniform vec3 uBboxMin;
+uniform vec3 uBboxMax;
+uniform vec3 uGridDim;
+uniform mat4 uTransform;
+
+uniform mat4 uUnitToCartn;
+
+void main() {
+    vec4 unitCoord = vec4(aPosition + vec3(0.5), 1.0);
+    vec4 mvPosition = uModelView * aTransform * uUnitToCartn * unitCoord;
+
+    vOrigPos = (aTransform * uUnitToCartn * unitCoord).xyz;
+    vInstance = aInstance;
+    vBoundingSphere = vec4(
+        (aTransform * vec4(uInvariantBoundingSphere.xyz, 1.0)).xyz,
+        uInvariantBoundingSphere.w
+    );
+    vTransform = aTransform;
+
+    gl_Position = uProjection * mvPosition;
+
+    // move z position to near clip plane (but not too close to get precision issues)
+    gl_Position.z = gl_Position.w - 0.01;
+}
 `;

package/lib/commonjs/mol-gl/shader/dof.frag.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) 2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Ludovic Autin <autin@scripps.edu>
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ */
+export declare const dof_frag = "\nprecision highp float;\nprecision highp int;\nprecision highp sampler2D;\n\n#include common\n\nuniform sampler2D tColor;\nuniform sampler2D tDepthOpaque;\nuniform sampler2D tDepthTransparent;\n\nuniform vec2 uTexSize;\nuniform vec4 uBounds;\n\nuniform float uBlurSpread;\nuniform float uInFocus;\nuniform float uPPM;\n\nuniform float uNear; // Near plane\nuniform float uFar;  // Far plane\n\nuniform mat4 uInvProjection; // Inverse projection\nuniform mat4 uProjection; // projection\n\nuniform int uMode; // 0-planar, 1-spherical\nuniform vec3 uCenter; // Center of focus sphere in view space\n\n// Function to convert depth value from depth buffer to view space Z\nfloat getViewZ(const in float depth) {\n    #if dOrthographic == 1\n        return orthographicDepthToViewZ(depth, uNear, uFar);\n    #else\n        return perspectiveDepthToViewZ(depth, uNear, uFar);\n    #endif\n}\n\n// Retrieve depth from opaque depth texture\nfloat getDepthOpaque(const in vec2 coords) {\n    #ifdef depthTextureSupport\n        return texture2D(tDepthOpaque, coords).r;\n    #else\n        return unpackRGBAToDepth(texture2D(tDepthOpaque, coords));\n    #endif\n}\n\n// Retrieve depth from transparent depth texture\nfloat getDepthTransparent(const in vec2 coords) {\n    return unpackRGBAToDepth(texture2D(tDepthTransparent, coords));\n}\n\nbool isBackground(const in float depth) {\n    return depth == 1.0;\n}\n\nfloat getDepth(const in vec2 coords) {\n    return min(getDepthOpaque(coords), getDepthTransparent(coords));\n}\n\nfloat getCOC(vec2 uv) {\n    float depth = getDepth(uv);\n    float viewDist = getViewZ(depth);\n    vec3 aposition = screenSpaceToViewSpace(vec3(uv.xy, depth), uInvProjection);\n    float focusDist = length(aposition - uCenter);\n    float coc = 0.0;  // Circle of Confusion\n    if (uMode == 0) { // planar Depth of field\n        coc = (abs(viewDist) - uInFocus) / uPPM;  //focus distance, focus range\n    } else if(uMode == 1) { // spherical Depth of field\n        coc = focusDist / uPPM ;\n    }\n    coc = clamp(coc, -1.0, 1.0);\n    return coc;\n}\n\n// Simple box blur for blurring the image\nvec3 getBlurredImage(vec2 coords) {\n    vec4 blurColor = vec4(0);\n    vec2 texelSize = vec2(1.0 / uTexSize.x, 1.0 / uTexSize.y);\n    float count = 0.0;\n    for (int x = 0; x < int(dBlurSize); x++) {\n        for (int y = 0; y < int(dBlurSize); y++) {\n            vec2 offset = vec2(float(x) - float(dBlurSize) / 2.0, float(y) - float(dBlurSize) / 2.0);\n            vec2 uvPixel = coords.xy + offset * texelSize * uBlurSpread;\n            float coc = getCOC(uvPixel);\n            coc = smoothstep(0.0, 1.0, abs(coc));\n            // mix blurColor with new color with weight coc\n            blurColor.rgb = blurColor.rgb + texture2D(tColor, uvPixel).xyz * coc;\n            count+=coc;\n        }\n    }\n    blurColor = blurColor / count;\n    return blurColor.rgb;\n}\n\n// simplification from https://catlikecoding.com/unity/tutorials/advanced-rendering/depth-of-field/\nvoid main() {\n    vec2 uv = gl_FragCoord.xy / uTexSize;\n    vec4 color = texture2D(tColor, uv);\n    float depth = getDepth(uv);\n\n    float viewDist = getViewZ(depth);\n\n    vec3 aposition = screenSpaceToViewSpace(vec3(uv.xy, depth), uInvProjection);\n    float focusDist = length(aposition - uCenter);\n    vec3 blurColor = getBlurredImage(uv);\n\n    float coc = getCOC(uv); // Circle of Confusion\n\n    // for debugging the coc\n    // color.rgb = (coc < 0.0) ? (1.0 - abs(coc)) * vec3(1.0,0.0,0.0) : vec3(0.0, 1.0 - coc, 0.0) ;//mix(color.rgb, blurColor.rgb, abs(coc));\n    color.rgb = mix(color.rgb, blurColor, smoothstep(0.0, 1.0, abs(coc))); // Smooth blending based on CoC\n    gl_FragColor = color;\n}\n";

package/lib/commonjs/mol-gl/shader/dof.frag.js

@@ -0,0 +1,122 @@
+"use strict";
+/**
+ * Copyright (c) 2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Ludovic Autin <autin@scripps.edu>
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.dof_frag = void 0;
+exports.dof_frag = `
+precision highp float;
+precision highp int;
+precision highp sampler2D;
+
+#include common
+
+uniform sampler2D tColor;
+uniform sampler2D tDepthOpaque;
+uniform sampler2D tDepthTransparent;
+
+uniform vec2 uTexSize;
+uniform vec4 uBounds;
+
+uniform float uBlurSpread;
+uniform float uInFocus;
+uniform float uPPM;
+
+uniform float uNear; // Near plane
+uniform float uFar;  // Far plane
+
+uniform mat4 uInvProjection; // Inverse projection
+uniform mat4 uProjection; // projection
+
+uniform int uMode; // 0-planar, 1-spherical
+uniform vec3 uCenter; // Center of focus sphere in view space
+
+// Function to convert depth value from depth buffer to view space Z
+float getViewZ(const in float depth) {
+    #if dOrthographic == 1
+        return orthographicDepthToViewZ(depth, uNear, uFar);
+    #else
+        return perspectiveDepthToViewZ(depth, uNear, uFar);
+    #endif
+}
+
+// Retrieve depth from opaque depth texture
+float getDepthOpaque(const in vec2 coords) {
+    #ifdef depthTextureSupport
+        return texture2D(tDepthOpaque, coords).r;
+    #else
+        return unpackRGBAToDepth(texture2D(tDepthOpaque, coords));
+    #endif
+}
+
+// Retrieve depth from transparent depth texture
+float getDepthTransparent(const in vec2 coords) {
+    return unpackRGBAToDepth(texture2D(tDepthTransparent, coords));
+}
+
+bool isBackground(const in float depth) {
+    return depth == 1.0;
+}
+
+float getDepth(const in vec2 coords) {
+    return min(getDepthOpaque(coords), getDepthTransparent(coords));
+}
+
+float getCOC(vec2 uv) {
+    float depth = getDepth(uv);
+    float viewDist = getViewZ(depth);
+    vec3 aposition = screenSpaceToViewSpace(vec3(uv.xy, depth), uInvProjection);
+    float focusDist = length(aposition - uCenter);
+    float coc = 0.0;  // Circle of Confusion
+    if (uMode == 0) { // planar Depth of field
+        coc = (abs(viewDist) - uInFocus) / uPPM;  //focus distance, focus range
+    } else if(uMode == 1) { // spherical Depth of field
+        coc = focusDist / uPPM ;
+    }
+    coc = clamp(coc, -1.0, 1.0);
+    return coc;
+}
+
+// Simple box blur for blurring the image
+vec3 getBlurredImage(vec2 coords) {
+    vec4 blurColor = vec4(0);
+    vec2 texelSize = vec2(1.0 / uTexSize.x, 1.0 / uTexSize.y);
+    float count = 0.0;
+    for (int x = 0; x < int(dBlurSize); x++) {
+        for (int y = 0; y < int(dBlurSize); y++) {
+            vec2 offset = vec2(float(x) - float(dBlurSize) / 2.0, float(y) - float(dBlurSize) / 2.0);
+            vec2 uvPixel = coords.xy + offset * texelSize * uBlurSpread;
+            float coc = getCOC(uvPixel);
+            coc = smoothstep(0.0, 1.0, abs(coc));
+            // mix blurColor with new color with weight coc
+            blurColor.rgb = blurColor.rgb + texture2D(tColor, uvPixel).xyz * coc;
+            count+=coc;
+        }
+    }
+    blurColor = blurColor / count;
+    return blurColor.rgb;
+}
+
+// simplification from https://catlikecoding.com/unity/tutorials/advanced-rendering/depth-of-field/
+void main() {
+    vec2 uv = gl_FragCoord.xy / uTexSize;
+    vec4 color = texture2D(tColor, uv);
+    float depth = getDepth(uv);
+
+    float viewDist = getViewZ(depth);
+
+    vec3 aposition = screenSpaceToViewSpace(vec3(uv.xy, depth), uInvProjection);
+    float focusDist = length(aposition - uCenter);
+    vec3 blurColor = getBlurredImage(uv);
+
+    float coc = getCOC(uv); // Circle of Confusion
+
+    // for debugging the coc
+    // color.rgb = (coc < 0.0) ? (1.0 - abs(coc)) * vec3(1.0,0.0,0.0) : vec3(0.0, 1.0 - coc, 0.0) ;//mix(color.rgb, blurColor.rgb, abs(coc));
+    color.rgb = mix(color.rgb, blurColor, smoothstep(0.0, 1.0, abs(coc))); // Smooth blending based on CoC
+    gl_FragColor = color;
+}
+`;

package/lib/commonjs/mol-gl/shader/evaluate-dpoit.frag.js

@@ -6,14 +6,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.evaluateDpoit_frag = void 0;
-exports.evaluateDpoit_frag = `
-precision highp float;
-
-uniform sampler2D tDpoitFrontColor;
-uniform vec2 uTexSize;
-
-void main() {
-    vec2 coords = gl_FragCoord.xy / uTexSize;
-    gl_FragColor = texture2D(tDpoitFrontColor, coords);
-}
+exports.evaluateDpoit_frag = `
+precision highp float;
+
+uniform sampler2D tDpoitFrontColor;
+uniform vec2 uTexSize;
+
+void main() {
+    vec2 coords = gl_FragCoord.xy / uTexSize;
+    gl_FragColor = texture2D(tDpoitFrontColor, coords);
+}
 `;

package/lib/commonjs/mol-gl/shader/evaluate-wboit.frag.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.evaluateWboit_frag = void 0;
-exports.evaluateWboit_frag = `
-precision highp float;
-
-uniform sampler2D tWboitA;
-uniform sampler2D tWboitB;
-uniform vec2 uTexSize;
-
-void main() {
-    vec2 coords = gl_FragCoord.xy / uTexSize;
-
-    vec4 accum = texture2D(tWboitA, coords);
-    float r = 1.0 - accum.a;
-
-    accum.a = texture2D(tWboitB, coords).r;
-    // divisor needs to allow very small values for nice fading
-    gl_FragColor = vec4(accum.rgb / clamp(accum.a, 0.00000001, 50000.0), r);
-}
+exports.evaluateWboit_frag = `
+precision highp float;
+
+uniform sampler2D tWboitA;
+uniform sampler2D tWboitB;
+uniform vec2 uTexSize;
+
+void main() {
+    vec2 coords = gl_FragCoord.xy / uTexSize;
+
+    vec4 accum = texture2D(tWboitA, coords);
+    float r = 1.0 - accum.a;
+
+    accum.a = texture2D(tWboitB, coords).r;
+    // divisor needs to allow very small values for nice fading
+    gl_FragColor = vec4(accum.rgb / clamp(accum.a, 0.00000001, 50000.0), r);
+}
 `;