molstar 3.0.0-dev.6 → 3.0.0-dev.7

package/lib/commonjs/mol-plugin-state/manager/structure/component.js

@@ -1,8 +1,9 @@
 "use strict";
 /**
- * Copyright (c) 2019-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StructureComponentManager = void 0;
@@ -28,6 +29,7 @@ var structure_transparency_1 = require("../../helpers/structure-transparency");
 var structure_focus_representation_1 = require("../../../mol-plugin/behavior/dynamic/selection/structure-focus-representation");
 var structure_substance_1 = require("../../helpers/structure-substance");
 var material_1 = require("../../../mol-util/material");
+var clip_1 = require("../../../mol-util/clip");
 var StructureComponentManager = /** @class */ (function (_super) {
     (0, tslib_1.__extends)(StructureComponentManager, _super);
     function StructureComponentManager(plugin) {
@@ -77,6 +79,7 @@ var StructureComponentManager = /** @class */ (function (_super) {
                                     return [4 /*yield*/, this.plugin.state.updateBehavior(structure_focus_representation_1.StructureFocusRepresentation, function (p) {
                                             p.ignoreHydrogens = !options.showHydrogens;
                                             p.material = options.materialStyle;
+                                            p.clip = options.clipObjects;
                                         })];
                                 case 2:
                                     _a.sent();
@@ -93,18 +96,19 @@ var StructureComponentManager = /** @class */ (function (_super) {
         });
     };
     StructureComponentManager.prototype.updateReprParams = function (update, component) {
-        var _a = this.state.options, showHydrogens = _a.showHydrogens, quality = _a.visualQuality, material = _a.materialStyle;
+        var _a = this.state.options, showHydrogens = _a.showHydrogens, quality = _a.visualQuality, material = _a.materialStyle, clip = _a.clipObjects;
         var ignoreHydrogens = !showHydrogens;
         for (var _i = 0, _b = component.representations; _i < _b.length; _i++) {
             var r = _b[_i];
             if (r.cell.transform.transformer !== representation_1.StructureRepresentation3D)
                 continue;
             var params = r.cell.transform.params;
-            if (!!params.type.params.ignoreHydrogens !== ignoreHydrogens || params.type.params.quality !== quality || !(0, mol_util_1.shallowEqual)(params.type.params.material, material)) {
+            if (!!params.type.params.ignoreHydrogens !== ignoreHydrogens || params.type.params.quality !== quality || !(0, mol_util_1.shallowEqual)(params.type.params.material, material) || !param_definition_1.ParamDefinition.areEqual(clip_1.Clip.Params, params.type.params.clip, clip)) {
                 update.to(r.cell).update(function (old) {
                     old.type.params.ignoreHydrogens = ignoreHydrogens;
                     old.type.params.quality = quality;
                     old.type.params.material = material;
+                    old.type.params.clip = clip;
                 });
             }
         }
@@ -376,9 +380,9 @@ var StructureComponentManager = /** @class */ (function (_super) {
         var _this = this;
         if (components.length === 0)
             return;
-        var _a = this.state.options, showHydrogens = _a.showHydrogens, quality = _a.visualQuality, material = _a.materialStyle;
+        var _a = this.state.options, showHydrogens = _a.showHydrogens, quality = _a.visualQuality, material = _a.materialStyle, clip = _a.clipObjects;
         var ignoreHydrogens = !showHydrogens;
-        var typeParams = { ignoreHydrogens: ignoreHydrogens, quality: quality, material: material };
+        var typeParams = { ignoreHydrogens: ignoreHydrogens, quality: quality, material: material, clip: clip };
         return this.plugin.dataTransaction(function () { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
             var _i, components_9, component;
             return (0, tslib_1.__generator)(this, function (_a) {
@@ -439,16 +443,16 @@ var StructureComponentManager = /** @class */ (function (_super) {
             var _this = this;
             return (0, tslib_1.__generator)(this, function (_a) {
                 return [2 /*return*/, this.plugin.dataTransaction(function () { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                        var xs, _a, showHydrogens, quality, material, ignoreHydrogens, typeParams, componentKey, _i, xs_1, s, component;
+                        var xs, _a, showHydrogens, quality, material, clip, ignoreHydrogens, typeParams, componentKey, _i, xs_1, s, component;
                         return (0, tslib_1.__generator)(this, function (_b) {
                             switch (_b.label) {
                                 case 0:
                                     xs = structures || this.currentStructures;
                                     if (xs.length === 0)
                                         return [2 /*return*/];
-                                    _a = this.state.options, showHydrogens = _a.showHydrogens, quality = _a.visualQuality, material = _a.materialStyle;
+                                    _a = this.state.options, showHydrogens = _a.showHydrogens, quality = _a.visualQuality, material = _a.materialStyle, clip = _a.clipObjects;
                                     ignoreHydrogens = !showHydrogens;
-                                    typeParams = { ignoreHydrogens: ignoreHydrogens, quality: quality, material: material };
+                                    typeParams = { ignoreHydrogens: ignoreHydrogens, quality: quality, material: material, clip: clip };
                                     componentKey = mol_util_1.UUID.create22();
                                     _i = 0, xs_1 = xs;
                                     _b.label = 1;
@@ -625,6 +629,7 @@ exports.StructureComponentManager = StructureComponentManager;
         showHydrogens: param_definition_1.ParamDefinition.Boolean(true, { description: 'Toggle display of hydrogen atoms in representations' }),
         visualQuality: param_definition_1.ParamDefinition.Select('auto', base_1.VisualQualityOptions, { description: 'Control the visual/rendering quality of representations' }),
         materialStyle: material_1.Material.getParam(),
+        clipObjects: param_definition_1.ParamDefinition.Group(clip_1.Clip.Params),
         interactions: param_definition_1.ParamDefinition.Group(interactions_1.InteractionsProvider.defaultParams, { label: 'Non-covalent Interactions' }),
     };
     function getAddParams(plugin, params) {

package/lib/commonjs/mol-plugin-state/transforms/representation.d.ts

@@ -159,6 +159,10 @@ declare const ModelUnitcell3D: StateTransformer<SO.Molecule.Model, SO.Shape.Repr
         roughness: number;
         bumpiness: number;
     }>;
+    clip: PD.Normalize<{
+        variant: any;
+        objects: any;
+    }>;
 }>>;
 export { StructureBoundingBox3D };
 declare type StructureBoundingBox3D = typeof StructureBoundingBox3D;
@@ -177,6 +181,10 @@ declare const StructureBoundingBox3D: StateTransformer<SO.Molecule.Structure, SO
         roughness: number;
         bumpiness: number;
     }>;
+    clip: PD.Normalize<{
+        variant: any;
+        objects: any;
+    }>;
     radius: number;
     color: Color;
 }>>;
@@ -214,6 +222,10 @@ declare const StructureSelectionsDistance3D: StateTransformer<SO.Molecule.Struct
         roughness: number;
         bumpiness: number;
     }>;
+    clip: PD.Normalize<{
+        variant: any;
+        objects: any;
+    }>;
     lineSizeAttenuation: boolean;
     linesColor: Color;
     linesSize: number;
@@ -252,6 +264,10 @@ declare const StructureSelectionsAngle3D: StateTransformer<SO.Molecule.Structure
         roughness: number;
         bumpiness: number;
     }>;
+    clip: PD.Normalize<{
+        variant: any;
+        objects: any;
+    }>;
     ignoreLight: boolean;
     sectorOpacity: number;
     color: Color;
@@ -299,6 +315,10 @@ declare const StructureSelectionsDihedral3D: StateTransformer<SO.Molecule.Struct
         roughness: number;
         bumpiness: number;
     }>;
+    clip: PD.Normalize<{
+        variant: any;
+        objects: any;
+    }>;
     ignoreLight: boolean;
     sectorOpacity: number;
     color: Color;
@@ -347,6 +367,10 @@ declare const StructureSelectionsLabel3D: StateTransformer<SO.Molecule.Structure
         roughness: number;
         bumpiness: number;
     }>;
+    clip: PD.Normalize<{
+        variant: any;
+        objects: any;
+    }>;
 }>>;
 export { StructureSelectionsOrientation3D };
 declare type StructureSelectionsOrientation3D = typeof StructureSelectionsOrientation3D;
@@ -369,6 +393,10 @@ declare const StructureSelectionsOrientation3D: StateTransformer<SO.Molecule.Str
         roughness: number;
         bumpiness: number;
     }>;
+    clip: PD.Normalize<{
+        variant: any;
+        objects: any;
+    }>;
 }>>;
 export { StructureSelectionsPlane3D };
 declare type StructureSelectionsPlane3D = typeof StructureSelectionsPlane3D;
@@ -390,4 +418,8 @@ declare const StructureSelectionsPlane3D: StateTransformer<SO.Molecule.Structure
         roughness: number;
         bumpiness: number;
     }>;
+    clip: PD.Normalize<{
+        variant: any;
+        objects: any;
+    }>;
 }>>;

package/lib/commonjs/mol-plugin-ui/viewport/simple-settings.js

@@ -61,7 +61,7 @@ var SimpleSettingsParams = {
         outline: canvas3d_1.Canvas3DParams.postprocessing.params.outline,
         fog: canvas3d_1.Canvas3DParams.cameraFog,
     }, { isFlat: true }),
-    clipping: param_definition_1.ParamDefinition.Group((0, tslib_1.__assign)((0, tslib_1.__assign)({}, canvas3d_1.Canvas3DParams.cameraClipping.params), canvas3d_1.Canvas3DParams.renderer.params.clip.params), { pivot: 'radius' }),
+    clipping: param_definition_1.ParamDefinition.Group((0, tslib_1.__assign)({}, canvas3d_1.Canvas3DParams.cameraClipping.params), { pivot: 'radius' }),
     layout: param_definition_1.ParamDefinition.MultiSelect([], param_definition_1.ParamDefinition.objectToOptions(LayoutOptions)),
 };
 var SimpleSettingsMapping = (0, param_mapping_1.ParamMapping)({
@@ -111,7 +111,7 @@ var SimpleSettingsMapping = (0, param_mapping_1.ParamMapping)({
                 outline: canvas.postprocessing.outline,
                 fog: canvas.cameraFog,
             },
-            clipping: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, canvas.cameraClipping), canvas.renderer.clip)
+            clipping: (0, tslib_1.__assign)({}, canvas.cameraClipping)
         };
     },
     update: function (s, props) {
@@ -128,10 +128,6 @@ var SimpleSettingsMapping = (0, param_mapping_1.ParamMapping)({
             radius: s.clipping.radius,
             far: s.clipping.far,
         };
-        canvas.renderer.clip = {
-            variant: s.clipping.variant,
-            objects: s.clipping.objects,
-        };
         props.layout = s.layout;
     },
     apply: function (props, ctx) {

package/lib/commonjs/mol-repr/shape/loci/angle.d.ts

@@ -40,6 +40,16 @@ export declare const AngleParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
     ignoreLight: PD.BooleanParam;
     sectorOpacity: PD.Numeric;
     color: PD.Color;

package/lib/commonjs/mol-repr/shape/loci/common.d.ts

@@ -40,5 +40,15 @@ export declare const LociLabelTextParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type LociLabelTextParams = typeof LociLabelTextParams;

package/lib/commonjs/mol-repr/shape/loci/dihedral.d.ts

@@ -40,6 +40,16 @@ export declare const DihedralParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
     ignoreLight: PD.BooleanParam;
     sectorOpacity: PD.Numeric;
     color: PD.Color;

package/lib/commonjs/mol-repr/shape/loci/distance.d.ts

@@ -41,6 +41,16 @@ export declare const DistanceParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
     lineSizeAttenuation: PD.BooleanParam;
     linesColor: PD.Color;
     linesSize: PD.Numeric;

package/lib/commonjs/mol-repr/shape/loci/label.d.ts

@@ -44,6 +44,16 @@ export declare const LabelParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type LabelParams = typeof LabelParams;
 export declare type LabelProps = PD.Values<LabelParams>;

package/lib/commonjs/mol-repr/shape/loci/orientation.d.ts

@@ -28,6 +28,16 @@ export declare const OrientationParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type OrientationParams = typeof OrientationParams;
 export declare type OrientationProps = PD.Values<OrientationParams>;

package/lib/commonjs/mol-repr/shape/loci/plane.d.ts

@@ -27,6 +27,16 @@ export declare const PlaneParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type PlaneParams = typeof PlaneParams;
 export declare type PlaneProps = PD.Values<PlaneParams>;

package/lib/commonjs/mol-repr/shape/model/unitcell.d.ts

@@ -30,6 +30,16 @@ export declare const UnitcellParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type UnitcellParams = typeof UnitcellParams;
 export declare type UnitcellProps = PD.Values<UnitcellParams>;

package/lib/commonjs/mol-repr/structure/complex-visual.d.ts

@@ -56,6 +56,16 @@ export declare const ComplexMeshParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type ComplexMeshParams = typeof ComplexMeshParams;
 export interface ComplexMeshVisualBuilder<P extends ComplexMeshParams> extends ComplexVisualBuilder<P, Mesh> {
@@ -78,6 +88,16 @@ export declare const ComplexCylindersParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type ComplexCylindersParams = typeof ComplexCylindersParams;
 export interface ComplexCylindersVisualBuilder<P extends ComplexCylindersParams> extends ComplexVisualBuilder<P, Cylinders> {
@@ -95,6 +115,16 @@ export declare const ComplexLinesParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type ComplexLinesParams = typeof ComplexLinesParams;
 export interface ComplexLinesVisualBuilder<P extends ComplexLinesParams> extends ComplexVisualBuilder<P, Lines> {
@@ -129,6 +159,16 @@ export declare const ComplexTextParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type ComplexTextParams = typeof ComplexTextParams;
 export interface ComplexTextVisualBuilder<P extends ComplexTextParams> extends ComplexVisualBuilder<P, Text> {
@@ -167,6 +207,16 @@ export declare const ComplexDirectVolumeParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type ComplexDirectVolumeParams = typeof ComplexDirectVolumeParams;
 export interface ComplexDirectVolumeVisualBuilder<P extends ComplexDirectVolumeParams> extends ComplexVisualBuilder<P, DirectVolume> {
@@ -189,6 +239,16 @@ export declare const ComplexTextureMeshParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type ComplexTextureMeshParams = typeof ComplexTextureMeshParams;
 export interface ComplexTextureMeshVisualBuilder<P extends ComplexTextureMeshParams> extends ComplexVisualBuilder<P, TextureMesh> {

package/lib/commonjs/mol-repr/structure/params.d.ts

@@ -27,6 +27,16 @@ export declare const StructureMeshParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type StructureMeshParams = typeof StructureMeshParams;
 export declare const StructureSpheresParams: {
@@ -43,6 +53,16 @@ export declare const StructureSpheresParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type StructureSpheresParams = typeof StructureSpheresParams;
 export declare const StructureCylindersParams: {
@@ -60,6 +80,16 @@ export declare const StructureCylindersParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type StructureCylindersParams = typeof StructureCylindersParams;
 export declare const StructurePointsParams: {
@@ -73,6 +103,16 @@ export declare const StructurePointsParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type StructurePointsParams = typeof StructurePointsParams;
 export declare const StructureLinesParams: {
@@ -85,6 +125,16 @@ export declare const StructureLinesParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type StructureLinesParams = typeof StructureLinesParams;
 export declare const StructureTextParams: {
@@ -114,6 +164,16 @@ export declare const StructureTextParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type StructureTextParams = typeof StructureTextParams;
 export declare const StructureDirectVolumeParams: {
@@ -147,6 +207,16 @@ export declare const StructureDirectVolumeParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type StructureDirectVolumeParams = typeof StructureDirectVolumeParams;
 export declare const StructureTextureMeshParams: {
@@ -164,5 +234,15 @@ export declare const StructureTextureMeshParams: {
         roughness: number;
         bumpiness: number;
     }>>;
+    clip: PD.Group<PD.Normalize<{
+        variant: import("../../mol-util/clip").Clip.Variant;
+        objects: PD.Normalize<{
+            type: any;
+            invert: any;
+            position: any;
+            rotation: any;
+            scale: any;
+        }>[];
+    }>>;
 };
 export declare type StructureTextureMeshParams = typeof StructureTextureMeshParams;