molstar 4.2.0 → 4.3.0

package/lib/commonjs/mol-gl/shader/chunks/assign-size.glsl.js

@@ -1,22 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assign_size = void 0;
-exports.assign_size = `
-#if defined(dSizeType_uniform)
-    float size = uSize;
-#elif defined(dSizeType_attribute)
-    float size = aSize;
-#elif defined(dSizeType_instance)
-    float size = unpackRGBToInt(readFromTexture(tSize, aInstance, uSizeTexDim).rgb);
-#elif defined(dSizeType_group)
-    float size = unpackRGBToInt(readFromTexture(tSize, group, uSizeTexDim).rgb);
-#elif defined(dSizeType_groupInstance)
-    float size = unpackRGBToInt(readFromTexture(tSize, aInstance * float(uGroupCount) + group, uSizeTexDim).rgb);
-#endif
-
-#if defined(dSizeType_instance) || defined(dSizeType_group) || defined(dSizeType_groupInstance)
-    size /= 100.0; // NOTE factor also set in TypeScript
-#endif
-
-size *= uSizeFactor;
+exports.assign_size = `
+#if defined(dSizeType_uniform)
+    float size = uSize;
+#elif defined(dSizeType_attribute)
+    float size = aSize;
+#elif defined(dSizeType_instance)
+    float size = unpackRGBToInt(readFromTexture(tSize, aInstance, uSizeTexDim).rgb);
+#elif defined(dSizeType_group)
+    float size = unpackRGBToInt(readFromTexture(tSize, group, uSizeTexDim).rgb);
+#elif defined(dSizeType_groupInstance)
+    float size = unpackRGBToInt(readFromTexture(tSize, aInstance * float(uGroupCount) + group, uSizeTexDim).rgb);
+#endif
+
+#if defined(dSizeType_instance) || defined(dSizeType_group) || defined(dSizeType_groupInstance)
+    size /= 100.0; // NOTE factor also set in TypeScript
+#endif
+
+size *= uSizeFactor;
 `;

package/lib/commonjs/mol-gl/shader/chunks/check-picking-alpha.glsl.js

@@ -1,16 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.check_picking_alpha = void 0;
-exports.check_picking_alpha = `
-float viewZ = depthToViewZ(uIsOrtho, fragmentDepth, uNear, uFar);
-float fogFactor = smoothstep(uFogNear, uFogFar, abs(viewZ));
-float alpha = (1.0 - fogFactor) * uAlpha;
-// if not opaque enough ignore so the element below can be picked
-if (uAlpha < uPickingAlphaThreshold || alpha < 0.1) {
-    #ifdef dTransparentBackfaces_opaque
-        if (!interior) discard;
-    #else
-        discard;
-    #endif
-}
+exports.check_picking_alpha = `
+float viewZ = depthToViewZ(uIsOrtho, fragmentDepth, uNear, uFar);
+float fogFactor = smoothstep(uFogNear, uFogFar, abs(viewZ));
+float alpha = (1.0 - fogFactor) * uAlpha;
+// if not opaque enough ignore so the element below can be picked
+if (uAlpha < uPickingAlphaThreshold || alpha < 0.1) {
+    #ifdef dTransparentBackfaces_opaque
+        if (!interior) discard;
+    #else
+        discard;
+    #endif
+}
 `;

package/lib/commonjs/mol-gl/shader/chunks/check-transparency.glsl.js

