molstar 4.2.0 → 4.3.0

package/lib/mol-gl/shader/lines.vert.js

@@ -5,121 +5,121 @@
  *
  * heavily based on code by WestLangley from https://github.com/WestLangley/three.js/blob/af28b2fb706ac109771ecad0a7447fad90ab3210/examples/js/lines/LineMaterial.js
  */
-export const lines_vert = `
-precision highp float;
-precision highp int;
-
-#include common
-#include read_from_texture
-#include common_vert_params
-#include color_vert_params
-#include size_vert_params
-#include common_clip
-
-uniform float uPixelRatio;
-uniform vec4 uViewport;
-
-attribute mat4 aTransform;
-attribute float aInstance;
-attribute float aGroup;
-
-attribute vec2 aMapping;
-attribute vec3 aStart;
-attribute vec3 aEnd;
-
-void trimSegment(const in vec4 start, inout vec4 end) {
-    // trim end segment so it terminates between the camera plane and the near plane
-    // conservative estimate of the near plane
-    float a = uProjection[2][2];  // 3rd entry in 3rd column
-    float b = uProjection[3][2];  // 3rd entry in 4th column
-    float nearEstimate = -0.5 * b / a;
-    float alpha = (nearEstimate - start.z) / (end.z - start.z);
-    end.xyz = mix(start.xyz, end.xyz, alpha);
-}
-
-void main(){
-    float aspect = uViewport.z / uViewport.w;
-
-    #include assign_group
-    #include assign_color_varying
-    #include assign_marker_varying
-    #include assign_clipping_varying
-    #include assign_size
-
-    mat4 modelView = uView * uModel * aTransform;
-
-    // camera space
-    vec4 start = modelView * vec4(aStart, 1.0);
-    vec4 end = modelView * vec4(aEnd, 1.0);
-
-    // assign position
-    vec4 position4 = vec4((aMapping.y < 0.5) ? aStart : aEnd, 1.0);
-    vec4 mvPosition = modelView * position4;
-    vViewPosition = mvPosition.xyz;
-
-    vModelPosition = (uModel * aTransform * position4).xyz; // for clipping in frag shader
-
-    // special case for perspective projection, and segments that terminate either in, or behind, the camera plane
-    // clearly the gpu firmware has a way of addressing this issue when projecting into ndc space
-    // but we need to perform ndc-space calculations in the shader, so we must address this issue directly
-    // perhaps there is a more elegant solution -- WestLangley
-    bool perspective = (uProjection[2][3] == -1.0); // 4th entry in the 3rd column
-    if (perspective) {
-        if (start.z < 0.0 && end.z >= 0.0) {
-            trimSegment(start, end);
-        } else if (end.z < 0.0 && start.z >= 0.0) {
-            trimSegment(end, start);
-        }
-    }
-
-    // clip space
-    vec4 clipStart = uProjection * start;
-    vec4 clipEnd = uProjection * end;
-
-    // ndc space
-    vec2 ndcStart = clipStart.xy / clipStart.w;
-    vec2 ndcEnd = clipEnd.xy / clipEnd.w;
-
-    // direction
-    vec2 dir = ndcEnd - ndcStart;
-
-    // account for clip-space aspect ratio
-    dir.x *= aspect;
-    dir = normalize(dir);
-
-    // perpendicular to dir
-    vec2 offset = vec2(dir.y, - dir.x);
-
-    // undo aspect ratio adjustment
-    dir.x /= aspect;
-    offset.x /= aspect;
-
-    // sign flip
-    if (aMapping.x < 0.0) offset *= -1.0;
-
-    // calculate linewidth
-    float linewidth;
-    #ifdef dLineSizeAttenuation
-        linewidth = size * uPixelRatio * ((uViewport.w / 2.0) / -start.z) * 5.0;
-    #else
-        linewidth = size * uPixelRatio;
-    #endif
-    linewidth = max(1.0, linewidth);
-
-    // adjust for linewidth
-    offset *= linewidth;
-
-    // adjust for clip-space to screen-space conversion
-    offset /= uViewport.w;
-
-    // select end
-    vec4 clip = (aMapping.y < 0.5) ? clipStart : clipEnd;
-
-    // back to clip space
-    offset *= clip.w;
-    clip.xy += offset;
-    gl_Position = clip;
-
-    #include clip_instance
-}
+export const lines_vert = `
+precision highp float;
+precision highp int;
+
+#include common
+#include read_from_texture
+#include common_vert_params
+#include color_vert_params
+#include size_vert_params
+#include common_clip
+
+uniform float uPixelRatio;
+uniform vec4 uViewport;
+
+attribute mat4 aTransform;
+attribute float aInstance;
+attribute float aGroup;
+
+attribute vec2 aMapping;
+attribute vec3 aStart;
+attribute vec3 aEnd;
+
+void trimSegment(const in vec4 start, inout vec4 end) {
+    // trim end segment so it terminates between the camera plane and the near plane
+    // conservative estimate of the near plane
+    float a = uProjection[2][2];  // 3rd entry in 3rd column
+    float b = uProjection[3][2];  // 3rd entry in 4th column
+    float nearEstimate = -0.5 * b / a;
+    float alpha = (nearEstimate - start.z) / (end.z - start.z);
+    end.xyz = mix(start.xyz, end.xyz, alpha);
+}
+
+void main(){
+    float aspect = uViewport.z / uViewport.w;
+
+    #include assign_group
+    #include assign_color_varying
+    #include assign_marker_varying
+    #include assign_clipping_varying
+    #include assign_size
+
+    mat4 modelView = uView * uModel * aTransform;
+
+    // camera space
+    vec4 start = modelView * vec4(aStart, 1.0);
+    vec4 end = modelView * vec4(aEnd, 1.0);
+
+    // assign position
+    vec4 position4 = vec4((aMapping.y < 0.5) ? aStart : aEnd, 1.0);
+    vec4 mvPosition = modelView * position4;
+    vViewPosition = mvPosition.xyz;
+
+    vModelPosition = (uModel * aTransform * position4).xyz; // for clipping in frag shader
+
+    // special case for perspective projection, and segments that terminate either in, or behind, the camera plane
+    // clearly the gpu firmware has a way of addressing this issue when projecting into ndc space
+    // but we need to perform ndc-space calculations in the shader, so we must address this issue directly
+    // perhaps there is a more elegant solution -- WestLangley
+    bool perspective = (uProjection[2][3] == -1.0); // 4th entry in the 3rd column
+    if (perspective) {
+        if (start.z < 0.0 && end.z >= 0.0) {
+            trimSegment(start, end);
+        } else if (end.z < 0.0 && start.z >= 0.0) {
+            trimSegment(end, start);
+        }
+    }
+
+    // clip space
+    vec4 clipStart = uProjection * start;
+    vec4 clipEnd = uProjection * end;
+
+    // ndc space
+    vec2 ndcStart = clipStart.xy / clipStart.w;
+    vec2 ndcEnd = clipEnd.xy / clipEnd.w;
+
+    // direction
+    vec2 dir = ndcEnd - ndcStart;
+
+    // account for clip-space aspect ratio
+    dir.x *= aspect;
+    dir = normalize(dir);
+
+    // perpendicular to dir
+    vec2 offset = vec2(dir.y, - dir.x);
+
+    // undo aspect ratio adjustment
+    dir.x /= aspect;
+    offset.x /= aspect;
+
+    // sign flip
+    if (aMapping.x < 0.0) offset *= -1.0;
+
+    // calculate linewidth
+    float linewidth;
+    #ifdef dLineSizeAttenuation
+        linewidth = size * uPixelRatio * ((uViewport.w / 2.0) / -start.z) * 5.0;
+    #else
+        linewidth = size * uPixelRatio;
+    #endif
+    linewidth = max(1.0, linewidth);
+
+    // adjust for linewidth
+    offset *= linewidth;
+
+    // adjust for clip-space to screen-space conversion
+    offset /= uViewport.w;
+
+    // select end
+    vec4 clip = (aMapping.y < 0.5) ? clipStart : clipEnd;
+
+    // back to clip space
+    offset *= clip.w;
+    clip.xy += offset;
+    gl_Position = clip;
+
+    #include clip_instance
+}
 `;

package/lib/mol-gl/shader/marching-cubes/active-voxels.frag.js

@@ -1,71 +1,71 @@
-export const activeVoxels_frag = `
-precision highp float;
-precision highp int;
-precision highp sampler2D;
-
-uniform sampler2D tTriCount;
-uniform sampler2D tVolumeData;
-
-uniform float uIsoValue;
-uniform vec3 uGridDim;
-uniform vec3 uGridTexDim;
-uniform vec2 uScale;
-
-#include common
-
-// cube corners (excluding origin)
-const vec3 c1 = vec3(1., 0., 0.);
-const vec3 c2 = vec3(1., 1., 0.);
-const vec3 c3 = vec3(0., 1., 0.);
-const vec3 c4 = vec3(0., 0., 1.);
-const vec3 c5 = vec3(1., 0., 1.);
-const vec3 c6 = vec3(1., 1., 1.);
-const vec3 c7 = vec3(0., 1., 1.);
-
-vec3 index3dFrom2d(vec2 coord) {
-    vec2 gridTexPos = coord * uGridTexDim.xy;
-    vec2 columnRow = ivec2Div(gridTexPos, uGridDim.xy);
-    vec2 posXY = gridTexPos - columnRow * uGridDim.xy;
-    float posZ = columnRow.y * intDiv(uGridTexDim.x, uGridDim.x) + columnRow.x;
-    return vec3(posXY, posZ);
-}
-
-vec4 texture3dFrom2dNearest(sampler2D tex, vec3 pos, vec3 gridDim, vec2 texDim) {
-    float zSlice = floor(pos.z * gridDim.z + 0.5); // round to nearest z-slice
-    float column = intDiv(intMod(zSlice * gridDim.x, texDim.x), gridDim.x);
-    float row = intDiv(zSlice * gridDim.x, texDim.x);
-    vec2 coord = (vec2(column * gridDim.x, row * gridDim.y) + (pos.xy * gridDim.xy)) / (texDim / uScale);
-    return texture2D(tex, coord);
-}
-
-vec4 voxel(vec3 pos) {
-    pos = min(max(vec3(0.0), pos), uGridDim - vec3(1.0));
-    return texture3dFrom2dNearest(tVolumeData, pos / uGridDim, uGridDim, uGridTexDim.xy);
-}
-
-void main(void) {
-    vec2 uv = gl_FragCoord.xy / uGridTexDim.xy;
-    vec3 posXYZ = index3dFrom2d(uv);
-
-    // get MC case as the sum of corners that are below the given iso level
-    float c = step(voxel(posXYZ).a, uIsoValue)
-        + 2. * step(voxel(posXYZ + c1).a, uIsoValue)
-        + 4. * step(voxel(posXYZ + c2).a, uIsoValue)
-        + 8. * step(voxel(posXYZ + c3).a, uIsoValue)
-        + 16. * step(voxel(posXYZ + c4).a, uIsoValue)
-        + 32. * step(voxel(posXYZ + c5).a, uIsoValue)
-        + 64. * step(voxel(posXYZ + c6).a, uIsoValue)
-        + 128. * step(voxel(posXYZ + c7).a, uIsoValue);
-    c *= step(c, 254.);
-
-    // handle out of bounds positions
-    posXYZ += 1.0;
-    posXYZ.xy += 1.0; // pixel padding (usually ok even if the texture has no padding)
-    if (posXYZ.x >= uGridDim.x || posXYZ.y >= uGridDim.y || posXYZ.z >= uGridDim.z)
-        c = 0.0;
-
-    // get total triangles to generate for calculated MC case from triCount texture
-    float totalTrianglesToGenerate = texture2D(tTriCount, vec2(intMod(c, 16.), floor(c / 16.)) / 16.).a;
-    gl_FragColor = vec4(vec3(totalTrianglesToGenerate * 3.0), c / 255.0);
-}
+export const activeVoxels_frag = `
+precision highp float;
+precision highp int;
+precision highp sampler2D;
+
+uniform sampler2D tTriCount;
+uniform sampler2D tVolumeData;
+
+uniform float uIsoValue;
+uniform vec3 uGridDim;
+uniform vec3 uGridTexDim;
+uniform vec2 uScale;
+
+#include common
+
+// cube corners (excluding origin)
+const vec3 c1 = vec3(1., 0., 0.);
+const vec3 c2 = vec3(1., 1., 0.);
+const vec3 c3 = vec3(0., 1., 0.);
+const vec3 c4 = vec3(0., 0., 1.);
+const vec3 c5 = vec3(1., 0., 1.);
+const vec3 c6 = vec3(1., 1., 1.);
+const vec3 c7 = vec3(0., 1., 1.);
+
+vec3 index3dFrom2d(vec2 coord) {
+    vec2 gridTexPos = coord * uGridTexDim.xy;
+    vec2 columnRow = ivec2Div(gridTexPos, uGridDim.xy);
+    vec2 posXY = gridTexPos - columnRow * uGridDim.xy;
+    float posZ = columnRow.y * intDiv(uGridTexDim.x, uGridDim.x) + columnRow.x;
+    return vec3(posXY, posZ);
+}
+
+vec4 texture3dFrom2dNearest(sampler2D tex, vec3 pos, vec3 gridDim, vec2 texDim) {
+    float zSlice = floor(pos.z * gridDim.z + 0.5); // round to nearest z-slice
+    float column = intDiv(intMod(zSlice * gridDim.x, texDim.x), gridDim.x);
+    float row = intDiv(zSlice * gridDim.x, texDim.x);
+    vec2 coord = (vec2(column * gridDim.x, row * gridDim.y) + (pos.xy * gridDim.xy)) / (texDim / uScale);
+    return texture2D(tex, coord);
+}
+
+vec4 voxel(vec3 pos) {
+    pos = min(max(vec3(0.0), pos), uGridDim - vec3(1.0));
+    return texture3dFrom2dNearest(tVolumeData, pos / uGridDim, uGridDim, uGridTexDim.xy);
+}
+
+void main(void) {
+    vec2 uv = gl_FragCoord.xy / uGridTexDim.xy;
+    vec3 posXYZ = index3dFrom2d(uv);
+
+    // get MC case as the sum of corners that are below the given iso level
+    float c = step(voxel(posXYZ).a, uIsoValue)
+        + 2. * step(voxel(posXYZ + c1).a, uIsoValue)
+        + 4. * step(voxel(posXYZ + c2).a, uIsoValue)
+        + 8. * step(voxel(posXYZ + c3).a, uIsoValue)
+        + 16. * step(voxel(posXYZ + c4).a, uIsoValue)
+        + 32. * step(voxel(posXYZ + c5).a, uIsoValue)
+        + 64. * step(voxel(posXYZ + c6).a, uIsoValue)
+        + 128. * step(voxel(posXYZ + c7).a, uIsoValue);
+    c *= step(c, 254.);
+
+    // handle out of bounds positions
+    posXYZ += 1.0;
+    posXYZ.xy += 1.0; // pixel padding (usually ok even if the texture has no padding)
+    if (posXYZ.x >= uGridDim.x || posXYZ.y >= uGridDim.y || posXYZ.z >= uGridDim.z)
+        c = 0.0;
+
+    // get total triangles to generate for calculated MC case from triCount texture
+    float totalTrianglesToGenerate = texture2D(tTriCount, vec2(intMod(c, 16.), floor(c / 16.)) / 16.).a;
+    gl_FragColor = vec4(vec3(totalTrianglesToGenerate * 3.0), c / 255.0);
+}
 `;