molstar 4.0.1 → 4.2.0

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

@@ -1,6 +1,6 @@
 /**
- * Copyright (c) 2019-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
-export declare const text_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nuniform sampler2D tFont;\n\nuniform vec3 uBorderColor;\nuniform float uBorderWidth;\nuniform vec3 uBackgroundColor;\nuniform float uBackgroundOpacity;\n\nvarying vec2 vTexCoord;\n\nconst float smoothness = 32.0;\nconst float gamma = 2.2;\n\nvoid main2(){\n    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);\n}\n\nvoid main(){\n    #include fade_lod\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    #include assign_material_color\n\n    if (vTexCoord.x > 1.0) {\n        #if defined(dRenderVariant_color)\n            material = vec4(uBackgroundColor, uBackgroundOpacity * material.a);\n        #endif\n    } else {\n        // retrieve signed distance\n        float sdf = texture2D(tFont, vTexCoord).a + uBorderWidth;\n\n        // perform adaptive anti-aliasing of the edges\n        float w = clamp(smoothness * (abs(dFdx(vTexCoord.x)) + abs(dFdy(vTexCoord.y))), 0.0, 0.5);\n        float a = smoothstep(0.5 - w, 0.5 + w, sdf);\n\n        // gamma correction for linear attenuation\n        a = pow(a, 1.0 / gamma);\n\n        if (a < 0.5) discard;\n\n        #if defined(dRenderVariant_color)\n            material.a *= a;\n\n            // add border\n            float t = 0.5 + uBorderWidth;\n            if (uBorderWidth > 0.0 && sdf < t) {\n                material.xyz = mix(uBorderColor, material.xyz, smoothstep(t - w, t, sdf));\n            }\n        #endif\n    }\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n        #ifdef requiredDrawBuffers\n            gl_FragColor = vObject;\n            gl_FragData[1] = vInstance;\n            gl_FragData[2] = vGroup;\n            gl_FragData[3] = packDepthToRGBA(fragmentDepth);\n        #else\n            gl_FragColor = vColor;\n        #endif\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        gl_FragColor = material;\n\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n        #include dpoit_write\n    #endif\n}\n";
+export declare const text_frag = "\nprecision highp float;\nprecision highp int;\n\n#include common\n#include common_frag_params\n#include color_frag_params\n#include common_clip\n\nuniform sampler2D tFont;\n\nuniform vec3 uBorderColor;\nuniform float uBorderWidth;\nuniform vec3 uBackgroundColor;\nuniform float uBackgroundOpacity;\n\nvarying vec2 vTexCoord;\n\nconst float smoothness = 32.0;\nconst float gamma = 2.2;\n\nvoid main2(){\n    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);\n}\n\nvoid main(){\n    #include fade_lod\n    #include clip_pixel\n\n    float fragmentDepth = gl_FragCoord.z;\n    #include assign_material_color\n\n    if (vTexCoord.x > 1.0) {\n        #if defined(dRenderVariant_color)\n            material = vec4(uBackgroundColor, uBackgroundOpacity * material.a);\n        #endif\n    } else {\n        // retrieve signed distance\n        float sdf = texture2D(tFont, vTexCoord).a + uBorderWidth;\n\n        // perform adaptive anti-aliasing of the edges\n        float w = clamp(smoothness * (abs(dFdx(vTexCoord.x)) + abs(dFdy(vTexCoord.y))), 0.0, 0.5);\n        float a = clamp(0.0, 1.0, smoothstep(0.5 - w, 0.5 + w, sdf));\n\n        // gamma correction for linear attenuation\n        a = pow(a, 1.0 / gamma);\n\n        if (a < 0.5) discard;\n\n        #if defined(dRenderVariant_color)\n            // add border\n            float t = 0.5 + uBorderWidth;\n            if (uBorderWidth > 0.0 && sdf < t) {\n                material.xyz = mix(uBorderColor, material.xyz, smoothstep(t - w, t, sdf));\n            }\n        #endif\n    }\n\n    #include check_transparency\n\n    #if defined(dRenderVariant_pick)\n        #include check_picking_alpha\n        #ifdef requiredDrawBuffers\n            gl_FragColor = vObject;\n            gl_FragData[1] = vInstance;\n            gl_FragData[2] = vGroup;\n            gl_FragData[3] = packDepthToRGBA(fragmentDepth);\n        #else\n            gl_FragColor = vColor;\n        #endif\n    #elif defined(dRenderVariant_depth)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_marking)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_emissive)\n        gl_FragColor = material;\n    #elif defined(dRenderVariant_color)\n        gl_FragColor = material;\n\n        #include apply_marker_color\n        #include apply_fog\n        #include wboit_write\n        #include dpoit_write\n    #endif\n}\n";

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

@@ -1,92 +1,94 @@
 "use strict";
 /**
- * Copyright (c) 2019-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.text_frag = void 0;
-exports.text_frag = `
-precision highp float;
-precision highp int;
-
-#include common
-#include common_frag_params
-#include color_frag_params
-#include common_clip
-
-uniform sampler2D tFont;
-
-uniform vec3 uBorderColor;
-uniform float uBorderWidth;
-uniform vec3 uBackgroundColor;
-uniform float uBackgroundOpacity;
-
-varying vec2 vTexCoord;
-
-const float smoothness = 32.0;
-const float gamma = 2.2;
-
-void main2(){
-    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
-}
-
-void main(){
-    #include fade_lod
-    #include clip_pixel
-
-    float fragmentDepth = gl_FragCoord.z;
-    #include assign_material_color
-
-    if (vTexCoord.x > 1.0) {
-        #if defined(dRenderVariant_color)
-            material = vec4(uBackgroundColor, uBackgroundOpacity * material.a);
-        #endif
-    } else {
-        // retrieve signed distance
-        float sdf = texture2D(tFont, vTexCoord).a + uBorderWidth;
-
-        // perform adaptive anti-aliasing of the edges
-        float w = clamp(smoothness * (abs(dFdx(vTexCoord.x)) + abs(dFdy(vTexCoord.y))), 0.0, 0.5);
-        float a = smoothstep(0.5 - w, 0.5 + w, sdf);
-
-        // gamma correction for linear attenuation
-        a = pow(a, 1.0 / gamma);
-
-        if (a < 0.5) discard;
-
-        #if defined(dRenderVariant_color)
-            material.a *= a;
-
-            // add border
-            float t = 0.5 + uBorderWidth;
-            if (uBorderWidth > 0.0 && sdf < t) {
-                material.xyz = mix(uBorderColor, material.xyz, smoothstep(t - w, t, sdf));
-            }
-        #endif
-    }
-
-    #if defined(dRenderVariant_pick)
-        #include check_picking_alpha
-        #ifdef requiredDrawBuffers
-            gl_FragColor = vObject;
-            gl_FragData[1] = vInstance;
-            gl_FragData[2] = vGroup;
-            gl_FragData[3] = packDepthToRGBA(fragmentDepth);
-        #else
-            gl_FragColor = vColor;
-        #endif
-    #elif defined(dRenderVariant_depth)
-        gl_FragColor = material;
-    #elif defined(dRenderVariant_marking)
-        gl_FragColor = material;
-    #elif defined(dRenderVariant_color)
-        gl_FragColor = material;
-
-        #include apply_marker_color
-        #include apply_fog
-        #include wboit_write
-        #include dpoit_write
-    #endif
-}
+exports.text_frag = `
+precision highp float;
+precision highp int;
+
+#include common
+#include common_frag_params
+#include color_frag_params
+#include common_clip
+
+uniform sampler2D tFont;
+
+uniform vec3 uBorderColor;
+uniform float uBorderWidth;
+uniform vec3 uBackgroundColor;
+uniform float uBackgroundOpacity;
+
+varying vec2 vTexCoord;
+
+const float smoothness = 32.0;
+const float gamma = 2.2;
+
+void main2(){
+    gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
+}
+
+void main(){
+    #include fade_lod
+    #include clip_pixel
+
+    float fragmentDepth = gl_FragCoord.z;
+    #include assign_material_color
+
+    if (vTexCoord.x > 1.0) {
+        #if defined(dRenderVariant_color)
+            material = vec4(uBackgroundColor, uBackgroundOpacity * material.a);
+        #endif
+    } else {
+        // retrieve signed distance
+        float sdf = texture2D(tFont, vTexCoord).a + uBorderWidth;
+
+        // perform adaptive anti-aliasing of the edges
+        float w = clamp(smoothness * (abs(dFdx(vTexCoord.x)) + abs(dFdy(vTexCoord.y))), 0.0, 0.5);
+        float a = clamp(0.0, 1.0, smoothstep(0.5 - w, 0.5 + w, sdf));
+
+        // gamma correction for linear attenuation
+        a = pow(a, 1.0 / gamma);
+
+        if (a < 0.5) discard;
+
+        #if defined(dRenderVariant_color)
+            // add border
+            float t = 0.5 + uBorderWidth;
+            if (uBorderWidth > 0.0 && sdf < t) {
+                material.xyz = mix(uBorderColor, material.xyz, smoothstep(t - w, t, sdf));
+            }
+        #endif
+    }
+
+    #include check_transparency
+
+    #if defined(dRenderVariant_pick)
+        #include check_picking_alpha
+        #ifdef requiredDrawBuffers
+            gl_FragColor = vObject;
+            gl_FragData[1] = vInstance;
+            gl_FragData[2] = vGroup;
+            gl_FragData[3] = packDepthToRGBA(fragmentDepth);
+        #else
+            gl_FragColor = vColor;
+        #endif
+    #elif defined(dRenderVariant_depth)
+        gl_FragColor = material;
+    #elif defined(dRenderVariant_marking)
+        gl_FragColor = material;
+    #elif defined(dRenderVariant_emissive)
+        gl_FragColor = material;
+    #elif defined(dRenderVariant_color)
+        gl_FragColor = material;
+
+        #include apply_marker_color
+        #include apply_fog
+        #include wboit_write
+        #include dpoit_write
+    #endif
+}
 `;

package/lib/commonjs/mol-gl/shader/text.vert.js

@@ -6,89 +6,89 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.text_vert = void 0;
-exports.text_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 vec3 aPosition;
-attribute vec2 aMapping;
-attribute float aDepth;
-attribute vec2 aTexCoord;
-attribute mat4 aTransform;
-attribute float aInstance;
-attribute float aGroup;
-
-uniform float uOffsetX;
-uniform float uOffsetY;
-uniform float uOffsetZ;
-
-uniform float uIsOrtho;
-uniform float uPixelRatio;
-uniform vec4 uViewport;
-
-varying vec2 vTexCoord;
-
-#include matrix_scale
-
-void main(void){
-    #include assign_group
-    #include assign_color_varying
-    #include assign_marker_varying
-    #include assign_clipping_varying
-    #include assign_size
-
-    vTexCoord = aTexCoord;
-
-    float scale = matrixScale(uModelView);
-
-    float offsetX = uOffsetX * scale;
-    float offsetY = uOffsetY * scale;
-    float offsetZ = (uOffsetZ + aDepth * 0.95) * scale;
-
-    vec4 position4 = vec4(aPosition, 1.0);
-    vec4 mvPosition = uModelView * aTransform * position4;
-
-    vModelPosition = (uModel * aTransform * position4).xyz; // for clipping in frag shader
-
-    // TODO
-    // #ifdef FIXED_SIZE
-    //     if (ortho) {
-    //         scale /= pixelRatio * ((uViewport.w / 2.0) / -uCameraPosition.z) * 0.1;
-    //     } else {
-    //         scale /= pixelRatio * ((uViewport.w / 2.0) / -mvPosition.z) * 0.1;
-    //     }
-    // #endif
-
-    vec4 mvCorner = vec4(mvPosition.xyz, 1.0);
-
-    if (vTexCoord.x == 10.0) { // indicates background plane
-        // move a bit to the back, taking distance to camera into account to avoid z-fighting
-        offsetZ -= 0.001 * distance(uCameraPosition, (uProjection * mvCorner).xyz);
-    }
-
-    mvCorner.xy += aMapping * size * scale;
-    mvCorner.x += offsetX;
-    mvCorner.y += offsetY;
-
-    if (uIsOrtho == 1.0) {
-        mvCorner.z += offsetZ;
-    } else {
-        mvCorner.xyz += normalize(-mvCorner.xyz) * offsetZ;
-    }
-
-    gl_Position = uProjection * mvCorner;
-
-    vViewPosition = -mvCorner.xyz;
-
-    #include clip_instance
-}
+exports.text_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 vec3 aPosition;
+attribute vec2 aMapping;
+attribute float aDepth;
+attribute vec2 aTexCoord;
+attribute mat4 aTransform;
+attribute float aInstance;
+attribute float aGroup;
+
+uniform float uOffsetX;
+uniform float uOffsetY;
+uniform float uOffsetZ;
+
+uniform float uIsOrtho;
+uniform float uPixelRatio;
+uniform vec4 uViewport;
+
+varying vec2 vTexCoord;
+
+#include matrix_scale
+
+void main(void){
+    #include assign_group
+    #include assign_color_varying
+    #include assign_marker_varying
+    #include assign_clipping_varying
+    #include assign_size
+
+    vTexCoord = aTexCoord;
+
+    float scale = matrixScale(uModelView);
+
+    float offsetX = uOffsetX * scale;
+    float offsetY = uOffsetY * scale;
+    float offsetZ = (uOffsetZ + aDepth * 0.95) * scale;
+
+    vec4 position4 = vec4(aPosition, 1.0);
+    vec4 mvPosition = uModelView * aTransform * position4;
+
+    vModelPosition = (uModel * aTransform * position4).xyz; // for clipping in frag shader
+
+    // TODO
+    // #ifdef FIXED_SIZE
+    //     if (ortho) {
+    //         scale /= pixelRatio * ((uViewport.w / 2.0) / -uCameraPosition.z) * 0.1;
+    //     } else {
+    //         scale /= pixelRatio * ((uViewport.w / 2.0) / -mvPosition.z) * 0.1;
+    //     }
+    // #endif
+
+    vec4 mvCorner = vec4(mvPosition.xyz, 1.0);
+
+    if (vTexCoord.x == 10.0) { // indicates background plane
+        // move a bit to the back, taking distance to camera into account to avoid z-fighting
+        offsetZ -= 0.001 * distance(uCameraPosition, (uProjection * mvCorner).xyz);
+    }
+
+    mvCorner.xy += aMapping * size * scale;
+    mvCorner.x += offsetX;
+    mvCorner.y += offsetY;
+
+    if (uIsOrtho == 1.0) {
+        mvCorner.z += offsetZ;
+    } else {
+        mvCorner.xyz += normalize(-mvCorner.xyz) * offsetZ;
+    }
+
+    gl_Position = uProjection * mvCorner;
+
+    vViewPosition = -mvCorner.xyz;
+
+    #include clip_instance
+}
 `;

package/lib/commonjs/mol-gl/shader/util/grid3d-template.frag.js

@@ -6,50 +6,50 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.grid3dTemplate_frag = void 0;
-exports.grid3dTemplate_frag = `
-precision highp float;
-precision highp int;
-precision highp sampler2D;
-
-uniform vec2 uQuadShift;
-uniform vec3 uDimensions;
-uniform vec3 uMin;
-uniform vec3 uDelta;
-uniform bool uLittleEndian;
-uniform float uWidth;
-
-#ifdef CUMULATIVE
-    uniform sampler2D tCumulativeSum;
-#endif
-
-{UNIFORMS}
-
-{UTILS}
-
-#include float_to_rgba
-#ifdef CUMULATIVE
-    #include rgba_to_float
-#endif
-
-float intDiv(float a, float b) { return float(int(a) / int(b)); }
-float intMod(float a, float b) { return a - b * float(int(a) / int(b)); }
-
-void main(void) {
-    float offset = floor(gl_FragCoord.x) + floor(gl_FragCoord.y) * uWidth;
-
-    // axis order fast to slow Z, Y, X
-    // TODO: support arbitrary axis orders?
-    float k = intMod(offset, uDimensions.z), kk = intDiv(offset, uDimensions.z);
-    float j = intMod(kk, uDimensions.y);
-    float i = intDiv(kk, uDimensions.y);
-
-    vec3 xyz = uMin + uDelta * vec3(i, j, k);
-
-    {MAIN}
-
-    #ifdef CUMULATIVE
-        float current = rgbaToFloat(texture2D(tCumulativeSum, gl_FragCoord.xy / vec2(uWidth, uWidth)), uLittleEndian);
-    #endif
-    gl_FragColor = floatToRgba({RETURN}, uLittleEndian);
-}
+exports.grid3dTemplate_frag = `
+precision highp float;
+precision highp int;
+precision highp sampler2D;
+
+uniform vec2 uQuadShift;
+uniform vec3 uDimensions;
+uniform vec3 uMin;
+uniform vec3 uDelta;
+uniform bool uLittleEndian;
+uniform float uWidth;
+
+#ifdef CUMULATIVE
+    uniform sampler2D tCumulativeSum;
+#endif
+
+{UNIFORMS}
+
+{UTILS}
+
+#include float_to_rgba
+#ifdef CUMULATIVE
+    #include rgba_to_float
+#endif
+
+float intDiv(float a, float b) { return float(int(a) / int(b)); }
+float intMod(float a, float b) { return a - b * float(int(a) / int(b)); }
+
+void main(void) {
+    float offset = floor(gl_FragCoord.x) + floor(gl_FragCoord.y) * uWidth;
+
+    // axis order fast to slow Z, Y, X
+    // TODO: support arbitrary axis orders?
+    float k = intMod(offset, uDimensions.z), kk = intDiv(offset, uDimensions.z);
+    float j = intMod(kk, uDimensions.y);
+    float i = intDiv(kk, uDimensions.y);
+
+    vec3 xyz = uMin + uDelta * vec3(i, j, k);
+
+    {MAIN}
+
+    #ifdef CUMULATIVE
+        float current = rgbaToFloat(texture2D(tCumulativeSum, gl_FragCoord.xy / vec2(uWidth, uWidth)), uLittleEndian);
+    #endif
+    gl_FragColor = floatToRgba({RETURN}, uLittleEndian);
+}
 `;

package/lib/commonjs/mol-gl/shader-code.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */

