molstar 4.2.0 → 4.3.0

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

@@ -3,93 +3,93 @@
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
-export const cylinders_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 mat4 uModelView;
-
-attribute mat4 aTransform;
-attribute float aInstance;
-attribute float aGroup;
-
-attribute vec3 aMapping;
-attribute vec3 aStart;
-attribute vec3 aEnd;
-attribute float aScale;
-attribute float aCap;
-attribute float aColorMode;
-
-varying mat4 vTransform;
-varying vec3 vStart;
-varying vec3 vEnd;
-varying float vSize;
-varying float vCap;
-
-uniform float uIsOrtho;
-uniform vec3 uCameraDir;
-
-void main() {
-    #include assign_group
-    #include assign_color_varying
-    #include assign_marker_varying
-    #include assign_clipping_varying
-    #include assign_size
-
-    mat4 modelTransform = uModel * aTransform;
-
-    vTransform = aTransform;
-    vStart = (modelTransform * vec4(aStart, 1.0)).xyz;
-    vEnd = (modelTransform * vec4(aEnd, 1.0)).xyz;
-    vSize = size * aScale;
-    vCap = aCap;
-
-    vModelPosition = (vStart + vEnd) * 0.5;
-    vec3 camDir = -mix(normalize(vModelPosition - uCameraPosition), uCameraDir, uIsOrtho);
-    vec3 dir = vEnd - vStart;
-    float f = aMapping.x > 0.0 ? 1.0 : 0.0;
-    // ensure cylinder 'dir' is pointing towards the camera
-    if(dot(camDir, dir) < 0.0) {
-        dir = -dir;
-        f = 1.0 - f;
-    }
-
-    vec3 left = cross(camDir, dir);
-    vec3 up = cross(left, dir);
-    left = vSize * normalize(left);
-    up = vSize * normalize(up);
-
-    // move vertex in object-space from center to corner
-    vModelPosition += aMapping.x * dir + aMapping.y * left + aMapping.z * up;
-
-    vec4 mvPosition = uView * vec4(vModelPosition, 1.0);
-    vViewPosition = mvPosition.xyz;
-    gl_Position = uProjection * mvPosition;
-
-    if (gl_Position.z < -gl_Position.w) {
-        mvPosition.z -= 2.0 * (length(vEnd - vStart) + vSize); // avoid clipping
-        gl_Position.z = (uProjection * mvPosition).z;
-    }
-
-    #if defined(dDualColor) && defined(dRenderVariant_color) && (defined(dColorType_group) || defined(dColorType_groupInstance))
-        // dual-color mixing
-        // - for aColorMode between 0 and 1 use aColorMode to interpolate
-        // - for aColorMode == 2 do nothing, i.e., use vColor
-        // - for aColorMode == 3 use position on cylinder axis to interpolate
-        if (aColorMode <= 1.0){
-            vColor.rgb = mix(vColor.rgb, color2.rgb, aColorMode);
-        } else if (aColorMode == 3.0) {
-            vColor.rgb = mix(vColor.rgb, color2.rgb, mix(-0.25, 1.25, f / 1.5));
-        }
-    #endif
-
-    #include clip_instance
-}
+export const cylinders_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 mat4 uModelView;
+
+attribute mat4 aTransform;
+attribute float aInstance;
+attribute float aGroup;
+
+attribute vec3 aMapping;
+attribute vec3 aStart;
+attribute vec3 aEnd;
+attribute float aScale;
+attribute float aCap;
+attribute float aColorMode;
+
+varying mat4 vTransform;
+varying vec3 vStart;
+varying vec3 vEnd;
+varying float vSize;
+varying float vCap;
+
+uniform float uIsOrtho;
+uniform vec3 uCameraDir;
+
+void main() {
+    #include assign_group
+    #include assign_color_varying
+    #include assign_marker_varying
+    #include assign_clipping_varying
+    #include assign_size
+
+    mat4 modelTransform = uModel * aTransform;
+
+    vTransform = aTransform;
+    vStart = (modelTransform * vec4(aStart, 1.0)).xyz;
+    vEnd = (modelTransform * vec4(aEnd, 1.0)).xyz;
+    vSize = size * aScale;
+    vCap = aCap;
+
+    vModelPosition = (vStart + vEnd) * 0.5;
+    vec3 camDir = -mix(normalize(vModelPosition - uCameraPosition), uCameraDir, uIsOrtho);
+    vec3 dir = vEnd - vStart;
+    float f = aMapping.x > 0.0 ? 1.0 : 0.0;
+    // ensure cylinder 'dir' is pointing towards the camera
+    if(dot(camDir, dir) < 0.0) {
+        dir = -dir;
+        f = 1.0 - f;
+    }
+
+    vec3 left = cross(camDir, dir);
+    vec3 up = cross(left, dir);
+    left = vSize * normalize(left);
+    up = vSize * normalize(up);
+
+    // move vertex in object-space from center to corner
+    vModelPosition += aMapping.x * dir + aMapping.y * left + aMapping.z * up;
+
+    vec4 mvPosition = uView * vec4(vModelPosition, 1.0);
+    vViewPosition = mvPosition.xyz;
+    gl_Position = uProjection * mvPosition;
+
+    if (gl_Position.z < -gl_Position.w) {
+        mvPosition.z -= 2.0 * (length(vEnd - vStart) + vSize); // avoid clipping
+        gl_Position.z = (uProjection * mvPosition).z;
+    }
+
+    #if defined(dDualColor) && defined(dRenderVariant_color) && (defined(dColorType_group) || defined(dColorType_groupInstance))
+        // dual-color mixing
+        // - for aColorMode between 0 and 1 use aColorMode to interpolate
+        // - for aColorMode == 2 do nothing, i.e., use vColor
+        // - for aColorMode == 3 use position on cylinder axis to interpolate
+        if (aColorMode <= 1.0){
+            vColor.rgb = mix(vColor.rgb, color2.rgb, aColorMode);
+        } else if (aColorMode == 3.0) {
+            vColor.rgb = mix(vColor.rgb, color2.rgb, mix(-0.25, 1.25, f / 1.5));
+        }
+    #endif
+
+    #include clip_instance
+}
 `;

package/lib/mol-gl/shader/depth-merge.frag.js

@@ -1,24 +1,24 @@
-export const depthMerge_frag = `
-precision highp float;
-precision highp sampler2D;
-
-uniform sampler2D tDepthPrimitives;
-uniform sampler2D tDepthVolumes;
-uniform vec2 uTexSize;
-
-#include common
-
-float getDepth(const in vec2 coords, sampler2D tDepth) {
-    #ifdef dPackedDepth
-        return unpackRGBAToDepth(texture2D(tDepth, coords));
-    #else
-        return texture2D(tDepth, coords).r;
-    #endif
-}
-
-void main() {
-    vec2 coords = gl_FragCoord.xy / uTexSize;
-    float depth = min(getDepth(coords, tDepthPrimitives), getDepth(coords, tDepthVolumes));
-    gl_FragColor = packDepthToRGBA(depth);
-}
+export const depthMerge_frag = `
+precision highp float;
+precision highp sampler2D;
+
+uniform sampler2D tDepthPrimitives;
+uniform sampler2D tDepthVolumes;
+uniform vec2 uTexSize;
+
+#include common
+
+float getDepth(const in vec2 coords, sampler2D tDepth) {
+    #ifdef dPackedDepth
+        return unpackRGBAToDepth(texture2D(tDepth, coords));
+    #else
+        return texture2D(tDepth, coords).r;
+    #endif
+}
+
+void main() {
+    vec2 coords = gl_FragCoord.xy / uTexSize;
+    float depth = min(getDepth(coords, tDepthPrimitives), getDepth(coords, tDepthVolumes));
+    gl_FragColor = packDepthToRGBA(depth);
+}
 `;