molstar 3.0.0-dev.6 → 3.0.0

package/lib/commonjs/mol-canvas3d/canvas3d.d.ts

@@ -107,18 +107,18 @@ export declare const Canvas3DParams: {
         }>[];
         ambientColor: import("../mol-util/color").Color;
         ambientIntensity: number;
-        clip: PD.Normalize<{
-            variant: any;
-            objects: any;
-        }>;
     }>>;
     trackball: PD.Group<PD.Normalize<{
         noScroll: boolean;
         rotateSpeed: number;
         zoomSpeed: number;
         panSpeed: number;
-        spin: boolean;
-        spinSpeed: number;
+        animate: PD.NamedParams<PD.Normalize<unknown>, "off"> | PD.NamedParams<PD.Normalize<{
+            speed: any;
+        }>, "spin"> | PD.NamedParams<PD.Normalize<{
+            speed: any;
+            angle: any;
+        }>, "rock">;
         staticMoving: boolean;
         dynamicDampingFactor: number;
         minDistance: number;
@@ -169,6 +169,7 @@ export declare const Canvas3DParams: {
             bumpAmplitude: any;
             quality: any;
             material: any;
+            clip: any;
         }>, "on">;
     }>>;
 };
@@ -258,18 +259,18 @@ export declare const DefaultCanvas3DParams: PD.Values<{
         }>[];
         ambientColor: import("../mol-util/color").Color;
         ambientIntensity: number;
-        clip: PD.Normalize<{
-            variant: any;
-            objects: any;
-        }>;
     }>>;
     trackball: PD.Group<PD.Normalize<{
         noScroll: boolean;
         rotateSpeed: number;
         zoomSpeed: number;
         panSpeed: number;
-        spin: boolean;
-        spinSpeed: number;
+        animate: PD.NamedParams<PD.Normalize<unknown>, "off"> | PD.NamedParams<PD.Normalize<{
+            speed: any;
+        }>, "spin"> | PD.NamedParams<PD.Normalize<{
+            speed: any;
+            angle: any;
+        }>, "rock">;
         staticMoving: boolean;
         dynamicDampingFactor: number;
         minDistance: number;
@@ -320,6 +321,7 @@ export declare const DefaultCanvas3DParams: PD.Values<{
             bumpAmplitude: any;
             quality: any;
             material: any;
+            clip: any;
         }>, "on">;
     }>>;
 }>;