@@ -1,20 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.check_transparency = void 0;
-exports.check_transparency = `
-#if defined(dRenderVariant_color)
-    #if defined(dTransparentBackfaces_off)
-        if (interior && material.a < 1.0) discard;
-    #elif defined(dTransparentBackfaces_opaque)
-        if (interior) material.a = 1.0;
-    #endif
-
-    #if !defined(dXrayShaded_on) && !defined(dXrayShaded_inverted)
-        if ((uRenderMask == MaskOpaque && material.a < 1.0) ||
-            (uRenderMask == MaskTransparent && material.a == 1.0)
-        ) {
-            discard;
-        }
-    #endif
-#endif
+exports.check_transparency = `
+#if defined(dRenderVariant_color)
+    #if defined(dTransparentBackfaces_off)
+        if (interior && material.a < 1.0) discard;
+    #elif defined(dTransparentBackfaces_opaque)
+        if (interior) material.a = 1.0;
+    #endif
+
+    #if !defined(dXrayShaded_on) && !defined(dXrayShaded_inverted)
+        if ((uRenderMask == MaskOpaque && material.a < 1.0) ||
+            (uRenderMask == MaskTransparent && material.a == 1.0)
+        ) {
+            discard;
+        }
+    #endif
+#endif
 `;

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

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clip_instance = void 0;
-exports.clip_instance = `
-#if defined(dClipVariant_instance) && dClipObjectCount != 0
-    vec4 mCenter = uModel * aTransform * vec4(uInvariantBoundingSphere.xyz, 1.0);
-    if (clipTest(vec4(mCenter.xyz, uInvariantBoundingSphere.w)))
-        // move out of [ -w, +w ] to 'discard' in vert shader
-        gl_Position.z = 2.0 * gl_Position.w;
-#endif
+exports.clip_instance = `
+#if defined(dClipVariant_instance) && dClipObjectCount != 0
+    vec4 mCenter = uModel * aTransform * vec4(uInvariantBoundingSphere.xyz, 1.0);
+    if (clipTest(vec4(mCenter.xyz, uInvariantBoundingSphere.w)))
+        // move out of [ -w, +w ] to 'discard' in vert shader
+        gl_Position.z = 2.0 * gl_Position.w;
+#endif
 `;

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clip_pixel = void 0;
-exports.clip_pixel = `
-#if defined(dClipVariant_pixel) && dClipObjectCount != 0
-    if (clipTest(vec4(vModelPosition, 0.0)))
-        discard;
-#endif
+exports.clip_pixel = `
+#if defined(dClipVariant_pixel) && dClipObjectCount != 0
+    if (clipTest(vec4(vModelPosition, 0.0)))
+        discard;
+#endif
 `;

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

@@ -1,64 +1,64 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.color_frag_params = void 0;
-exports.color_frag_params = `
-uniform float uMetalness;
-uniform float uRoughness;
-uniform float uBumpiness;
-#ifdef bumpEnabled
-    uniform float uBumpFrequency;
-    uniform float uBumpAmplitude;
-#endif
-uniform float uEmissive;
-
-#if defined(dRenderVariant_color)
-    #if defined(dColorType_uniform)
-        uniform vec3 uColor;
-    #elif defined(dColorType_varying)
-        varying vec4 vColor;
-    #endif
-
-    #ifdef dUsePalette
-        uniform sampler2D tPalette;
-        varying float vPaletteV;
-    #endif
-
-    #ifdef dOverpaint
-        varying vec4 vOverpaint;
-    #endif
-
-    #ifdef dEmissive
-        varying float vEmissive;
-    #endif
-
-    #ifdef dSubstance
-        varying vec4 vSubstance;
-    #endif
-#elif defined(dRenderVariant_emissive)
-    #ifdef dEmissive
-        varying float vEmissive;
-    #endif
-#elif defined(dRenderVariant_pick)
-    #if __VERSION__ == 100 || !defined(dVaryingGroup)
-        #ifdef requiredDrawBuffers
-            varying vec4 vObject;
-            varying vec4 vInstance;
-            varying vec4 vGroup;
-        #else
-            varying vec4 vColor;
-        #endif
-    #else
-        #ifdef requiredDrawBuffers
-            flat in vec4 vObject;
-            flat in vec4 vInstance;
-            flat in vec4 vGroup;
-        #else
-            flat in vec4 vColor;
-        #endif
-    #endif
-#endif
-
-#ifdef dTransparency
-    varying float vTransparency;
-#endif
+exports.color_frag_params = `
+uniform float uMetalness;
+uniform float uRoughness;
+uniform float uBumpiness;
+#ifdef bumpEnabled
+    uniform float uBumpFrequency;
+    uniform float uBumpAmplitude;
+#endif
+uniform float uEmissive;
+
+#if defined(dRenderVariant_color)
+    #if defined(dColorType_uniform)
+        uniform vec3 uColor;
+    #elif defined(dColorType_varying)
+        varying vec4 vColor;
+    #endif
+
+    #ifdef dUsePalette
+        uniform sampler2D tPalette;
+        varying float vPaletteV;
+    #endif
+
+    #ifdef dOverpaint
+        varying vec4 vOverpaint;
+    #endif
+
+    #ifdef dEmissive
+        varying float vEmissive;
+    #endif
+
+    #ifdef dSubstance
+        varying vec4 vSubstance;
+    #endif
+#elif defined(dRenderVariant_emissive)
+    #ifdef dEmissive
+        varying float vEmissive;
+    #endif
+#elif defined(dRenderVariant_pick)
+    #if __VERSION__ == 100 || !defined(dVaryingGroup)
+        #ifdef requiredDrawBuffers
+            varying vec4 vObject;
+            varying vec4 vInstance;
+            varying vec4 vGroup;
+        #else
+            varying vec4 vColor;
+        #endif
+    #else
+        #ifdef requiredDrawBuffers
+            flat in vec4 vObject;
+            flat in vec4 vInstance;
+            flat in vec4 vGroup;
+        #else
+            flat in vec4 vColor;
+        #endif
+    #endif
+#endif
+
+#ifdef dTransparency
+    varying float vTransparency;
+#endif
 `;

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