package/lib/commonjs/mol-gl/shader-code.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2018-2023 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -22,6 +22,7 @@ const assign_material_color_glsl_1 = require("./shader/chunks/assign-material-co
 const assign_position_glsl_1 = require("./shader/chunks/assign-position.glsl");
 const assign_size_glsl_1 = require("./shader/chunks/assign-size.glsl");
 const check_picking_alpha_glsl_1 = require("./shader/chunks/check-picking-alpha.glsl");
+const check_transparency_glsl_1 = require("./shader/chunks/check-transparency.glsl");
 const clip_instance_glsl_1 = require("./shader/chunks/clip-instance.glsl");
 const clip_pixel_glsl_1 = require("./shader/chunks/clip-pixel.glsl");
 const color_frag_params_glsl_1 = require("./shader/chunks/color-frag-params.glsl");
@@ -56,6 +57,7 @@ const ShaderChunks = {
     assign_position: assign_position_glsl_1.assign_position,
     assign_size: assign_size_glsl_1.assign_size,
     check_picking_alpha: check_picking_alpha_glsl_1.check_picking_alpha,
+    check_transparency: check_transparency_glsl_1.check_transparency,
     clip_instance: clip_instance_glsl_1.clip_instance,
     clip_pixel: clip_pixel_glsl_1.clip_pixel,
     color_frag_params: color_frag_params_glsl_1.color_frag_params,
@@ -131,13 +133,17 @@ function ignoreDefine(name, variant, defines) {
         }
     }
     else {
-        return [
+        const ignore = [
             'dColorType', 'dUsePalette',
             'dLightCount', 'dXrayShaded',
             'dOverpaintType', 'dOverpaint',
             'dSubstanceType', 'dSubstance',
             'dColorMarker',
-        ].includes(name);
+        ];
+        if (variant !== 'emissive') {
+            ignore.push('dEmissiveType', 'dEmissive');
+        }
+        return ignore.includes(name);
     }
     return false;
 }
