molstar 4.2.0 → 4.4.0

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/ssao-blur.frag.d.ts

@@ -5,4 +5,4 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author Ludovic Autin <ludovic.autin@gmail.com>
  */
-export declare const ssaoBlur_frag = "\nprecision highp float;\nprecision highp int;\nprecision highp sampler2D;\n\nuniform sampler2D tSsaoDepth;\nuniform vec2 uTexSize;\nuniform vec4 uBounds;\n\nuniform float uKernel[dOcclusionKernelSize];\n\nuniform float uBlurDirectionX;\nuniform float uBlurDirectionY;\n\nuniform mat4 uInvProjection;\nuniform float uNear;\nuniform float uFar;\n\n#include common\n\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\nbool isBackground(const in float depth) {\n    return depth == 1.0;\n}\n\nbool outsideBounds(const in vec2 p) {\n    return p.x < uBounds.x || p.y < uBounds.y || p.x > uBounds.z || p.y > uBounds.w;\n}\n\nfloat getPixelSize(const in vec2 coords, const in float depth) {\n    vec3 viewPos0 = screenSpaceToViewSpace(vec3(coords, depth), uInvProjection);\n    vec3 viewPos1 = screenSpaceToViewSpace(vec3(coords + vec2(1.0, 0.0) / uTexSize, depth), uInvProjection);\n    return distance(viewPos0, viewPos1);\n}\n\nvoid main(void) {\n    vec2 coords = gl_FragCoord.xy / uTexSize;\n\n    vec2 packedDepth = texture2D(tSsaoDepth, coords).zw;\n\n    if (outsideBounds(coords)) {\n        gl_FragColor = vec4(packUnitIntervalToRG(1.0), packedDepth);\n        return;\n    }\n\n    float selfDepth = unpackRGToUnitInterval(packedDepth);\n    // if background and if second pass\n    if (isBackground(selfDepth) && uBlurDirectionY != 0.0) {\n        gl_FragColor = vec4(packUnitIntervalToRG(1.0), packedDepth);\n        return;\n    }\n\n    float selfViewZ = getViewZ(selfDepth);\n    float pixelSize = getPixelSize(coords, selfDepth);\n    // max diff depth between two pixels\n    float maxDiffViewZ = 1.0;\n\n    vec2 offset = vec2(uBlurDirectionX, uBlurDirectionY) / uTexSize;\n\n    float sum = 0.0;\n    float kernelSum = 0.0;\n    // only if kernelSize is odd\n    for (int i = -dOcclusionKernelSize / 2; i <= dOcclusionKernelSize / 2; i++) {\n        if (abs(float(i)) > 1.0 && abs(float(i)) * pixelSize > 0.8) continue;\n\n        vec2 sampleCoords = coords + float(i) * offset;\n        if (outsideBounds(sampleCoords)) {\n            continue;\n        }\n\n        vec4 sampleSsaoDepth = texture2D(tSsaoDepth, sampleCoords);\n\n        float sampleDepth = unpackRGToUnitInterval(sampleSsaoDepth.zw);\n        if (isBackground(sampleDepth)) {\n            continue;\n        }\n\n        float sampleViewZ = getViewZ(sampleDepth);\n        if (abs(selfViewZ - sampleViewZ) > maxDiffViewZ) {\n            continue;\n        }\n\n        float kernel = uKernel[int(abs(float(i)))]; // abs is not defined for int in webgl1\n        float sampleValue = unpackRGToUnitInterval(sampleSsaoDepth.xy);\n\n        sum += kernel * sampleValue;\n        kernelSum += kernel;\n    }\n    gl_FragColor = vec4(packUnitIntervalToRG(sum / kernelSum), packedDepth);\n}\n";
+export declare const ssaoBlur_frag = "\nprecision highp float;\nprecision highp int;\nprecision highp sampler2D;\n\nuniform sampler2D tSsaoDepth;\nuniform vec2 uTexSize;\nuniform vec4 uBounds;\n\nuniform float uKernel[dOcclusionKernelSize];\nuniform float uBlurDepthBias;\n\nuniform float uBlurDirectionX;\nuniform float uBlurDirectionY;\n\nuniform mat4 uInvProjection;\nuniform float uNear;\nuniform float uFar;\n\n#include common\n\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\nbool isBackground(const in float depth) {\n    return depth == 1.0;\n}\n\nbool isNearClip(const in float depth) {\n    return depth == 0.0;\n}\n\nbool outsideBounds(const in vec2 p) {\n    return p.x < uBounds.x || p.y < uBounds.y || p.x > uBounds.z || p.y > uBounds.w;\n}\n\nfloat getPixelSize(const in vec2 coords, const in float depth) {\n    vec3 viewPos0 = screenSpaceToViewSpace(vec3(coords, depth), uInvProjection);\n    vec3 viewPos1 = screenSpaceToViewSpace(vec3(coords + vec2(1.0, 0.0) / uTexSize, depth), uInvProjection);\n    return distance(viewPos0, viewPos1);\n}\n\nvoid main(void) {\n    vec2 coords = gl_FragCoord.xy / uTexSize;\n\n    vec2 packedDepth = texture2D(tSsaoDepth, coords).zw;\n\n    if (outsideBounds(coords)) {\n        gl_FragColor = vec4(packUnitIntervalToRG(1.0), packedDepth);\n        return;\n    }\n\n    float selfDepth = unpackRGToUnitInterval(packedDepth);\n    // (if background and if second pass) or if near clip\n    if ((isBackground(selfDepth) && uBlurDirectionY != 0.0) || isNearClip(selfDepth)) {\n        gl_FragColor = vec4(packUnitIntervalToRG(1.0), packedDepth);\n        return;\n    }\n\n    float selfViewZ = getViewZ(selfDepth);\n    float pixelSize = getPixelSize(coords, selfDepth);\n\n    vec2 offset = vec2(uBlurDirectionX, uBlurDirectionY) / uTexSize;\n\n    float sum = 0.0;\n    float kernelSum = 0.0;\n    // only if kernelSize is odd\n    for (int i = -dOcclusionKernelSize / 2; i <= dOcclusionKernelSize / 2; i++) {\n        if (abs(float(i)) > 1.0 && abs(float(i)) * pixelSize > 0.8) continue;\n\n        vec2 sampleCoords = coords + float(i) * offset;\n        if (outsideBounds(sampleCoords)) {\n            continue;\n        }\n\n        vec4 sampleSsaoDepth = texture2D(tSsaoDepth, sampleCoords);\n\n        float sampleDepth = unpackRGToUnitInterval(sampleSsaoDepth.zw);\n        if (isBackground(sampleDepth) || isNearClip(sampleDepth)) {\n            continue;\n        }\n\n        float sampleViewZ = getViewZ(sampleDepth);\n        if (abs(selfViewZ - sampleViewZ) >= uBlurDepthBias) {\n            continue;\n        }\n\n        float kernel = uKernel[int(abs(float(i)))]; // abs is not defined for int in webgl1\n        float sampleValue = unpackRGToUnitInterval(sampleSsaoDepth.xy);\n\n        sum += kernel * sampleValue;\n        kernelSum += kernel;\n    }\n    gl_FragColor = vec4(packUnitIntervalToRG(sum / kernelSum), packedDepth);\n}\n";