@@ -380,7 +382,7 @@ interface Canvas3D {
     update(repr?: Representation.Any, keepBoundingSphere?: boolean): void;
     clear(): void;
     syncVisibility(): void;
-    requestDraw(force?: boolean): void;
+    requestDraw(): void;
     /** Reset the timers, used by "animate" */
     resetTime(t: number): void;
     animate(): void;

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

@@ -38,6 +38,7 @@ var helper_1 = require("./helper/helper");
 var passes_1 = require("./passes/passes");
 var mol_util_1 = require("../mol-util");
 var marking_1 = require("./passes/marking");
+var render_item_1 = require("../mol-gl/webgl/render-item");
 exports.Canvas3DParams = {
     camera: param_definition_1.ParamDefinition.Group({
         mode: param_definition_1.ParamDefinition.Select('perspective', param_definition_1.ParamDefinition.arrayToOptions(['perspective', 'orthographic']), { label: 'Camera' }),
@@ -202,7 +203,7 @@ var Canvas3D;
         var width = 128;
         var height = 128;
         updateViewport();
-        var scene = scene_1.Scene.create(webgl);
+        var scene = scene_1.Scene.create(webgl, passes.draw.wboitEnabled ? render_item_1.GraphicsRenderVariantsWboit : render_item_1.GraphicsRenderVariantsBlended);
         var camera = new camera_1.Camera({
             position: linear_algebra_1.Vec3.create(0, 0, 100),
             mode: p.camera.mode,
@@ -254,16 +255,24 @@ var Canvas3D;
                 changed = helper.camera.mark(loci, action) || changed;
                 reprRenderObjects.forEach(function (_, _repr) { changed = _repr.mark(loci, action) || changed; });
             }
-            if (changed && !noDraw) {
-                scene.update(void 0, true);
-                helper.handle.scene.update(void 0, true);
-                helper.camera.scene.update(void 0, true);
-                var prevPickDirty = pickHelper.dirty;
-                draw(true);
-                pickHelper.dirty = prevPickDirty; // marking does not change picking buffers
+            if (changed) {
+                if (noDraw) {
+                    // Even with `noDraw` make sure changes will be rendered.
+                    // Note that with this calling mark (with or without `noDraw`) multiple times
+                    // during a JS event loop iteration will only result in a single render call.
+                    forceNextRender = true;
+                }
+                else {
+                    scene.update(void 0, true);
+                    helper.handle.scene.update(void 0, true);
+                    helper.camera.scene.update(void 0, true);
+                    var prevPickDirty = pickHelper.dirty;
+                    draw({ force: true, allowMulti: true });
+                    pickHelper.dirty = prevPickDirty; // marking does not change picking buffers
+                }
             }
         }
-        function render(force) {
+        function render(force, allowMulti) {
             if (webgl.isContextLost)
                 return false;
             var resized = false;
@@ -287,17 +296,13 @@ var Canvas3D;
                     stereoCamera.update();
                     cam = stereoCamera;
                 }
+                var ctx = { renderer: renderer, camera: cam, scene: scene, helper: helper };
                 if (multi_sample_1.MultiSamplePass.isEnabled(p.multiSample)) {
-                    if (!cameraChanged) {
-                        while (!multiSampleHelper.render(renderer, cam, scene, helper, true, p.transparentBackground, p))
-                            ;
-                    }
-                    else {
-                        multiSampleHelper.render(renderer, cam, scene, helper, true, p.transparentBackground, p);
-                    }
+                    var forceOn = !cameraChanged && allowMulti && !controls.isAnimating;
+                    multiSampleHelper.render(ctx, p, true, forceOn);
                 }
                 else {
-                    passes.draw.render(renderer, cam, scene, helper, true, p.transparentBackground, p.postprocessing, p.marking);
+                    passes.draw.render(ctx, p, true);
                 }
                 pickHelper.dirty = true;
                 didRender = true;
@@ -308,15 +313,15 @@ var Canvas3D;
         var forceDrawAfterAllCommited = false;
         var currentTime = 0;
         var drawPaused = false;
-        function draw(force) {
+        function draw(options) {
             if (drawPaused)
                 return;
-            if (render(!!force) && notifyDidDraw) {
+            if (render(!!(options === null || options === void 0 ? void 0 : options.force), !!(options === null || options === void 0 ? void 0 : options.allowMulti)) && notifyDidDraw) {
                 didDraw.next((0, now_1.now)() - startTime);
             }
         }
-        function requestDraw(force) {
-            forceNextRender = forceNextRender || !!force;
+        function requestDraw() {
+            forceNextRender = true;
         }
         var animationFrameHandle = 0;
         function tick(t, options) {
@@ -326,7 +331,7 @@ var Canvas3D;
             if (options === null || options === void 0 ? void 0 : options.manualDraw) {
                 return;
             }
-            draw(false);
+            draw();
             if (!camera.transition.inTransition && !webgl.isContextLost) {
                 interactionHelper.tick(currentTime);
             }
@@ -364,7 +369,7 @@ var Canvas3D;
                 if (forceDrawAfterAllCommited) {
                     if (helper.debug.isEnabled)
                         helper.debug.update();
-                    draw(true);
+                    draw({ force: true });
                     forceDrawAfterAllCommited = false;
                 }
                 commited.next((0, now_1.now)());
@@ -533,11 +538,11 @@ var Canvas3D;
         }
         var contextRestoredSub = contextRestored.subscribe(function () {
             pickHelper.dirty = true;
-            draw(true);
+            draw({ force: true });
             // Unclear why, but in Chrome with wboit enabled the first `draw` only clears
             // the drawingBuffer. Note that in Firefox the drawingBuffer is preserved after
             // context loss so it is unclear if it behaves the same.
-            draw(true);
+            draw({ force: true });
         });
         var resized = new rxjs_1.BehaviorSubject(0);
         function handleResize(draw) {
@@ -546,7 +551,7 @@ var Canvas3D;
             updateViewport();
             syncViewport();
             if (draw)
-                requestDraw(true);
+                requestDraw();
             resized.next(+new Date());
         }
         return {
@@ -571,7 +576,7 @@ var Canvas3D;
                 reprRenderObjects.clear();
                 scene.clear();
                 helper.debug.clear();
-                requestDraw(true);
+                requestDraw();
                 reprCount.next(reprRenderObjects.size);
             },
             syncVisibility: function () {
@@ -583,7 +588,7 @@ var Canvas3D;
                     if (helper.debug.isEnabled)
                         helper.debug.update();
                 }
-                requestDraw(true);
+                requestDraw();
             },
             requestDraw: requestDraw,
             tick: tick,
@@ -680,7 +685,7 @@ var Canvas3D;
                     p.camera.stereo.name = 'off';
                 }
                 if (!doNotRequestDraw) {
-                    requestDraw(true);
+                    requestDraw();
                 }
             },
             getImagePass: function (props) {

package/lib/commonjs/mol-canvas3d/controls/trackball.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
@@ -28,8 +28,12 @@ export declare const TrackballControlsParams: {
     rotateSpeed: PD.Numeric;
     zoomSpeed: PD.Numeric;
     panSpeed: PD.Numeric;
-    spin: PD.BooleanParam;
-    spinSpeed: PD.Numeric;
+    animate: PD.Mapped<PD.NamedParams<PD.Normalize<unknown>, "off"> | PD.NamedParams<PD.Normalize<{
+        speed: number;
+    }>, "spin"> | PD.NamedParams<PD.Normalize<{
+        speed: number;
+        angle: number;
+    }>, "rock">>;
     staticMoving: PD.BooleanParam;
     dynamicDampingFactor: PD.Numeric;
     minDistance: PD.Numeric;
@@ -61,7 +65,8 @@ export declare const TrackballControlsParams: {
 export declare type TrackballControlsProps = PD.Values<typeof TrackballControlsParams>;
 export { TrackballControls };
 interface TrackballControls {
-    viewport: Viewport;
+    readonly viewport: Viewport;
+    readonly isAnimating: boolean;
     readonly props: Readonly<TrackballControlsProps>;
     setProps: (props: Partial<TrackballControlsProps>) => void;
     start: (t: number) => void;

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

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2018-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
@@ -36,8 +36,16 @@ exports.TrackballControlsParams = {
     rotateSpeed: param_definition_1.ParamDefinition.Numeric(5.0, { min: 1, max: 10, step: 1 }),
     zoomSpeed: param_definition_1.ParamDefinition.Numeric(7.0, { min: 1, max: 15, step: 1 }),
     panSpeed: param_definition_1.ParamDefinition.Numeric(1.0, { min: 0.1, max: 5, step: 0.1 }),
-    spin: param_definition_1.ParamDefinition.Boolean(false, { description: 'Spin the 3D scene around the x-axis in view space' }),
-    spinSpeed: param_definition_1.ParamDefinition.Numeric(1, { min: -20, max: 20, step: 1 }),
+    animate: param_definition_1.ParamDefinition.MappedStatic('off', {
+        off: param_definition_1.ParamDefinition.EmptyGroup(),
+        spin: param_definition_1.ParamDefinition.Group({
+            speed: param_definition_1.ParamDefinition.Numeric(1, { min: -20, max: 20, step: 1 }),
+        }, { description: 'Spin the 3D scene around the x-axis in view space' }),
+        rock: param_definition_1.ParamDefinition.Group({
+            speed: param_definition_1.ParamDefinition.Numeric(0.3, { min: -5, max: 5, step: 0.1 }),
+            angle: param_definition_1.ParamDefinition.Numeric(10, { min: 0, max: 90, step: 1 }, { description: 'How many degrees to rotate in each direction.' }),
+        }, { description: 'Rock the 3D scene around the x-axis in view space' })
+    }),
     staticMoving: param_definition_1.ParamDefinition.Boolean(true, { isHidden: true }),
     dynamicDampingFactor: param_definition_1.ParamDefinition.Numeric(0.2, {}, { isHidden: true }),
     minDistance: param_definition_1.ParamDefinition.Numeric(0.01, {}, { isHidden: true }),
@@ -101,6 +109,10 @@ var TrackballControls;
             return linear_algebra_1.Vec2.set(mouseOnCircleVec2, (pageX - viewport.width * 0.5 - viewport.x) / (viewport.width * 0.5), (viewport.height + 2 * (viewport.y - pageY)) / viewport.width // screen.width intentional
             );
         }
+        function getRotateFactor() {
+            var aspectRatio = input.width / input.height;
+            return p.rotateSpeed * input.pixelRatio * aspectRatio;
+        }
         var rotAxis = (0, linear_algebra_1.Vec3)();
         var rotQuat = (0, linear_algebra_1.Quat)();
         var rotEyeDir = (0, linear_algebra_1.Vec3)();
@@ -111,8 +123,7 @@ var TrackballControls;
             var dx = _rotCurr[0] - _rotPrev[0];
             var dy = _rotCurr[1] - _rotPrev[1];
             linear_algebra_1.Vec3.set(rotMoveDir, dx, dy, 0);
-            var aspectRatio = input.width / input.height;
-            var angle = linear_algebra_1.Vec3.magnitude(rotMoveDir) * p.rotateSpeed * input.pixelRatio * aspectRatio;
+            var angle = linear_algebra_1.Vec3.magnitude(rotMoveDir) * getRotateFactor();
             if (angle) {
                 linear_algebra_1.Vec3.sub(_eye, camera.position, camera.target);
                 linear_algebra_1.Vec3.normalize(rotEyeDir, _eye);
@@ -238,8 +249,12 @@ var TrackballControls;
         function update(t) {
             if (lastUpdated === t)
                 return;
-            if (p.spin && lastUpdated > 0)
-                spin(t - lastUpdated);
+            if (lastUpdated > 0) {
+                if (p.animate.name === 'spin')
+                    spin(t - lastUpdated);
+                else if (p.animate.name === 'rock')
+                    rock(t - lastUpdated);
+            }
             linear_algebra_1.Vec3.sub(_eye, camera.position, camera.target);
             rotateCamera();
             zRotateCamera();
@@ -270,6 +285,7 @@ var TrackballControls;
             if (!isStart && !_isInteracting)
                 return;
             _isInteracting = true;
+            resetRock(); // start rocking from the center after interactions
             var dragRotate = binding_1.Binding.match(p.bindings.dragRotate, buttons, modifiers);
             var dragRotateZ = binding_1.Binding.match(p.bindings.dragRotateZ, buttons, modifiers);
             var dragPan = binding_1.Binding.match(p.bindings.dragPan, buttons, modifiers);
@@ -358,12 +374,30 @@ var TrackballControls;
         }
         var _spinSpeed = linear_algebra_1.Vec2.create(0.005, 0);
         function spin(deltaT) {
-            if (p.spinSpeed === 0)
+            if (p.animate.name !== 'spin' || p.animate.params.speed === 0 || _isInteracting)
                 return;
-            var frameSpeed = (p.spinSpeed || 0) / 1000;
+            var frameSpeed = p.animate.params.speed / 1000;
             _spinSpeed[0] = 60 * Math.min(Math.abs(deltaT), 1000 / 8) / 1000 * frameSpeed;
-            if (!_isInteracting)
-                linear_algebra_1.Vec2.add(_rotCurr, _rotPrev, _spinSpeed);
+            linear_algebra_1.Vec2.add(_rotCurr, _rotPrev, _spinSpeed);
+        }
+        var _rockPhase = 0;
+        var _rockSpeed = linear_algebra_1.Vec2.create(0.005, 0);
+        function rock(deltaT) {
+            if (p.animate.name !== 'rock' || p.animate.params.speed === 0 || _isInteracting)
+                return;
+            var dt = deltaT / 1000 * p.animate.params.speed;
+            var maxAngle = (0, misc_1.degToRad)(p.animate.params.angle) / getRotateFactor();
+            var angleA = Math.sin(_rockPhase * Math.PI * 2) * maxAngle;
+            var angleB = Math.sin((_rockPhase + dt) * Math.PI * 2) * maxAngle;
+            _rockSpeed[0] = angleB - angleA;
+            linear_algebra_1.Vec2.add(_rotCurr, _rotPrev, _rockSpeed);
+            _rockPhase += dt;
+            if (_rockPhase >= 1) {
+                _rockPhase = 0;
+            }
+        }
+        function resetRock() {
+            _rockPhase = 0;
         }
         function start(t) {
             lastUpdated = -1;
@@ -371,8 +405,13 @@ var TrackballControls;
         }
         return {
             viewport: viewport,
+            get isAnimating() { return p.animate.name !== 'off'; },
             get props() { return p; },
             setProps: function (props) {
+                var _a;
+                if (((_a = props.animate) === null || _a === void 0 ? void 0 : _a.name) === 'rock' && p.animate.name !== 'rock') {
+                    resetRock(); // start rocking from the center
+                }
                 Object.assign(p, props);
             },
             start: start,

package/lib/commonjs/mol-canvas3d/helper/bounding-sphere-helper.js

@@ -18,6 +18,7 @@ var names_1 = require("../../mol-util/color/names");
 var sphere_2 = require("../../mol-geo/primitive/sphere");
 var mol_util_1 = require("../../mol-util");
 var geometry_2 = require("../../mol-geo/geometry/geometry");
+var render_item_1 = require("../../mol-gl/webgl/render-item");
 exports.DebugHelperParams = {
     sceneBoundingSpheres: param_definition_1.ParamDefinition.Boolean(false, { description: 'Show full scene bounding spheres.' }),
     visibleSceneBoundingSpheres: param_definition_1.ParamDefinition.Boolean(false, { description: 'Show visible scene bounding spheres.' }),
@@ -28,7 +29,7 @@ var BoundingSphereHelper = /** @class */ (function () {
     function BoundingSphereHelper(ctx, parent, props) {
         this.objectsData = new Map();
         this.instancesData = new Map();
-        this.scene = scene_1.Scene.create(ctx);
+        this.scene = scene_1.Scene.create(ctx, render_item_1.GraphicsRenderVariantsBlended);
         this.parent = parent;
         this._props = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, param_definition_1.ParamDefinition.getDefaultValues(exports.DebugHelperParams)), props);
     }
@@ -151,6 +152,6 @@ var objectMaterialId = (0, render_object_1.getNextMaterialId)();
 var instanceMaterialId = (0, render_object_1.getNextMaterialId)();
 function createBoundingSphereRenderObject(mesh, color, materialId, transform) {
     var values = mesh_1.Mesh.Utils.createValuesSimple(mesh, { alpha: 0.1, doubleSided: false }, color, 1, transform);
-    return (0, render_object_1.createRenderObject)('mesh', values, { disposed: false, visible: true, alphaFactor: 1, pickable: false, colorOnly: false, opaque: false, writeDepth: false, noClip: false }, materialId);
+    return (0, render_object_1.createRenderObject)('mesh', values, { disposed: false, visible: true, alphaFactor: 1, pickable: false, colorOnly: false, opaque: false, writeDepth: false }, materialId);
 }
 //# sourceMappingURL=bounding-sphere-helper.js.map

package/lib/commonjs/mol-canvas3d/helper/camera-helper.d.ts

@@ -30,6 +30,10 @@ export declare const CameraHelperParams: {
             roughness: number;
             bumpiness: number;
         }>;
+        clip: PD.Normalize<{
+            variant: any;
+            objects: any;
+        }>;
     }>, "on">>;
 };
 export declare type CameraHelperParams = typeof CameraHelperParams;

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

@@ -14,6 +14,7 @@ var sphere_1 = require("../../mol-geo/geometry/mesh/builder/sphere");
 var mesh_1 = require("../../mol-geo/geometry/mesh/mesh");
 var mesh_builder_1 = require("../../mol-geo/geometry/mesh/mesh-builder");
 var scene_1 = require("../../mol-gl/scene");
+var render_item_1 = require("../../mol-gl/webgl/render-item");
 var geometry_1 = require("../../mol-math/geometry");
 var linear_algebra_1 = require("../../mol-math/linear-algebra");
 var loci_1 = require("../../mol-model/loci");
@@ -55,7 +56,7 @@ var CameraHelper = /** @class */ (function () {
             }
             return changed;
         };
-        this.scene = scene_1.Scene.create(webgl);
+        this.scene = scene_1.Scene.create(webgl, render_item_1.GraphicsRenderVariantsBlended);
         this.camera = new camera_1.Camera();
         linear_algebra_1.Vec3.set(this.camera.up, 0, 1, 0);
         linear_algebra_1.Vec3.set(this.camera.target, 0, 0, 0);
@@ -70,7 +71,6 @@ var CameraHelper = /** @class */ (function () {
                     _this.scene.clear();
                     var params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, props.axes.params), { scale: props.axes.params.scale * _this.webgl.pixelRatio });
                     _this.renderObject = createAxesRenderObject(params);
-                    _this.renderObject.state.noClip = true;
                     _this.scene.add(_this.renderObject);
                     _this.scene.commit();
                     linear_algebra_1.Vec3.set(_this.camera.position, 0, 0, params.scale * 200);

package/lib/commonjs/mol-canvas3d/helper/handle-helper.d.ts

@@ -32,6 +32,10 @@ export declare const HandleHelperParams: {
             roughness: number;
             bumpiness: number;
         }>;
+        clip: PD.Normalize<{
+            variant: any;
+            objects: any;
+        }>;
     }>, "on">>;
 };
 export declare type HandleHelperParams = typeof HandleHelperParams;

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

@@ -23,6 +23,7 @@ var loci_1 = require("../../mol-model/loci");
 var marker_action_1 = require("../../mol-util/marker-action");
 var visual_1 = require("../../mol-repr/visual");
 var int_1 = require("../../mol-data/int");
+var render_item_1 = require("../../mol-gl/webgl/render-item");
 var HandleParams = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, mesh_1.Mesh.Params), { alpha: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, mesh_1.Mesh.Params.alpha), { defaultValue: 1 }), ignoreLight: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, mesh_1.Mesh.Params.ignoreLight), { defaultValue: true }), colorX: param_definition_1.ParamDefinition.Color(names_1.ColorNames.red, { isEssential: true }), colorY: param_definition_1.ParamDefinition.Color(names_1.ColorNames.green, { isEssential: true }), colorZ: param_definition_1.ParamDefinition.Color(names_1.ColorNames.blue, { isEssential: true }), scale: param_definition_1.ParamDefinition.Numeric(0.33, { min: 0.1, max: 2, step: 0.1 }, { isEssential: true }) });
 exports.HandleHelperParams = {
     handle: param_definition_1.ParamDefinition.MappedStatic('off', {
@@ -55,7 +56,7 @@ var HandleHelper = /** @class */ (function () {
             }
             return changed;
         };
-        this.scene = scene_1.Scene.create(webgl);
+        this.scene = scene_1.Scene.create(webgl, render_item_1.GraphicsRenderVariantsBlended);
         this.setProps(props);
     }
     HandleHelper.prototype.getBoundingSphere = function (out, instanceId) {
@@ -75,7 +76,6 @@ var HandleHelper = /** @class */ (function () {
                     _this.scene.clear();
                     var params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, props.handle.params), { scale: props.handle.params.scale * _this.webgl.pixelRatio });
                     _this.renderObject = createHandleRenderObject(params);
-                    _this.renderObject.state.noClip = true;
                     _this.scene.add(_this.renderObject);
                     _this.scene.commit();
                     p.handle.params = (0, tslib_1.__assign)({}, props.handle.params);

package/lib/commonjs/mol-canvas3d/helper/helper.d.ts

@@ -37,6 +37,7 @@ export declare const HelperParams: {
             bumpAmplitude: any;
             quality: any;
             material: any;
+            clip: any;
         }>, "on">;
     }>>;
 };
@@ -68,6 +69,7 @@ export declare const DefaultHelperProps: PD.Values<{
             bumpAmplitude: any;
             quality: any;
             material: any;
+            clip: any;
         }>, "on">;
     }>>;
 }>;

package/lib/commonjs/mol-canvas3d/passes/draw.d.ts

@@ -14,6 +14,17 @@ import { Helper } from '../helper/helper';
 import { StereoCamera } from '../camera/stereo';
 import { PostprocessingPass, PostprocessingProps } from './postprocessing';
 import { MarkingProps } from './marking';
+declare type Props = {
+    postprocessing: PostprocessingProps;
+    marking: MarkingProps;
+    transparentBackground: boolean;
+};
+declare type RenderContext = {
+    renderer: Renderer;
+    camera: Camera | StereoCamera;
+    scene: Scene;
+    helper: Helper;
+};
 export declare class DrawPass {
     private webgl;
     private readonly drawTarget;
@@ -40,6 +51,7 @@ export declare class DrawPass {
     private _renderWboit;
     private _renderBlended;
     private _render;
-    render(renderer: Renderer, camera: Camera | StereoCamera, scene: Scene, helper: Helper, toDrawingBuffer: boolean, transparentBackground: boolean, postprocessingProps: PostprocessingProps, markingProps: MarkingProps): void;
+    render(ctx: RenderContext, props: Props, toDrawingBuffer: boolean): void;
     getColorTarget(postprocessingProps: PostprocessingProps): RenderTarget;
 }
+export {};

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

@@ -197,23 +197,23 @@ var DrawPass = /** @class */ (function () {
         }
         renderer.renderBlendedTransparent(scene.primitives, camera, null);
     };
-    DrawPass.prototype._render = function (renderer, camera, scene, helper, toDrawingBuffer, transparentBackground, postprocessingProps, markingProps) {
+    DrawPass.prototype._render = function (renderer, camera, scene, helper, toDrawingBuffer, props) {
         var volumeRendering = scene.volumes.renderables.length > 0;
-        var postprocessingEnabled = postprocessing_1.PostprocessingPass.isEnabled(postprocessingProps);
-        var antialiasingEnabled = postprocessing_1.AntialiasingPass.isEnabled(postprocessingProps);
-        var markingEnabled = marking_1.MarkingPass.isEnabled(markingProps);
+        var postprocessingEnabled = postprocessing_1.PostprocessingPass.isEnabled(props.postprocessing);
+        var antialiasingEnabled = postprocessing_1.AntialiasingPass.isEnabled(props.postprocessing);
+        var markingEnabled = marking_1.MarkingPass.isEnabled(props.marking);
         var _a = camera.viewport, x = _a.x, y = _a.y, width = _a.width, height = _a.height;
         renderer.setViewport(x, y, width, height);
         renderer.update(camera);
-        if (transparentBackground && !antialiasingEnabled && toDrawingBuffer) {
+        if (props.transparentBackground && !antialiasingEnabled && toDrawingBuffer) {
             this.drawTarget.bind();
             renderer.clear(false);
         }
         if (this.wboitEnabled) {
-            this._renderWboit(renderer, camera, scene, transparentBackground, postprocessingProps);
+            this._renderWboit(renderer, camera, scene, props.transparentBackground, props.postprocessing);
         }
         else {
-            this._renderBlended(renderer, camera, scene, !volumeRendering && !postprocessingEnabled && !antialiasingEnabled && toDrawingBuffer, transparentBackground, postprocessingProps);
+            this._renderBlended(renderer, camera, scene, !volumeRendering && !postprocessingEnabled && !antialiasingEnabled && toDrawingBuffer, props.transparentBackground, props.postprocessing);
         }
         if (postprocessingEnabled) {
             this.postprocessing.target.bind();
@@ -225,7 +225,7 @@ var DrawPass = /** @class */ (function () {
             this.drawTarget.bind();
         }
         if (markingEnabled) {
-            var markingDepthTest = markingProps.ghostEdgeStrength < 1;
+            var markingDepthTest = props.marking.ghostEdgeStrength < 1;
             if (markingDepthTest) {
                 this.marking.depthTarget.bind();
                 renderer.clear(false);
@@ -234,7 +234,7 @@ var DrawPass = /** @class */ (function () {
             this.marking.maskTarget.bind();
             renderer.clear(false);
             renderer.renderMarkingMask(scene.primitives, camera, markingDepthTest ? this.marking.depthTarget.texture : null);
-            this.marking.update(markingProps);
+            this.marking.update(props.marking);
             this.marking.render(camera.viewport, postprocessingEnabled ? this.postprocessing.target : this.colorTarget);
         }
         if (helper.debug.isEnabled) {
@@ -250,7 +250,7 @@ var DrawPass = /** @class */ (function () {
             renderer.renderBlended(helper.camera.scene, helper.camera.camera, null);
         }
         if (antialiasingEnabled) {
-            this.antialiasing.render(camera, toDrawingBuffer, postprocessingProps);
+            this.antialiasing.render(camera, toDrawingBuffer, props.postprocessing);
         }
         else if (toDrawingBuffer) {
             this.drawTarget.bind();
@@ -264,16 +264,17 @@ var DrawPass = /** @class */ (function () {
         }
         this.webgl.gl.flush();
     };
-    DrawPass.prototype.render = function (renderer, camera, scene, helper, toDrawingBuffer, transparentBackground, postprocessingProps, markingProps) {
-        renderer.setTransparentBackground(transparentBackground);
+    DrawPass.prototype.render = function (ctx, props, toDrawingBuffer) {
+        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());
         renderer.setPixelRatio(this.webgl.pixelRatio);
         if (stereo_1.StereoCamera.is(camera)) {
-            this._render(renderer, camera.left, scene, helper, toDrawingBuffer, transparentBackground, postprocessingProps, markingProps);
-            this._render(renderer, camera.right, scene, helper, toDrawingBuffer, transparentBackground, postprocessingProps, markingProps);
+            this._render(renderer, camera.left, scene, helper, toDrawingBuffer, props);
+            this._render(renderer, camera.right, scene, helper, toDrawingBuffer, props);
         }
         else {
-            this._render(renderer, camera, scene, helper, toDrawingBuffer, transparentBackground, postprocessingProps, markingProps);
+            this._render(renderer, camera, scene, helper, toDrawingBuffer, props);
         }
     };
     DrawPass.prototype.getColorTarget = function (postprocessingProps) {

package/lib/commonjs/mol-canvas3d/passes/image.d.ts

@@ -63,6 +63,7 @@ export declare const ImageParams: {
             bumpAmplitude: any;
             quality: any;
             material: any;
+            clip: any;
         }>, "on">;
     }>>;
 };

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

@@ -76,12 +76,13 @@ var ImagePass = /** @class */ (function () {
         camera_1.Camera.copySnapshot(this._camera.state, this.camera.state);
         util_1.Viewport.set(this._camera.viewport, 0, 0, this._width, this._height);
         this._camera.update();
+        var ctx = { renderer: this.renderer, camera: this._camera, scene: this.scene, helper: this.helper };
         if (multi_sample_1.MultiSamplePass.isEnabled(this.props.multiSample)) {
-            this.multiSampleHelper.render(this.renderer, this._camera, this.scene, this.helper, false, this.props.transparentBackground, this.props);
+            this.multiSampleHelper.render(ctx, this.props, false);
             this._colorTarget = this.multiSamplePass.colorTarget;
         }
         else {
-            this.drawPass.render(this.renderer, this._camera, this.scene, this.helper, false, this.props.transparentBackground, this.props.postprocessing, this.props.marking);
+            this.drawPass.render(ctx, this.props, false);
             this._colorTarget = this.drawPass.getColorTarget(this.props.postprocessing);
         }
     };

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

@@ -20,7 +20,7 @@ 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");
 exports.MarkingParams = {
-    enabled: param_definition_1.ParamDefinition.Boolean(false),
+    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)),
     selectEdgeColor: param_definition_1.ParamDefinition.Color(color_1.Color.darken(color_1.Color.fromNormalizedRgb(0.2, 1.0, 0.1), 1.0)),
     edgeScale: param_definition_1.ParamDefinition.Numeric(1, { min: 1, max: 3, step: 1 }, { description: 'Thickness of the edge.' }),