@@ -259,22 +265,22 @@ function getGlsl100FragPrefix(extensions, shaderExtensions) {
     }
     return prefix.join('\n') + '\n';
 }
-const glsl300VertPrefixCommon = `
-#define attribute in
-#define varying out
-#define texture2D texture
+const glsl300VertPrefixCommon = `
+#define attribute in
+#define varying out
+#define texture2D texture
 `;
-const glsl300FragPrefixCommon = `
-#define varying in
-#define texture2D texture
-#define textureCube texture
-#define texture2DLodEXT textureLod
-#define textureCubeLodEXT textureLod
-
-#define gl_FragColor out_FragData0
-#define gl_FragDepthEXT gl_FragDepth
-
-#define depthTextureSupport
+const glsl300FragPrefixCommon = `
+#define varying in
+#define texture2D texture
+#define textureCube texture
+#define texture2DLodEXT textureLod
+#define textureCubeLodEXT textureLod
+
+#define gl_FragColor out_FragData0
+#define gl_FragDepthEXT gl_FragDepth
+
+#define depthTextureSupport
 `;
 function getGlsl300VertPrefix(extensions, shaderExtensions) {
     const prefix = [

package/lib/commonjs/mol-gl/webgl/compat.js

@@ -460,19 +460,19 @@ function getNoNonInstancedActiveAttribs(gl) {
 }
 exports.getNoNonInstancedActiveAttribs = getNoNonInstancedActiveAttribs;
 //
-const TextureTestVertShader = `
-attribute vec4 aPosition;
-
-void main() {
-    gl_Position = aPosition;
+const TextureTestVertShader = `
+attribute vec4 aPosition;
+
+void main() {
+    gl_Position = aPosition;
 }`;
-const TextureTestFragShader = `
-precision mediump float;
-uniform vec4 uColor;
-uniform sampler2D uTexture;
-
-void main() {
-    gl_FragColor = texture2D(uTexture, vec2(0.5, 0.5)) * uColor;
+const TextureTestFragShader = `
+precision mediump float;
+uniform vec4 uColor;
+uniform sampler2D uTexture;
+
+void main() {
+    gl_FragColor = texture2D(uTexture, vec2(0.5, 0.5)) * uColor;
 }`;
 const TextureTestTexCoords = new Float32Array([
     -1.0, -1.0, 1.0, -1.0, -1.0, 1.0, -1.0, 1.0, 1.0, -1.0, 1.0, 1.0

package/lib/commonjs/mol-gl/webgl/render-item.d.ts

@@ -38,9 +38,10 @@ declare const GraphicsRenderVariant: {
     pick: string;
     depth: string;
     marking: string;
+    emissive: string;
 };
 export type GraphicsRenderVariant = keyof typeof GraphicsRenderVariant;
-export declare const GraphicsRenderVariants: ("color" | "depth" | "pick" | "marking")[];
+export declare const GraphicsRenderVariants: ("color" | "emissive" | "depth" | "pick" | "marking")[];
 declare const ComputeRenderVariant: {
     compute: string;
 };
@@ -48,7 +49,7 @@ export type ComputeRenderVariant = keyof typeof ComputeRenderVariant;
 export declare const ComputeRenderVariants: "compute"[];
 export type Transparency = 'blended' | 'wboit' | 'dpoit' | undefined;
 export type GraphicsRenderItem = RenderItem<GraphicsRenderVariant>;
-export declare function createGraphicsRenderItem(ctx: WebGLContext, drawMode: DrawMode, shaderCode: ShaderCode, schema: RenderableSchema, values: RenderableValues, materialId: number, transparency: Transparency): RenderItem<"color" | "depth" | "pick" | "marking">;
+export declare function createGraphicsRenderItem(ctx: WebGLContext, drawMode: DrawMode, shaderCode: ShaderCode, schema: RenderableSchema, values: RenderableValues, materialId: number, transparency: Transparency): RenderItem<"color" | "emissive" | "depth" | "pick" | "marking">;
 export type ComputeRenderItem = RenderItem<ComputeRenderVariant>;
 export declare function createComputeRenderItem(ctx: WebGLContext, drawMode: DrawMode, shaderCode: ShaderCode, schema: RenderableSchema, values: RenderableValues, materialId?: number): RenderItem<"compute">;
 /**

package/lib/commonjs/mol-gl/webgl/render-item.js

@@ -33,7 +33,7 @@ function getDrawMode(ctx, drawMode) {
 }
 exports.getDrawMode = getDrawMode;
 //
-const GraphicsRenderVariant = { color: '', pick: '', depth: '', marking: '' };
+const GraphicsRenderVariant = { color: '', pick: '', depth: '', marking: '', emissive: '' };
 exports.GraphicsRenderVariants = Object.keys(GraphicsRenderVariant);
 const ComputeRenderVariant = { compute: '' };
 exports.ComputeRenderVariants = Object.keys(ComputeRenderVariant);

package/lib/commonjs/mol-io/common/binary-cif/array-encoder.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * Adapted from CIFTools.js (https://github.com/dsehnal/CIFTools.js; MIT) and MMTF (https://github.com/rcsb/mmtf-javascript/; MIT)
  *

package/lib/commonjs/mol-io/common/binary-cif/array-encoder.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017-2024 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * Adapted from CIFTools.js (https://github.com/dsehnal/CIFTools.js; MIT) and MMTF (https://github.com/rcsb/mmtf-javascript/; MIT)
  *
@@ -49,8 +49,11 @@ var ArrayEncoder;
     ArrayEncoder.by = by;
     function fromEncoding(encoding) {
         let e = by(getProvider(encoding[0]));
-        for (let i = 1; i < encoding.length; i++)
+        for (let i = 1; i < encoding.length; i++) {
+            if (encoding[i - 1].kind === 'IntegerPacking')
+                break;
             e = e.and(getProvider(encoding[i]));
+        }
         return e;
     }
     ArrayEncoder.fromEncoding = fromEncoding;

package/lib/commonjs/mol-io/reader/cif/schema/bird.d.ts

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2017-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
- * Code-generated 'BIRD' schema file. Dictionary versions: mmCIF 5.386, IHM 1.25, MA 1.4.6.
+ * Code-generated 'BIRD' schema file. Dictionary versions: mmCIF 5.391, IHM 1.25, MA 1.4.6.
  *
  * @author molstar/ciftools package
  */