package/lib/commonjs/mol-gl/shader/ssao-blur.frag.js

@@ -18,6 +18,7 @@ uniform vec2 uTexSize;
 uniform vec4 uBounds;
 
 uniform float uKernel[dOcclusionKernelSize];
+uniform float uBlurDepthBias;
 
 uniform float uBlurDirectionX;
 uniform float uBlurDirectionY;
@@ -40,6 +41,10 @@ bool isBackground(const in float depth) {
     return depth == 1.0;
 }
 
+bool isNearClip(const in float depth) {
+    return depth == 0.0;
+}
+
 bool outsideBounds(const in vec2 p) {
     return p.x < uBounds.x || p.y < uBounds.y || p.x > uBounds.z || p.y > uBounds.w;
 }
@@ -61,16 +66,14 @@ void main(void) {
     }
 
     float selfDepth = unpackRGToUnitInterval(packedDepth);
-    // if background and if second pass
-    if (isBackground(selfDepth) && uBlurDirectionY != 0.0) {
+    // (if background and if second pass) or if near clip
+    if ((isBackground(selfDepth) && uBlurDirectionY != 0.0) || isNearClip(selfDepth)) {
         gl_FragColor = vec4(packUnitIntervalToRG(1.0), packedDepth);
         return;
     }
 
     float selfViewZ = getViewZ(selfDepth);
     float pixelSize = getPixelSize(coords, selfDepth);
-    // max diff depth between two pixels
-    float maxDiffViewZ = 1.0;
 
     vec2 offset = vec2(uBlurDirectionX, uBlurDirectionY) / uTexSize;
 
@@ -88,12 +91,12 @@ void main(void) {
         vec4 sampleSsaoDepth = texture2D(tSsaoDepth, sampleCoords);
 
         float sampleDepth = unpackRGToUnitInterval(sampleSsaoDepth.zw);
-        if (isBackground(sampleDepth)) {
+        if (isBackground(sampleDepth) || isNearClip(sampleDepth)) {
             continue;
         }
 
         float sampleViewZ = getViewZ(sampleDepth);
-        if (abs(selfViewZ - sampleViewZ) > maxDiffViewZ) {
+        if (abs(selfViewZ - sampleViewZ) >= uBlurDepthBias) {
             continue;
         }
 

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

@@ -5,7 +5,9 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addShaderDefines = exports.ImageShaderCode = exports.DirectVolumeShaderCode = exports.MeshShaderCode = exports.LinesShaderCode = exports.TextShaderCode = exports.CylindersShaderCode = exports.SpheresShaderCode = exports.PointsShaderCode = exports.ShaderCode = void 0;
+exports.ImageShaderCode = exports.DirectVolumeShaderCode = exports.MeshShaderCode = exports.LinesShaderCode = exports.TextShaderCode = exports.CylindersShaderCode = exports.SpheresShaderCode = exports.PointsShaderCode = void 0;
+exports.ShaderCode = ShaderCode;
+exports.addShaderDefines = addShaderDefines;
 const id_factory_1 = require("../mol-util/id-factory");
 const compat_1 = require("./webgl/compat");
 const type_helpers_1 = require("../mol-util/type-helpers");
@@ -123,7 +125,6 @@ function preprocess(str, defines) {
 function ShaderCode(name, vert, frag, extensions = {}, outTypes = {}, ignoreDefine) {
     return { id: shaderCodeId(), name, vert: addIncludes(vert), frag: addIncludes(frag), extensions, outTypes, ignoreDefine };
 }
-exports.ShaderCode = ShaderCode;
 // Note: `drawBuffers` need to be 'optional' for wboit
 function ignoreDefine(name, variant, defines) {
     var _a;
@@ -138,7 +139,7 @@ function ignoreDefine(name, variant, defines) {
             'dLightCount', 'dXrayShaded',
             'dOverpaintType', 'dOverpaint',
             'dSubstanceType', 'dSubstance',
-            'dColorMarker',
+            'dColorMarker', 'dCelShaded'
         ];
         if (variant !== 'emissive') {
             ignore.push('dEmissiveType', 'dEmissive');
@@ -373,4 +374,3 @@ function addShaderDefines(gl, extensions, defines, shaders) {
         outTypes: shaders.outTypes
     };
 }
-exports.addShaderDefines = addShaderDefines;

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

@@ -5,7 +5,14 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createElementsBuffer = exports.createAttributeBuffers = exports.createAttributeBuffer = exports.getAttribType = exports.getBuffer = exports.getBufferType = exports.getDataType = exports.getUsageHint = void 0;
+exports.getUsageHint = getUsageHint;
+exports.getDataType = getDataType;
+exports.getBufferType = getBufferType;
+exports.getBuffer = getBuffer;
+exports.getAttribType = getAttribType;
+exports.createAttributeBuffer = createAttributeBuffer;
+exports.createAttributeBuffers = createAttributeBuffers;
+exports.createElementsBuffer = createElementsBuffer;
 const id_factory_1 = require("../../mol-util/id-factory");
 const type_helpers_1 = require("../../mol-util/type-helpers");
 const compat_1 = require("./compat");
@@ -17,7 +24,6 @@ function getUsageHint(gl, usageHint) {
         case 'stream': return gl.STREAM_DRAW;
     }
 }
-exports.getUsageHint = getUsageHint;
 function getDataType(gl, dataType) {
     switch (dataType) {
         case 'uint8': return gl.UNSIGNED_BYTE;
@@ -30,7 +36,6 @@ function getDataType(gl, dataType) {
         default: (0, type_helpers_1.assertUnreachable)(dataType);
     }
 }
-exports.getDataType = getDataType;
 function dataTypeFromArray(gl, array) {
     if (array instanceof Uint8Array) {
         return gl.UNSIGNED_BYTE;
@@ -68,7 +73,6 @@ function getBufferType(gl, bufferType) {
             }
     }
 }
-exports.getBufferType = getBufferType;
 function getBuffer(gl) {
     const buffer = gl.createBuffer();
     if (buffer === null) {
@@ -76,7 +80,6 @@ function getBuffer(gl) {
     }
     return buffer;
 }
-exports.getBuffer = getBuffer;
 function createBuffer(gl, array, usageHint, bufferType) {
     let _buffer = getBuffer(gl);
     const _usageHint = getUsageHint(gl, usageHint);
@@ -134,7 +137,6 @@ function getAttribType(gl, kind, itemSize) {
             (0, type_helpers_1.assertUnreachable)(kind);
     }
 }
-exports.getAttribType = getAttribType;
 function createAttributeBuffer(gl, state, extensions, array, itemSize, divisor, usageHint = 'static') {
     const { instancedArrays } = extensions;
     const buffer = createBuffer(gl, array, usageHint, 'attribute');
@@ -171,7 +173,6 @@ function createAttributeBuffer(gl, state, extensions, array, itemSize, divisor,
         }
     };
 }
-exports.createAttributeBuffer = createAttributeBuffer;
 function createAttributeBuffers(ctx, schema, values) {
     const buffers = [];
     Object.keys(schema).forEach(k => {
@@ -182,7 +183,6 @@ function createAttributeBuffers(ctx, schema, values) {
     });
     return buffers;
 }
-exports.createAttributeBuffers = createAttributeBuffers;
 function createElementsBuffer(gl, array, usageHint = 'static') {
     const buffer = createBuffer(gl, array, usageHint, 'elements');
     return {
@@ -192,4 +192,3 @@ function createElementsBuffer(gl, array, usageHint = 'static') {
         }
     };
 }
-exports.createElementsBuffer = createElementsBuffer;

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

@@ -5,7 +5,38 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testColorBuffer = exports.getNoNonInstancedActiveAttribs = exports.getClipControl = exports.getStencilTexturing = exports.getConservativeDepth = exports.getClipCullDistance = exports.getProvokingVertex = exports.getFboRenderMipmap = exports.getParallelShaderCompile = exports.getMultiDrawInstancedBaseVertexBaseInstance = exports.getDrawInstancedBaseVertexBaseInstance = exports.getMultiDraw = exports.getDisjointTimerQuery = exports.getSRGB = exports.getDepthTexture = exports.getShaderTextureLod = exports.getDrawBuffersIndexed = exports.getDrawBuffers = exports.getColorBufferHalfFloat = exports.getColorBufferFloat = exports.getFragDepth = exports.getBlendMinMax = exports.getTextureHalfFloatLinear = exports.getTextureHalfFloat = exports.getTextureFloatLinear = exports.getTextureFloat = exports.getVertexArrayObject = exports.getElementIndexUint = exports.getStandardDerivatives = exports.getInstancedArrays = exports.isWebGL2 = exports.isWebGL = void 0;
+exports.isWebGL = isWebGL;
+exports.isWebGL2 = isWebGL2;
+exports.getInstancedArrays = getInstancedArrays;
+exports.getStandardDerivatives = getStandardDerivatives;
+exports.getElementIndexUint = getElementIndexUint;
+exports.getVertexArrayObject = getVertexArrayObject;
+exports.getTextureFloat = getTextureFloat;
+exports.getTextureFloatLinear = getTextureFloatLinear;
+exports.getTextureHalfFloat = getTextureHalfFloat;
+exports.getTextureHalfFloatLinear = getTextureHalfFloatLinear;
+exports.getBlendMinMax = getBlendMinMax;
+exports.getFragDepth = getFragDepth;
+exports.getColorBufferFloat = getColorBufferFloat;
+exports.getColorBufferHalfFloat = getColorBufferHalfFloat;
+exports.getDrawBuffers = getDrawBuffers;
+exports.getDrawBuffersIndexed = getDrawBuffersIndexed;
+exports.getShaderTextureLod = getShaderTextureLod;
+exports.getDepthTexture = getDepthTexture;
+exports.getSRGB = getSRGB;
+exports.getDisjointTimerQuery = getDisjointTimerQuery;
+exports.getMultiDraw = getMultiDraw;
+exports.getDrawInstancedBaseVertexBaseInstance = getDrawInstancedBaseVertexBaseInstance;
+exports.getMultiDrawInstancedBaseVertexBaseInstance = getMultiDrawInstancedBaseVertexBaseInstance;
+exports.getParallelShaderCompile = getParallelShaderCompile;
+exports.getFboRenderMipmap = getFboRenderMipmap;
+exports.getProvokingVertex = getProvokingVertex;
+exports.getClipCullDistance = getClipCullDistance;
+exports.getConservativeDepth = getConservativeDepth;
+exports.getStencilTexturing = getStencilTexturing;
+exports.getClipControl = getClipControl;
+exports.getNoNonInstancedActiveAttribs = getNoNonInstancedActiveAttribs;
+exports.testColorBuffer = testColorBuffer;
 const debug_1 = require("../../mol-util/debug");
 const context_1 = require("./context");
 const program_1 = require("./program");
@@ -13,11 +44,9 @@ const shader_1 = require("./shader");
 function isWebGL(gl) {
     return typeof WebGLRenderingContext !== 'undefined' && gl instanceof WebGLRenderingContext;
 }
-exports.isWebGL = isWebGL;
 function isWebGL2(gl) {
     return typeof WebGL2RenderingContext !== 'undefined' && gl instanceof WebGL2RenderingContext;
 }
-exports.isWebGL2 = isWebGL2;
 function getInstancedArrays(gl) {
     if (isWebGL2(gl)) {
         return {
@@ -39,7 +68,6 @@ function getInstancedArrays(gl) {
         };
     }
 }
-exports.getInstancedArrays = getInstancedArrays;
 function getStandardDerivatives(gl) {
     if (isWebGL2(gl)) {
         return { FRAGMENT_SHADER_DERIVATIVE_HINT: gl.FRAGMENT_SHADER_DERIVATIVE_HINT };
@@ -51,11 +79,9 @@ function getStandardDerivatives(gl) {
         return { FRAGMENT_SHADER_DERIVATIVE_HINT: ext.FRAGMENT_SHADER_DERIVATIVE_HINT_OES };
     }
 }
-exports.getStandardDerivatives = getStandardDerivatives;
 function getElementIndexUint(gl) {
     return isWebGL2(gl) ? {} : gl.getExtension('OES_element_index_uint');
 }
-exports.getElementIndexUint = getElementIndexUint;
 function getVertexArrayObject(gl) {
     if (isWebGL2(gl)) {
         return {
@@ -79,15 +105,12 @@ function getVertexArrayObject(gl) {
         };
     }
 }
-exports.getVertexArrayObject = getVertexArrayObject;
 function getTextureFloat(gl) {
     return isWebGL2(gl) ? {} : gl.getExtension('OES_texture_float');
 }
-exports.getTextureFloat = getTextureFloat;
 function getTextureFloatLinear(gl) {
     return gl.getExtension('OES_texture_float_linear');
 }
-exports.getTextureFloatLinear = getTextureFloatLinear;
 function getTextureHalfFloat(gl) {
     if (isWebGL2(gl)) {
         return { HALF_FLOAT: gl.HALF_FLOAT };
@@ -99,11 +122,9 @@ function getTextureHalfFloat(gl) {
         return { HALF_FLOAT: ext.HALF_FLOAT_OES };
     }
 }
-exports.getTextureHalfFloat = getTextureHalfFloat;
 function getTextureHalfFloatLinear(gl) {
     return gl.getExtension('OES_texture_half_float_linear');
 }
-exports.getTextureHalfFloatLinear = getTextureHalfFloatLinear;
 function getBlendMinMax(gl) {
     if (isWebGL2(gl)) {
         return { MIN: gl.MIN, MAX: gl.MAX };
@@ -115,11 +136,9 @@ function getBlendMinMax(gl) {
         return { MIN: ext.MIN_EXT, MAX: ext.MAX_EXT };
     }
 }
-exports.getBlendMinMax = getBlendMinMax;
 function getFragDepth(gl) {
     return isWebGL2(gl) ? {} : gl.getExtension('EXT_frag_depth');
 }
-exports.getFragDepth = getFragDepth;
 function getColorBufferFloat(gl) {
     if (isWebGL2(gl)) {
         if (gl.getExtension('EXT_color_buffer_float') === null)
@@ -138,7 +157,6 @@ function getColorBufferFloat(gl) {
         return { RGBA32F: ext.RGBA32F_EXT };
     }
 }
-exports.getColorBufferFloat = getColorBufferFloat;
 function getColorBufferHalfFloat(gl) {
     if (isWebGL2(gl)) {
         if (gl.getExtension('EXT_color_buffer_half_float') === null)
@@ -157,7 +175,6 @@ function getColorBufferHalfFloat(gl) {
         return { RGBA16F: ext.RGBA16F_EXT };
     }
 }
-exports.getColorBufferHalfFloat = getColorBufferHalfFloat;
 function getDrawBuffers(gl) {
     if (isWebGL2(gl)) {
         return {
@@ -209,7 +226,6 @@ function getDrawBuffers(gl) {
         };
     }
 }
-exports.getDrawBuffers = getDrawBuffers;
 function getDrawBuffersIndexed(gl) {
     const ext = gl.getExtension('OES_draw_buffers_indexed');
     if (ext === null)
@@ -224,11 +240,9 @@ function getDrawBuffersIndexed(gl) {
         colorMaski: ext.colorMaskiOES.bind(ext),
     };
 }
-exports.getDrawBuffersIndexed = getDrawBuffersIndexed;
 function getShaderTextureLod(gl) {
     return isWebGL2(gl) ? {} : gl.getExtension('EXT_shader_texture_lod');
 }
-exports.getShaderTextureLod = getShaderTextureLod;
 function getDepthTexture(gl) {
     if (isWebGL2(gl)) {
         return {
@@ -244,7 +258,6 @@ function getDepthTexture(gl) {
         };
     }
 }
-exports.getDepthTexture = getDepthTexture;
 function getSRGB(gl) {
     if (isWebGL2(gl)) {
         return {
@@ -266,7 +279,6 @@ function getSRGB(gl) {
         };
     }
 }
-exports.getSRGB = getSRGB;
 function getDisjointTimerQuery(gl) {
     if (isWebGL2(gl)) {
         // Firefox has EXT_disjoint_timer_query in webgl2
@@ -314,7 +326,6 @@ function getDisjointTimerQuery(gl) {
         };
     }
 }
-exports.getDisjointTimerQuery = getDisjointTimerQuery;
 function getMultiDraw(gl) {
     const ext = gl.getExtension('WEBGL_multi_draw');
     if (ext) {
@@ -329,7 +340,6 @@ function getMultiDraw(gl) {
         return null;
     }
 }
-exports.getMultiDraw = getMultiDraw;
 function getDrawInstancedBaseVertexBaseInstance(gl) {
     const ext = gl.getExtension('WEBGL_draw_instanced_base_vertex_base_instance');
     if (ext) {
@@ -342,7 +352,6 @@ function getDrawInstancedBaseVertexBaseInstance(gl) {
         return null;
     }
 }
-exports.getDrawInstancedBaseVertexBaseInstance = getDrawInstancedBaseVertexBaseInstance;
 function getMultiDrawInstancedBaseVertexBaseInstance(gl) {
     const ext = gl.getExtension('WEBGL_multi_draw_instanced_base_vertex_base_instance');
     if (ext) {
@@ -355,7 +364,6 @@ function getMultiDrawInstancedBaseVertexBaseInstance(gl) {
         return null;
     }
 }
-exports.getMultiDrawInstancedBaseVertexBaseInstance = getMultiDrawInstancedBaseVertexBaseInstance;
 function getParallelShaderCompile(gl) {
     const ext = gl.getExtension('KHR_parallel_shader_compile');
     if (ext === null)
@@ -364,11 +372,9 @@ function getParallelShaderCompile(gl) {
         COMPLETION_STATUS: ext.COMPLETION_STATUS_KHR,
     };
 }
-exports.getParallelShaderCompile = getParallelShaderCompile;
 function getFboRenderMipmap(gl) {
     return isWebGL2(gl) ? {} : gl.getExtension('OES_fbo_render_mipmap');
 }
-exports.getFboRenderMipmap = getFboRenderMipmap;
 function getProvokingVertex(gl) {
     if (isWebGL2(gl)) {
         const ext = gl.getExtension('WEBGL_provoking_vertex');
@@ -383,7 +389,6 @@ function getProvokingVertex(gl) {
     }
     return null;
 }
-exports.getProvokingVertex = getProvokingVertex;
 function getClipCullDistance(gl) {
     if (isWebGL2(gl)) {
         const ext = gl.getExtension('WEBGL_clip_cull_distance');
@@ -405,7 +410,6 @@ function getClipCullDistance(gl) {
     }
     return null;
 }
-exports.getClipCullDistance = getClipCullDistance;
 function getConservativeDepth(gl) {
     if (isWebGL2(gl)) {
         const ext = gl.getExtension('EXT_conservative_depth');
@@ -415,7 +419,6 @@ function getConservativeDepth(gl) {
     }
     return null;
 }
-exports.getConservativeDepth = getConservativeDepth;
 function getStencilTexturing(gl) {
     if (isWebGL2(gl)) {
         const ext = gl.getExtension('WEBGL_stencil_texturing');
@@ -428,7 +431,6 @@ function getStencilTexturing(gl) {
     }
     return null;
 }
-exports.getStencilTexturing = getStencilTexturing;
 function getClipControl(gl) {
     const ext = gl.getExtension('EXT_clip_control');
     if (ext) {
@@ -444,7 +446,6 @@ function getClipControl(gl) {
     }
     return null;
 }
-exports.getClipControl = getClipControl;
 function getNoNonInstancedActiveAttribs(gl) {
     if (!isWebGL2(gl))
         return false;
@@ -458,7 +459,6 @@ function getNoNonInstancedActiveAttribs(gl) {
     }
     return false;
 }
-exports.getNoNonInstancedActiveAttribs = getNoNonInstancedActiveAttribs;
 //
 const TextureTestVertShader = `
 attribute vec4 aPosition;
@@ -558,4 +558,3 @@ function testColorBuffer(gl, type) {
     }
     return true;
 }
-exports.testColorBuffer = testColorBuffer;

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

@@ -5,7 +5,12 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createContext = exports.readPixels = exports.glEnumToString = exports.checkError = exports.getErrorDescription = exports.getGLContext = void 0;
+exports.getGLContext = getGLContext;
+exports.getErrorDescription = getErrorDescription;
+exports.checkError = checkError;
+exports.glEnumToString = glEnumToString;
+exports.readPixels = readPixels;
+exports.createContext = createContext;
 const compat_1 = require("./compat");
 const framebuffer_1 = require("./framebuffer");
 const mol_task_1 = require("../../mol-task");
@@ -32,7 +37,6 @@ function getGLContext(canvas, attribs) {
         console.log(`isWebgl2: ${(0, compat_1.isWebGL2)(gl)}`);
     return gl;
 }
-exports.getGLContext = getGLContext;
 function getErrorDescription(gl, error) {
     switch (error) {
         case gl.NO_ERROR: return 'no error';
@@ -45,14 +49,12 @@ function getErrorDescription(gl, error) {
     }
     return 'unknown error';
 }
-exports.getErrorDescription = getErrorDescription;
 function checkError(gl) {
     const error = gl.getError();
     if (error !== gl.NO_ERROR) {
         throw new Error(`WebGL error: '${getErrorDescription(gl, error)}'`);
     }
 }
-exports.checkError = checkError;
 function glEnumToString(gl, value) {
     const keys = [];
     for (const key in gl) {
@@ -62,7 +64,6 @@ function glEnumToString(gl, value) {
     }
     return keys.length ? keys.join(' | ') : `0x${value.toString(16)}`;
 }
-exports.glEnumToString = glEnumToString;
 function unbindResources(gl) {
     // bind null to all texture units
     const maxTextureImageUnits = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS);
@@ -151,7 +152,6 @@ function readPixels(gl, x, y, width, height, buffer) {
     if (debug_1.isDebugMode)
         checkError(gl);
 }
-exports.readPixels = readPixels;
 function getDrawingBufferPixelData(gl, state) {
     const w = gl.drawingBufferWidth;
     const h = gl.drawingBufferHeight;
@@ -279,6 +279,7 @@ function createContext(gl, props = {}) {
         contextRestored,
         setContextLost: () => {
             isContextLost = true;
+            timer.clear();
         },
         handleContextRestored: (extraResets) => {
             Object.assign(extensions, (0, extensions_1.createExtensions)(gl));
@@ -336,4 +337,3 @@ function createContext(gl, props = {}) {
         }
     };
 }
-exports.createContext = createContext;

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

@@ -5,7 +5,7 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createExtensions = void 0;
+exports.createExtensions = createExtensions;
 const compat_1 = require("./compat");
 const debug_1 = require("../../mol-util/debug");
 function createExtensions(gl) {
@@ -160,4 +160,3 @@ function createExtensions(gl) {
         noNonInstancedActiveAttribs,
     };
 }
-exports.createExtensions = createExtensions;

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

@@ -5,7 +5,9 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createNullFramebuffer = exports.createFramebuffer = exports.checkFramebufferStatus = void 0;
+exports.checkFramebufferStatus = checkFramebufferStatus;
+exports.createFramebuffer = createFramebuffer;
+exports.createNullFramebuffer = createNullFramebuffer;
 const id_factory_1 = require("../../mol-util/id-factory");
 const compat_1 = require("./compat");
 const getNextFramebufferId = (0, id_factory_1.idFactory)();
@@ -32,7 +34,6 @@ function checkFramebufferStatus(gl) {
         throw new Error(`Framebuffer status: ${description}`);
     }
 }
-exports.checkFramebufferStatus = checkFramebufferStatus;
 function getFramebuffer(gl) {
     const framebuffer = gl.createFramebuffer();
     if (framebuffer === null) {
@@ -57,7 +58,6 @@ function createFramebuffer(gl) {
         }
     };
 }
-exports.createFramebuffer = createFramebuffer;
 //
 function createNullFramebuffer() {
     return {
@@ -67,4 +67,3 @@ function createNullFramebuffer() {
         destroy: () => { }
     };
 }
-exports.createNullFramebuffer = createNullFramebuffer;

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

@@ -5,7 +5,8 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProgram = exports.getProgram = void 0;
+exports.getProgram = getProgram;
+exports.createProgram = createProgram;
 const shader_code_1 = require("../shader-code");
 const uniform_1 = require("./uniform");
 const buffer_1 = require("./buffer");
@@ -138,7 +139,6 @@ function getProgram(gl) {
     }
     return program;
 }
-exports.getProgram = getProgram;
 function createProgram(gl, state, extensions, getShader, props) {
     const { defineValues, shaderCode: _shaderCode, schema } = props;
     let program = getProgram(gl);
@@ -228,4 +228,3 @@ function createProgram(gl, state, extensions, getShader, props) {
         }
     };
 }
-exports.createProgram = createProgram;