@@ -1,126 +1,126 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.color_vert_params = void 0;
-exports.color_vert_params = `
-uniform float uMetalness;
-uniform float uRoughness;
-uniform float uBumpiness;
-
-#if defined(dRenderVariant_color)
-    #if defined(dColorType_uniform)
-        uniform vec3 uColor;
-    #elif defined(dColorType_attribute)
-        varying vec4 vColor;
-        attribute vec3 aColor;
-    #elif defined(dColorType_texture)
-        varying vec4 vColor;
-        uniform vec2 uColorTexDim;
-        uniform sampler2D tColor;
-    #elif defined(dColorType_grid)
-        varying vec4 vColor;
-        uniform vec2 uColorTexDim;
-        uniform vec3 uColorGridDim;
-        uniform vec4 uColorGridTransform;
-        uniform sampler2D tColorGrid;
-    #elif defined(dColorType_direct)
-        varying vec4 vColor;
-    #endif
-
-    #ifdef dUsePalette
-        varying float vPaletteV;
-    #endif
-
-    #ifdef dOverpaint
-        #if defined(dOverpaintType_instance) || defined(dOverpaintType_groupInstance) || defined(dOverpaintType_vertexInstance)
-            varying vec4 vOverpaint;
-            uniform vec2 uOverpaintTexDim;
-            uniform sampler2D tOverpaint;
-        #elif defined(dOverpaintType_volumeInstance)
-            varying vec4 vOverpaint;
-            uniform vec2 uOverpaintTexDim;
-            uniform vec3 uOverpaintGridDim;
-            uniform vec4 uOverpaintGridTransform;
-            uniform sampler2D tOverpaintGrid;
-        #endif
-        uniform float uOverpaintStrength;
-    #endif
-
-    #ifdef dEmissive
-        #if defined(dEmissiveType_instance) || defined(dEmissiveType_groupInstance) || defined(dEmissiveType_vertexInstance)
-            varying float vEmissive;
-            uniform vec2 uEmissiveTexDim;
-            uniform sampler2D tEmissive;
-        #elif defined(dEmissiveType_volumeInstance)
-            varying float vEmissive;
-            uniform vec2 uEmissiveTexDim;
-            uniform vec3 uEmissiveGridDim;
-            uniform vec4 uEmissiveGridTransform;
-            uniform sampler2D tEmissiveGrid;
-        #endif
-        uniform float uEmissiveStrength;
-    #endif
-
-    #ifdef dSubstance
-        #if defined(dSubstanceType_instance) || defined(dSubstanceType_groupInstance) || defined(dSubstanceType_vertexInstance)
-            varying vec4 vSubstance;
-            uniform vec2 uSubstanceTexDim;
-            uniform sampler2D tSubstance;
-        #elif defined(dSubstanceType_volumeInstance)
-            varying vec4 vSubstance;
-            uniform vec2 uSubstanceTexDim;
-            uniform vec3 uSubstanceGridDim;
-            uniform vec4 uSubstanceGridTransform;
-            uniform sampler2D tSubstanceGrid;
-        #endif
-        uniform float uSubstanceStrength;
-    #endif
-#elif defined(dRenderVariant_emissive)
-    #ifdef dEmissive
-        #if defined(dEmissiveType_instance) || defined(dEmissiveType_groupInstance) || defined(dEmissiveType_vertexInstance)
-            varying float vEmissive;
-            uniform vec2 uEmissiveTexDim;
-            uniform sampler2D tEmissive;
-        #elif defined(dEmissiveType_volumeInstance)
-            varying float vEmissive;
-            uniform vec2 uEmissiveTexDim;
-            uniform vec3 uEmissiveGridDim;
-            uniform vec4 uEmissiveGridTransform;
-            uniform sampler2D tEmissiveGrid;
-        #endif
-        uniform float uEmissiveStrength;
-    #endif
-#elif defined(dRenderVariant_pick)
-    #if __VERSION__ == 100 || !defined(dVaryingGroup)
-        #ifdef requiredDrawBuffers
-            varying vec4 vObject;
-            varying vec4 vInstance;
-            varying vec4 vGroup;
-        #else
-            varying vec4 vColor;
-        #endif
-    #else
-        #ifdef requiredDrawBuffers
-            flat out vec4 vObject;
-            flat out vec4 vInstance;
-            flat out vec4 vGroup;
-        #else
-            flat out vec4 vColor;
-        #endif
-    #endif
-#endif
-
-#ifdef dTransparency
-    #if defined(dTransparencyType_instance) || defined(dTransparencyType_groupInstance) || defined(dTransparencyType_vertexInstance)
-        varying float vTransparency;
-        uniform vec2 uTransparencyTexDim;
-        uniform sampler2D tTransparency;
-    #elif defined(dTransparencyType_volumeInstance)
-        varying float vTransparency;
-        uniform vec2 uTransparencyTexDim;
-        uniform vec3 uTransparencyGridDim;
-        uniform vec4 uTransparencyGridTransform;
-        uniform sampler2D tTransparencyGrid;
-    #endif
-    uniform float uTransparencyStrength;
-#endif
+exports.color_vert_params = `
+uniform float uMetalness;
+uniform float uRoughness;
+uniform float uBumpiness;
+
+#if defined(dRenderVariant_color)
+    #if defined(dColorType_uniform)
+        uniform vec3 uColor;
+    #elif defined(dColorType_attribute)
+        varying vec4 vColor;
+        attribute vec3 aColor;
+    #elif defined(dColorType_texture)
+        varying vec4 vColor;
+        uniform vec2 uColorTexDim;
+        uniform sampler2D tColor;
+    #elif defined(dColorType_grid)
+        varying vec4 vColor;
+        uniform vec2 uColorTexDim;
+        uniform vec3 uColorGridDim;
+        uniform vec4 uColorGridTransform;
+        uniform sampler2D tColorGrid;
+    #elif defined(dColorType_direct)
+        varying vec4 vColor;
+    #endif
+
+    #ifdef dUsePalette
+        varying float vPaletteV;
+    #endif
+
+    #ifdef dOverpaint
+        #if defined(dOverpaintType_instance) || defined(dOverpaintType_groupInstance) || defined(dOverpaintType_vertexInstance)
+            varying vec4 vOverpaint;
+            uniform vec2 uOverpaintTexDim;
+            uniform sampler2D tOverpaint;
+        #elif defined(dOverpaintType_volumeInstance)
+            varying vec4 vOverpaint;
+            uniform vec2 uOverpaintTexDim;
+            uniform vec3 uOverpaintGridDim;
+            uniform vec4 uOverpaintGridTransform;
+            uniform sampler2D tOverpaintGrid;
+        #endif
+        uniform float uOverpaintStrength;
+    #endif
+
+    #ifdef dEmissive
+        #if defined(dEmissiveType_instance) || defined(dEmissiveType_groupInstance) || defined(dEmissiveType_vertexInstance)
+            varying float vEmissive;
+            uniform vec2 uEmissiveTexDim;
+            uniform sampler2D tEmissive;
+        #elif defined(dEmissiveType_volumeInstance)
+            varying float vEmissive;
+            uniform vec2 uEmissiveTexDim;
+            uniform vec3 uEmissiveGridDim;
+            uniform vec4 uEmissiveGridTransform;
+            uniform sampler2D tEmissiveGrid;
+        #endif
+        uniform float uEmissiveStrength;
+    #endif
+
+    #ifdef dSubstance
+        #if defined(dSubstanceType_instance) || defined(dSubstanceType_groupInstance) || defined(dSubstanceType_vertexInstance)
+            varying vec4 vSubstance;
+            uniform vec2 uSubstanceTexDim;
+            uniform sampler2D tSubstance;
+        #elif defined(dSubstanceType_volumeInstance)
+            varying vec4 vSubstance;
+            uniform vec2 uSubstanceTexDim;
+            uniform vec3 uSubstanceGridDim;
+            uniform vec4 uSubstanceGridTransform;
+            uniform sampler2D tSubstanceGrid;
+        #endif
+        uniform float uSubstanceStrength;
+    #endif
+#elif defined(dRenderVariant_emissive)
+    #ifdef dEmissive
+        #if defined(dEmissiveType_instance) || defined(dEmissiveType_groupInstance) || defined(dEmissiveType_vertexInstance)
+            varying float vEmissive;
+            uniform vec2 uEmissiveTexDim;
+            uniform sampler2D tEmissive;
+        #elif defined(dEmissiveType_volumeInstance)
+            varying float vEmissive;
+            uniform vec2 uEmissiveTexDim;
+            uniform vec3 uEmissiveGridDim;
+            uniform vec4 uEmissiveGridTransform;
+            uniform sampler2D tEmissiveGrid;
+        #endif
+        uniform float uEmissiveStrength;
+    #endif
+#elif defined(dRenderVariant_pick)
+    #if __VERSION__ == 100 || !defined(dVaryingGroup)
+        #ifdef requiredDrawBuffers
+            varying vec4 vObject;
+            varying vec4 vInstance;
+            varying vec4 vGroup;
+        #else
+            varying vec4 vColor;
+        #endif
+    #else
+        #ifdef requiredDrawBuffers
+            flat out vec4 vObject;
+            flat out vec4 vInstance;
+            flat out vec4 vGroup;
+        #else
+            flat out vec4 vColor;
+        #endif
+    #endif
+#endif
+
+#ifdef dTransparency
+    #if defined(dTransparencyType_instance) || defined(dTransparencyType_groupInstance) || defined(dTransparencyType_vertexInstance)
+        varying float vTransparency;
+        uniform vec2 uTransparencyTexDim;
+        uniform sampler2D tTransparency;
+    #elif defined(dTransparencyType_volumeInstance)
+        varying float vTransparency;
+        uniform vec2 uTransparencyTexDim;
+        uniform vec3 uTransparencyGridDim;
+        uniform vec4 uTransparencyGridTransform;
+        uniform sampler2D tTransparencyGrid;
+    #endif
+    uniform float uTransparencyStrength;
+#endif
 `;