molstar 3.8.2 → 3.10.0

package/lib/commonjs/examples/alpha-orbitals/index.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */

package/lib/commonjs/examples/alpha-orbitals/index.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
@@ -21,6 +21,7 @@ var controls_1 = require("./controls");
 var example_data_1 = require("./example-data");
 require("./index.html");
 require('mol-plugin-ui/skin/light.scss');
+var debug_1 = require("../../mol-util/debug");
 var AlphaOrbitalsExample = /** @class */ (function () {
     function AlphaOrbitalsExample() {
         this.params = new rxjs_1.BehaviorSubject({});
@@ -232,3 +233,5 @@ var AlphaOrbitalsExample = /** @class */ (function () {
 }());
 exports.AlphaOrbitalsExample = AlphaOrbitalsExample;
 window.AlphaOrbitalsExample = new AlphaOrbitalsExample();
+window.AlphaOrbitalsExample.setDebugMode = debug_1.setDebugMode;
+window.AlphaOrbitalsExample.setTimingMode = debug_1.setTimingMode;

package/lib/commonjs/examples/basic-wrapper/custom-theme.js

@@ -40,7 +40,7 @@ exports.CustomColorTheme = CustomColorTheme;
 exports.CustomColorThemeProvider = {
     name: 'basic-wrapper-custom-color-theme',
     label: 'Custom Color Theme',
-    category: "Miscellaneous" /* Misc */,
+    category: "Miscellaneous" /* ColorTheme.Category.Misc */,
     factory: CustomColorTheme,
     getParams: function () { return ({}); },
     defaultValues: {},

package/lib/commonjs/examples/proteopedia-wrapper/coloring.js

@@ -23,10 +23,10 @@ function createProteopediaCustomTheme(colors) {
     }
     function getAsymId(unit) {
         switch (unit.kind) {
-            case 0 /* Atomic */:
+            case 0 /* Unit.Kind.Atomic */:
                 return structure_1.StructureProperties.chain.label_asym_id;
-            case 1 /* Spheres */:
-            case 2 /* Gaussians */:
+            case 1 /* Unit.Kind.Spheres */:
+            case 2 /* Unit.Kind.Gaussians */:
                 return structure_1.StructureProperties.coarse.asym_id;
         }
     }

package/lib/commonjs/extensions/alpha-orbitals/density.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */

package/lib/commonjs/extensions/alpha-orbitals/density.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
@@ -10,6 +10,7 @@ var tslib_1 = require("tslib");
 var util_1 = require("../../mol-data/util");
 var grid3d_1 = require("../../mol-gl/compute/grid3d");
 var mol_task_1 = require("../../mol-task");
+var debug_1 = require("../../mol-util/debug");
 var data_model_1 = require("./data-model");
 var compute_1 = require("./gpu/compute");
 function createSphericalCollocationDensityGrid(params, orbitals, webgl) {
@@ -21,10 +22,13 @@ function createSphericalCollocationDensityGrid(params, orbitals, webgl) {
                 case 0:
                     cubeGrid = (0, data_model_1.initCubeGrid)(params);
                     if (!(0, grid3d_1.canComputeGrid3dOnGPU)(webgl)) return [3 /*break*/, 2];
+                    if (debug_1.isTimingMode)
+                        webgl.timer.mark('createSphericalCollocationDensityGrid');
                     return [4 /*yield*/, (0, compute_1.gpuComputeAlphaOrbitalsDensityGridValues)(ctx, webgl, cubeGrid, orbitals)];
                 case 1:
-                    // console.time('gpu');
                     matrix = _a.sent();
+                    if (debug_1.isTimingMode)
+                        webgl.timer.markEnd('createSphericalCollocationDensityGrid');
                     return [3 /*break*/, 3];
                 case 2: throw new Error('Missing OES_texture_float WebGL extension.');
                 case 3:

package/lib/commonjs/extensions/alpha-orbitals/orbitals.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * Inspired by https://github.com/dgasmith/gau2grid.
  *

package/lib/commonjs/extensions/alpha-orbitals/orbitals.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * Inspired by https://github.com/dgasmith/gau2grid.
  *
@@ -12,10 +12,10 @@ var tslib_1 = require("tslib");
 var util_1 = require("../../mol-data/util");
 var grid3d_1 = require("../../mol-gl/compute/grid3d");
 var mol_task_1 = require("../../mol-task");
+var debug_1 = require("../../mol-util/debug");
 var collocation_1 = require("./collocation");
 var data_model_1 = require("./data-model");
 var compute_1 = require("./gpu/compute");
-// setDebugMode(true);
 function createSphericalCollocationGrid(params, orbital, webgl) {
     var _this = this;
     return mol_task_1.Task.create('Spherical Collocation Grid', function (ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
@@ -25,10 +25,13 @@ function createSphericalCollocationGrid(params, orbital, webgl) {
                 case 0:
                     cubeGrid = (0, data_model_1.initCubeGrid)(params);
                     if (!(0, grid3d_1.canComputeGrid3dOnGPU)(webgl)) return [3 /*break*/, 2];
+                    if (debug_1.isTimingMode)
+                        webgl.timer.mark('createSphericalCollocationGrid');
                     return [4 /*yield*/, (0, compute_1.gpuComputeAlphaOrbitalsGridValues)(ctx, webgl, cubeGrid, orbital)];
                 case 1:
-                    // console.time('gpu');
                     matrix = _a.sent();
+                    if (debug_1.isTimingMode)
+                        webgl.timer.markEnd('createSphericalCollocationGrid');
                     return [3 /*break*/, 4];
                 case 2: return [4 /*yield*/, (0, collocation_1.sphericalCollocation)(cubeGrid, orbital, ctx)];
                 case 3:

package/lib/commonjs/extensions/anvil/algorithm.js

@@ -97,7 +97,7 @@ function initialize(structure, props, accessibleSurfaceArea) {
                     eI = elements[j];
                     l.element = eI;
                     // consider only amino acids in chains
-                    if ((0, util_1.getElementMoleculeType)(unit, eI) !== 5 /* Protein */ || !isPartOfEntity(l)) {
+                    if ((0, util_1.getElementMoleculeType)(unit, eI) !== 5 /* MoleculeType.Protein */ || !isPartOfEntity(l)) {
                         continue;
                     }
                     // only CA is considered for downstream operations

package/lib/commonjs/extensions/cellpack/color/generate.js

@@ -74,7 +74,7 @@ exports.CellPackGenerateColorTheme = CellPackGenerateColorTheme;
 exports.CellPackGenerateColorThemeProvider = {
     name: 'cellpack-generate',
     label: 'CellPack Generate',
-    category: "Chain Property" /* Chain */,
+    category: "Chain Property" /* ColorTheme.Category.Chain */,
     factory: CellPackGenerateColorTheme,
     getParams: getCellPackGenerateColorThemeParams,
     defaultValues: param_definition_1.ParamDefinition.getDefaultValues(exports.CellPackGenerateColorThemeParams),

package/lib/commonjs/extensions/cellpack/color/provided.js

@@ -54,7 +54,7 @@ exports.CellPackProvidedColorTheme = CellPackProvidedColorTheme;
 exports.CellPackProvidedColorThemeProvider = {
     name: 'cellpack-provided',
     label: 'CellPack Provided',
-    category: "Chain Property" /* Chain */,
+    category: "Chain Property" /* ColorTheme.Category.Chain */,
     factory: CellPackProvidedColorTheme,
     getParams: getCellPackProvidedColorThemeParams,
     defaultValues: param_definition_1.ParamDefinition.getDefaultValues(exports.CellPackProvidedColorThemeParams),

package/lib/commonjs/extensions/cellpack/state.js

@@ -338,7 +338,7 @@ var StructureFromAssemblies = objects_1.PluginStateTransform.BuiltIn({
                                 invariantId = u.invariantId + offsetInvariantId;
                                 if (u.invariantId > maxInvariantId)
                                     maxInvariantId = u.invariantId;
-                                builder.addUnit(u.kind, u.model, u.conformation.operator, u.elements, 0 /* None */, invariantId);
+                                builder.addUnit(u.kind, u.model, u.conformation.operator, u.elements, 0 /* Unit.Trait.None */, invariantId);
                             }
                             offsetInvariantId += maxInvariantId + 1;
                         }

package/lib/commonjs/extensions/dnatco/confal-pyramids/color.js

@@ -257,7 +257,7 @@ exports.ConfalPyramidsColorTheme = ConfalPyramidsColorTheme;
 exports.ConfalPyramidsColorThemeProvider = {
     name: 'confal-pyramids',
     label: 'Confal Pyramids',
-    category: "Residue Property" /* Residue */,
+    category: "Residue Property" /* ColorTheme.Category.Residue */,
     factory: ConfalPyramidsColorTheme,
     getParams: getConfalPyramidsColorThemeParams,
     defaultValues: param_definition_1.ParamDefinition.getDefaultValues(exports.ConfalPyramidsColorThemeParams),

package/lib/commonjs/extensions/g3d/model.js

@@ -96,7 +96,7 @@ function getTraj(ctx, data) {
                     for (i = 0; i < rowCount; ++i) {
                         e = normalized.entity_id[i];
                         eName.customName = e;
-                        entityId = entityBuilder.getEntityId(e, 7 /* DNA */, e, eName);
+                        entityId = entityBuilder.getEntityId(e, 7 /* MoleculeType.DNA */, e, eName);
                         entityIds[i] = entityId;
                     }
                     ihm_sphere_obj_site = db_1.Table.ofPartialColumns(schema_1.BasicSchema.ihm_sphere_obj_site, {

package/lib/commonjs/extensions/geo-export/ui.js

@@ -107,6 +107,7 @@ var GeometryExporterUI = /** @class */ (function (_super) {
     };
     GeometryExporterUI.prototype.componentWillUnmount = function () {
         var _a;
+        _super.prototype.componentWillUnmount.call(this);
         (_a = this._controls) === null || _a === void 0 ? void 0 : _a.dispose();
         this._controls = void 0;
     };

package/lib/commonjs/extensions/model-archive/quality-assessment/color/plddt.js

@@ -80,7 +80,7 @@ exports.PLDDTConfidenceColorTheme = PLDDTConfidenceColorTheme;
 exports.PLDDTConfidenceColorThemeProvider = {
     name: 'plddt-confidence',
     label: 'pLDDT Confidence',
-    category: "Validation" /* Validation */,
+    category: "Validation" /* ColorTheme.Category.Validation */,
     factory: PLDDTConfidenceColorTheme,
     getParams: getPLDDTConfidenceColorThemeParams,
     defaultValues: param_definition_1.ParamDefinition.getDefaultValues(getPLDDTConfidenceColorThemeParams({})),

package/lib/commonjs/extensions/model-archive/quality-assessment/color/qmean.js

@@ -66,7 +66,7 @@ exports.QmeanScoreColorTheme = QmeanScoreColorTheme;
 exports.QmeanScoreColorThemeProvider = {
     name: 'qmean-score',
     label: 'QMEAN Score',
-    category: "Validation" /* Validation */,
+    category: "Validation" /* ColorTheme.Category.Validation */,
     factory: QmeanScoreColorTheme,
     getParams: getQmeanScoreColorThemeParams,
     defaultValues: param_definition_1.ParamDefinition.getDefaultValues(getQmeanScoreColorThemeParams({})),

package/lib/commonjs/extensions/mp4-export/ui.js

@@ -85,6 +85,7 @@ var Mp4EncoderUI = /** @class */ (function (_super) {
     };
     Mp4EncoderUI.prototype.componentWillUnmount = function () {
         var _a;
+        _super.prototype.componentWillUnmount.call(this);
         (_a = this._controls) === null || _a === void 0 ? void 0 : _a.dispose();
         this._controls = void 0;
     };

package/lib/commonjs/extensions/pdbe/structure-quality-report/color.js

@@ -83,7 +83,7 @@ exports.StructureQualityReportColorTheme = StructureQualityReportColorTheme;
 exports.StructureQualityReportColorThemeProvider = {
     name: 'pdbe-structure-quality-report',
     label: 'Structure Quality Report',
-    category: "Validation" /* Validation */,
+    category: "Validation" /* ColorTheme.Category.Validation */,
     factory: StructureQualityReportColorTheme,
     getParams: function (ctx) {
         var issueTypes = prop_1.StructureQualityReport.getIssueTypes(ctx.structure);

package/lib/commonjs/extensions/rcsb/assembly-symmetry/color.js

@@ -15,10 +15,10 @@ var palette_1 = require("../../../mol-util/color/palette");
 var DefaultColor = (0, color_1.Color)(0xCCCCCC);
 function getAsymId(unit) {
     switch (unit.kind) {
-        case 0 /* Atomic */:
+        case 0 /* Unit.Kind.Atomic */:
             return structure_1.StructureProperties.chain.label_asym_id;
-        case 1 /* Spheres */:
-        case 2 /* Gaussians */:
+        case 1 /* Unit.Kind.Spheres */:
+        case 2 /* Unit.Kind.Gaussians */:
             return structure_1.StructureProperties.coarse.asym_id;
     }
 }
@@ -88,7 +88,7 @@ exports.AssemblySymmetryClusterColorTheme = AssemblySymmetryClusterColorTheme;
 exports.AssemblySymmetryClusterColorThemeProvider = {
     name: prop_1.AssemblySymmetry.Tag.Cluster,
     label: 'Assembly Symmetry Cluster',
-    category: "Symmetry" /* Symmetry */,
+    category: "Symmetry" /* ColorTheme.Category.Symmetry */,
     factory: AssemblySymmetryClusterColorTheme,
     getParams: getAssemblySymmetryClusterColorThemeParams,
     defaultValues: param_definition_1.ParamDefinition.getDefaultValues(exports.AssemblySymmetryClusterColorThemeParams),

package/lib/commonjs/extensions/rcsb/validation-report/color/density-fit.js

@@ -66,7 +66,7 @@ exports.DensityFitColorTheme = DensityFitColorTheme;
 exports.DensityFitColorThemeProvider = {
     name: prop_1.ValidationReport.Tag.DensityFit,
     label: 'Density Fit',
-    category: "Validation" /* Validation */,
+    category: "Validation" /* ColorTheme.Category.Validation */,
     factory: DensityFitColorTheme,
     getParams: function () { return ({}); },
     defaultValues: param_definition_1.ParamDefinition.getDefaultValues({}),

package/lib/commonjs/extensions/rcsb/validation-report/color/geometry-quality.js

@@ -55,7 +55,7 @@ function GeometryQualityColorTheme(ctx, props) {
             if (value === undefined)
                 return DefaultColor;
             var count = set_1.SetUtils.differenceSize(value, ignore_1);
-            if (count > 0 && polymerType_1[rI] === 0 /* NA */) {
+            if (count > 0 && polymerType_1[rI] === 0 /* PolymerType.NA */) {
                 count = 0;
                 if (!ignore_1.has('clash') && clashes_1.getVertexEdgeCount(element) > 0)
                     count += 1;
@@ -97,7 +97,7 @@ exports.GeometryQualityColorTheme = GeometryQualityColorTheme;
 exports.GeometryQualityColorThemeProvider = {
     name: prop_1.ValidationReport.Tag.GeometryQuality,
     label: 'Geometry Quality',
-    category: "Validation" /* Validation */,
+    category: "Validation" /* ColorTheme.Category.Validation */,
     factory: GeometryQualityColorTheme,
     getParams: getGeometricQualityColorThemeParams,
     defaultValues: param_definition_1.ParamDefinition.getDefaultValues(getGeometricQualityColorThemeParams({})),

package/lib/commonjs/extensions/rcsb/validation-report/color/random-coil-index.js

@@ -54,7 +54,7 @@ exports.RandomCoilIndexColorTheme = RandomCoilIndexColorTheme;
 exports.RandomCoilIndexColorThemeProvider = {
     name: prop_1.ValidationReport.Tag.RandomCoilIndex,
     label: 'Random Coil Index',
-    category: "Validation" /* Validation */,
+    category: "Validation" /* ColorTheme.Category.Validation */,
     factory: RandomCoilIndexColorTheme,
     getParams: function () { return ({}); },
     defaultValues: param_definition_1.ParamDefinition.getDefaultValues({}),

package/lib/commonjs/extensions/rcsb/validation-report/representation.js

@@ -42,7 +42,7 @@ function createIntraUnitClashCylinderMesh(ctx, unit, structure, theme, props, me
             pos(elements[a[edgeIndex]], posA);
             pos(elements[b[edgeIndex]], posB);
         },
-        style: function (edgeIndex) { return 6 /* Disk */; },
+        style: function (edgeIndex) { return 6 /* LinkStyle.Disk */; },
         radius: function (edgeIndex) { return magnitude[edgeIndex] * sizeFactor; },
     };
     var _a = (0, link_1.createLinkCylinderMesh)(ctx, builderProps, props, mesh), m = _a.mesh, boundingSphere = _a.boundingSphere;
@@ -143,7 +143,7 @@ function createInterUnitClashCylinderMesh(ctx, structure, theme, props, mesh) {
             uA.conformation.position(uA.elements[b.indexA], posA);
             uB.conformation.position(uB.elements[b.indexB], posB);
         },
-        style: function (edgeIndex) { return 6 /* Disk */; },
+        style: function (edgeIndex) { return 6 /* LinkStyle.Disk */; },
         radius: function (edgeIndex) { return edges[edgeIndex].props.magnitude * sizeFactor; }
     };
     var _a = (0, link_1.createLinkCylinderMesh)(ctx, builderProps, props, mesh), m = _a.mesh, boundingSphere = _a.boundingSphere;

package/lib/commonjs/mol-canvas3d/canvas3d.js

@@ -302,6 +302,8 @@ var Canvas3D;
                     stereoCamera.update();
                     cam = stereoCamera;
                 }
+                if (debug_1.isTimingMode)
+                    webgl.timer.mark('Canvas3D.render');
                 var ctx = { renderer: renderer, camera: cam, scene: scene, helper: helper };
                 if (multi_sample_1.MultiSamplePass.isEnabled(p.multiSample)) {
                     var forceOn = !cameraChanged && markingUpdated && !controls.isAnimating;
@@ -310,6 +312,8 @@ var Canvas3D;
                 else {
                     passes.draw.render(ctx, p, true);
                 }
+                if (debug_1.isTimingMode)
+                    webgl.timer.markEnd('Canvas3D.render');
                 // if only marking has updated, do not set the flag to dirty
                 pickHelper.dirty = pickHelper.dirty || shouldRender;
                 didRender = true;

package/lib/commonjs/mol-canvas3d/controls/trackball.js

@@ -21,14 +21,14 @@ var B = input_observer_1.ButtonsType;
 var M = input_observer_1.ModifiersKeys;
 var Trigger = binding_1.Binding.Trigger;
 exports.DefaultTrackballBindings = {
-    dragRotate: (0, binding_1.Binding)([Trigger(1 /* Primary */, M.create())], 'Rotate', 'Drag using ${triggers}'),
-    dragRotateZ: (0, binding_1.Binding)([Trigger(1 /* Primary */, M.create({ shift: true }))], 'Rotate around z-axis', 'Drag using ${triggers}'),
-    dragPan: (0, binding_1.Binding)([Trigger(2 /* Secondary */, M.create()), Trigger(1 /* Primary */, M.create({ control: true }))], 'Pan', 'Drag using ${triggers}'),
+    dragRotate: (0, binding_1.Binding)([Trigger(1 /* B.Flag.Primary */, M.create())], 'Rotate', 'Drag using ${triggers}'),
+    dragRotateZ: (0, binding_1.Binding)([Trigger(1 /* B.Flag.Primary */, M.create({ shift: true }))], 'Rotate around z-axis', 'Drag using ${triggers}'),
+    dragPan: (0, binding_1.Binding)([Trigger(2 /* B.Flag.Secondary */, M.create()), Trigger(1 /* B.Flag.Primary */, M.create({ control: true }))], 'Pan', 'Drag using ${triggers}'),
     dragZoom: binding_1.Binding.Empty,
-    dragFocus: (0, binding_1.Binding)([Trigger(8 /* Forth */, M.create())], 'Focus', 'Drag using ${triggers}'),
-    dragFocusZoom: (0, binding_1.Binding)([Trigger(4 /* Auxilary */, M.create())], 'Focus and zoom', 'Drag using ${triggers}'),
-    scrollZoom: (0, binding_1.Binding)([Trigger(4 /* Auxilary */, M.create())], 'Zoom', 'Scroll using ${triggers}'),
-    scrollFocus: (0, binding_1.Binding)([Trigger(4 /* Auxilary */, M.create({ shift: true }))], 'Clip', 'Scroll using ${triggers}'),
+    dragFocus: (0, binding_1.Binding)([Trigger(8 /* B.Flag.Forth */, M.create())], 'Focus', 'Drag using ${triggers}'),
+    dragFocusZoom: (0, binding_1.Binding)([Trigger(4 /* B.Flag.Auxilary */, M.create())], 'Focus and zoom', 'Drag using ${triggers}'),
+    scrollZoom: (0, binding_1.Binding)([Trigger(4 /* B.Flag.Auxilary */, M.create())], 'Zoom', 'Scroll using ${triggers}'),
+    scrollFocus: (0, binding_1.Binding)([Trigger(4 /* B.Flag.Auxilary */, M.create({ shift: true }))], 'Clip', 'Scroll using ${triggers}'),
     scrollFocusZoom: binding_1.Binding.Empty,
 };
 exports.TrackballControlsParams = {

package/lib/commonjs/mol-canvas3d/helper/camera-helper.js

@@ -89,7 +89,7 @@ var CameraHelper = /** @class */ (function () {
     });
     CameraHelper.prototype.getLoci = function (pickingId) {
         var objectId = pickingId.objectId, groupId = pickingId.groupId, instanceId = pickingId.instanceId;
-        if (!this.renderObject || objectId !== this.renderObject.id || groupId === 0 /* None */)
+        if (!this.renderObject || objectId !== this.renderObject.id || groupId === 0 /* CameraHelperAxis.None */)
             return loci_1.EmptyLoci;
         return CameraAxesLoci(this, groupId, instanceId);
     };
@@ -117,12 +117,12 @@ var CameraHelper = /** @class */ (function () {
 exports.CameraHelper = CameraHelper;
 function getAxisLabel(axis) {
     switch (axis) {
-        case 1 /* X */: return 'X Axis';
-        case 2 /* Y */: return 'Y Axis';
-        case 3 /* Z */: return 'Z Axis';
-        case 4 /* XY */: return 'XY Plane';
-        case 5 /* XZ */: return 'XZ Plane';
-        case 6 /* YZ */: return 'YZ Plane';
+        case 1 /* CameraHelperAxis.X */: return 'X Axis';
+        case 2 /* CameraHelperAxis.Y */: return 'Y Axis';
+        case 3 /* CameraHelperAxis.Z */: return 'Z Axis';
+        case 4 /* CameraHelperAxis.XY */: return 'XY Plane';
+        case 5 /* CameraHelperAxis.XZ */: return 'XZ Plane';
+        case 6 /* CameraHelperAxis.YZ */: return 'YZ Plane';
         default: return 'Axes';
     }
 }
@@ -164,33 +164,33 @@ function createAxesMesh(scale, mesh) {
     var y = linear_algebra_1.Vec3.scale((0, linear_algebra_1.Vec3)(), linear_algebra_1.Vec3.unitY, scale);
     var z = linear_algebra_1.Vec3.scale((0, linear_algebra_1.Vec3)(), linear_algebra_1.Vec3.unitZ, scale);
     var cylinderProps = { radiusTop: radius, radiusBottom: radius, radialSegments: 32 };
-    state.currentGroup = 0 /* None */;
+    state.currentGroup = 0 /* CameraHelperAxis.None */;
     (0, sphere_1.addSphere)(state, linear_algebra_1.Vec3.origin, radius, 2);
-    state.currentGroup = 1 /* X */;
+    state.currentGroup = 1 /* CameraHelperAxis.X */;
     (0, sphere_1.addSphere)(state, x, radius, 2);
     (0, cylinder_1.addCylinder)(state, linear_algebra_1.Vec3.origin, x, 1, cylinderProps);
-    state.currentGroup = 2 /* Y */;
+    state.currentGroup = 2 /* CameraHelperAxis.Y */;
     (0, sphere_1.addSphere)(state, y, radius, 2);
     (0, cylinder_1.addCylinder)(state, linear_algebra_1.Vec3.origin, y, 1, cylinderProps);
-    state.currentGroup = 3 /* Z */;
+    state.currentGroup = 3 /* CameraHelperAxis.Z */;
     (0, sphere_1.addSphere)(state, z, radius, 2);
     (0, cylinder_1.addCylinder)(state, linear_algebra_1.Vec3.origin, z, 1, cylinderProps);
     linear_algebra_1.Vec3.scale(x, x, 0.5);
     linear_algebra_1.Vec3.scale(y, y, 0.5);
     linear_algebra_1.Vec3.scale(z, z, 0.5);
-    state.currentGroup = 4 /* XY */;
+    state.currentGroup = 4 /* CameraHelperAxis.XY */;
     mesh_builder_1.MeshBuilder.addTriangle(state, linear_algebra_1.Vec3.origin, x, y);
     mesh_builder_1.MeshBuilder.addTriangle(state, linear_algebra_1.Vec3.origin, y, x);
     var xy = linear_algebra_1.Vec3.add((0, linear_algebra_1.Vec3)(), x, y);
     mesh_builder_1.MeshBuilder.addTriangle(state, xy, x, y);
     mesh_builder_1.MeshBuilder.addTriangle(state, xy, y, x);
-    state.currentGroup = 5 /* XZ */;
+    state.currentGroup = 5 /* CameraHelperAxis.XZ */;
     mesh_builder_1.MeshBuilder.addTriangle(state, linear_algebra_1.Vec3.origin, x, z);
     mesh_builder_1.MeshBuilder.addTriangle(state, linear_algebra_1.Vec3.origin, z, x);
     var xz = linear_algebra_1.Vec3.add((0, linear_algebra_1.Vec3)(), x, z);
     mesh_builder_1.MeshBuilder.addTriangle(state, xz, x, z);
     mesh_builder_1.MeshBuilder.addTriangle(state, xz, z, x);
-    state.currentGroup = 6 /* YZ */;
+    state.currentGroup = 6 /* CameraHelperAxis.YZ */;
     mesh_builder_1.MeshBuilder.addTriangle(state, linear_algebra_1.Vec3.origin, y, z);
     mesh_builder_1.MeshBuilder.addTriangle(state, linear_algebra_1.Vec3.origin, z, y);
     var yz = linear_algebra_1.Vec3.add((0, linear_algebra_1.Vec3)(), y, z);

package/lib/commonjs/mol-canvas3d/helper/interaction-events.js

@@ -88,7 +88,7 @@ var Canvas3dInteractionHelper = /** @class */ (function () {
     };
     Canvas3dInteractionHelper.prototype.identify = function (e, t) {
         var xyChanged = this.startX !== this.endX || this.startY !== this.endY;
-        if (e === 2 /* Drag */) {
+        if (e === 2 /* InputEvent.Drag */) {
             if (xyChanged && !this.outsideViewport(this.startX, this.startY)) {
                 this.events.drag.next({ current: this.prevLoci, buttons: this.buttons, button: this.button, modifiers: this.modifiers, pageStart: linear_algebra_1.Vec2.create(this.startX, this.startY), pageEnd: linear_algebra_1.Vec2.create(this.endX, this.endY) });
                 this.startX = this.endX;
@@ -103,7 +103,7 @@ var Canvas3dInteractionHelper = /** @class */ (function () {
             this.startX = this.endX;
             this.startY = this.endY;
         }
-        if (e === 1 /* Click */) {
+        if (e === 1 /* InputEvent.Click */) {
             var loci_1 = this.getLoci(this.id, this.position);
             this.events.click.next({ current: loci_1, buttons: this.buttons, button: this.button, modifiers: this.modifiers, page: linear_algebra_1.Vec2.create(this.endX, this.endY), position: this.position });
             this.prevLoci = loci_1;
@@ -119,7 +119,7 @@ var Canvas3dInteractionHelper = /** @class */ (function () {
         if (this.inside && t - this.prevT > 1000 / this.props.maxFps) {
             this.prevT = t;
             this.currentIdentifyT = t;
-            this.identify(this.isInteracting ? 2 /* Drag */ : 0 /* Move */, t);
+            this.identify(this.isInteracting ? 2 /* InputEvent.Drag */ : 0 /* InputEvent.Move */, t);
         }
     };
     Canvas3dInteractionHelper.prototype.leave = function () {
@@ -143,7 +143,7 @@ var Canvas3dInteractionHelper = /** @class */ (function () {
         this.buttons = buttons;
         this.button = button;
         this.modifiers = modifiers;
-        this.identify(1 /* Click */, 0);
+        this.identify(1 /* InputEvent.Click */, 0);
     };
     Canvas3dInteractionHelper.prototype.drag = function (x, y, buttons, button, modifiers) {
         this.endX = x;
@@ -151,7 +151,7 @@ var Canvas3dInteractionHelper = /** @class */ (function () {
         this.buttons = buttons;
         this.button = button;
         this.modifiers = modifiers;
-        this.identify(2 /* Drag */, 0);
+        this.identify(2 /* InputEvent.Drag */, 0);
     };
     Canvas3dInteractionHelper.prototype.modify = function (modifiers) {
         if (input_observer_1.ModifiersKeys.areEqual(modifiers, this.modifiers))

package/lib/commonjs/mol-canvas3d/passes/draw.js

@@ -15,6 +15,7 @@ var wboit_1 = require("./wboit");
 var postprocessing_1 = require("./postprocessing");
 var marking_1 = require("./marking");
 var util_1 = require("../../mol-gl/compute/util");
+var debug_1 = require("../../mol-util/debug");
 var DrawPass = /** @class */ (function () {
     function DrawPass(webgl, width, height, enableWboit) {
         this.webgl = webgl;
@@ -95,8 +96,12 @@ var DrawPass = /** @class */ (function () {
         // render transparent primitives and volumes
         if (scene.opacityAverage < 1 || scene.volumes.renderables.length > 0) {
             this.wboit.bind();
-            renderer.renderWboitTransparent(scene.primitives, camera, this.depthTextureOpaque);
-            renderer.renderWboitTransparent(scene.volumes, camera, this.depthTextureOpaque);
+            if (scene.opacityAverage < 1) {
+                renderer.renderWboitTransparent(scene.primitives, camera, this.depthTextureOpaque);
+            }
+            if (scene.volumes.renderables.length > 0) {
+                renderer.renderWboitTransparent(scene.volumes, camera, this.depthTextureOpaque);
+            }
             // evaluate wboit
             if (postprocessing_1.PostprocessingPass.isEnabled(postprocessingProps)) {
                 this.postprocessing.target.bind();
@@ -108,7 +113,7 @@ var DrawPass = /** @class */ (function () {
         }
     };
     DrawPass.prototype._renderBlended = function (renderer, camera, scene, toDrawingBuffer, transparentBackground, postprocessingProps) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (toDrawingBuffer) {
             this.drawTarget.bind();
         }
@@ -151,9 +156,29 @@ var DrawPass = /** @class */ (function () {
                     (_b = this.colorTarget.depthRenderbuffer) === null || _b === void 0 ? void 0 : _b.attachFramebuffer(this.postprocessing.target.framebuffer);
                 }
             }
-            renderer.renderBlendedVolume(scene.volumes, camera, this.depthTextureOpaque);
+            if (scene.volumes.renderables.length > 0) {
+                var target = postprocessing_1.PostprocessingPass.isEnabled(postprocessingProps)
+                    ? this.postprocessing.target : this.colorTarget;
+                if (!this.packedDepth) {
+                    this.depthTextureOpaque.detachFramebuffer(target.framebuffer, 'depth');
+                }
+                else {
+                    (_c = this.colorTarget.depthRenderbuffer) === null || _c === void 0 ? void 0 : _c.detachFramebuffer(target.framebuffer);
+                }
+                target.bind();
+                renderer.renderBlendedVolume(scene.volumes, camera, this.depthTextureOpaque);
+                if (!this.packedDepth) {
+                    this.depthTextureOpaque.attachFramebuffer(target.framebuffer, 'depth');
+                }
+                else {
+                    (_d = this.colorTarget.depthRenderbuffer) === null || _d === void 0 ? void 0 : _d.attachFramebuffer(target.framebuffer);
+                }
+                target.bind();
+            }
+        }
+        if (scene.opacityAverage < 1) {
+            renderer.renderBlendedTransparent(scene.primitives, camera, null);
         }
-        renderer.renderBlendedTransparent(scene.primitives, camera, null);
     };
     DrawPass.prototype._render = function (renderer, camera, scene, helper, toDrawingBuffer, props) {
         var volumeRendering = scene.volumes.renderables.length > 0;
@@ -225,6 +250,8 @@ var DrawPass = /** @class */ (function () {
         this.webgl.gl.flush();
     };
     DrawPass.prototype.render = function (ctx, props, toDrawingBuffer) {
+        if (debug_1.isTimingMode)
+            this.webgl.timer.mark('DrawPass.render');
         var renderer = ctx.renderer, camera = ctx.camera, scene = ctx.scene, helper = ctx.helper;
         renderer.setTransparentBackground(props.transparentBackground);
         renderer.setDrawingBufferSize(this.colorTarget.getWidth(), this.colorTarget.getHeight());
@@ -236,6 +263,8 @@ var DrawPass = /** @class */ (function () {
         else {
             this._render(renderer, camera, scene, helper, toDrawingBuffer, props);
         }
+        if (debug_1.isTimingMode)
+            this.webgl.timer.markEnd('DrawPass.render');
     };
     DrawPass.prototype.getColorTarget = function (postprocessingProps) {
         if (postprocessing_1.AntialiasingPass.isEnabled(postprocessingProps)) {

package/lib/commonjs/mol-canvas3d/passes/fxaa.js

@@ -17,6 +17,7 @@ var mol_util_1 = require("../../mol-util");
 var param_definition_1 = require("../../mol-util/param-definition");
 var quad_vert_1 = require("../../mol-gl/shader/quad.vert");
 var fxaa_frag_1 = require("../../mol-gl/shader/fxaa.frag");
+var debug_1 = require("../../mol-util/debug");
 exports.FxaaParams = {
     edgeThresholdMin: param_definition_1.ParamDefinition.Numeric(0.0312, { min: 0.0312, max: 0.0833, step: 0.0001 }, { description: 'Trims the algorithm from processing darks.' }),
     edgeThresholdMax: param_definition_1.ParamDefinition.Numeric(0.063, { min: 0.063, max: 0.333, step: 0.001 }, { description: 'The minimum amount of local contrast required to apply algorithm.' }),
@@ -68,6 +69,8 @@ var FxaaPass = /** @class */ (function () {
         }
     };
     FxaaPass.prototype.render = function (viewport, target) {
+        if (debug_1.isTimingMode)
+            this.webgl.timer.mark('FxaaPass.render');
         if (target) {
             target.bind();
         }
@@ -76,6 +79,8 @@ var FxaaPass = /** @class */ (function () {
         }
         this.updateState(viewport);
         this.renderable.render();
+        if (debug_1.isTimingMode)
+            this.webgl.timer.markEnd('FxaaPass.render');
     };
     return FxaaPass;
 }());

package/lib/commonjs/mol-canvas3d/passes/marking.js

@@ -19,6 +19,7 @@ var quad_vert_1 = require("../../mol-gl/shader/quad.vert");
 var overlay_frag_1 = require("../../mol-gl/shader/marking/overlay.frag");
 var color_1 = require("../../mol-util/color");
 var edge_frag_1 = require("../../mol-gl/shader/marking/edge.frag");
+var debug_1 = require("../../mol-util/debug");
 exports.MarkingParams = {
     enabled: param_definition_1.ParamDefinition.Boolean(true),
     highlightEdgeColor: param_definition_1.ParamDefinition.Color(color_1.Color.darken(color_1.Color.fromNormalizedRgb(1.0, 0.4, 0.6), 1.0)),
@@ -91,6 +92,8 @@ var MarkingPass = /** @class */ (function () {
         mol_util_1.ValueCell.update(overlayValues.uGhostEdgeStrength, ghostEdgeStrength);
     };
     MarkingPass.prototype.render = function (viewport, target) {
+        if (debug_1.isTimingMode)
+            this.webgl.timer.mark('MarkingPass.render');
         this.edgesTarget.bind();
         this.setEdgeState(viewport);
         this.edge.render();
@@ -102,6 +105,8 @@ var MarkingPass = /** @class */ (function () {
         }
         this.setOverlayState(viewport);
         this.overlay.render();
+        if (debug_1.isTimingMode)
+            this.webgl.timer.markEnd('MarkingPass.render');
     };
     return MarkingPass;
 }());