molstar 3.0.0-dev.9 → 3.1.0

package/lib/commonjs/mol-plugin/behavior/dynamic/selection/structure-focus-representation.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2019-2021 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2022 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>
@@ -27,11 +27,19 @@ var StructureFocusRepresentationParams = function (plugin) {
         expandRadius: param_definition_1.ParamDefinition.Numeric(5, { min: 1, max: 10, step: 1 }),
         targetParams: param_definition_1.ParamDefinition.Group(reprParams, {
             label: 'Target',
-            customDefault: (0, structure_representation_params_1.createStructureRepresentationParams)(plugin, void 0, { type: 'ball-and-stick', size: 'physical', typeParams: { sizeFactor: 0.26, alpha: 0.51, adjustCylinderLength: true } })
+            customDefault: (0, structure_representation_params_1.createStructureRepresentationParams)(plugin, void 0, {
+                type: 'ball-and-stick',
+                size: 'physical',
+                typeParams: { sizeFactor: 0.22, sizeAspectRatio: 0.73, adjustCylinderLength: true, xrayShaded: true, aromaticBonds: false, multipleBonds: 'off', excludeTypes: ['hydrogen-bond', 'metal-coordination'] },
+            })
         }),
         surroundingsParams: param_definition_1.ParamDefinition.Group(reprParams, {
             label: 'Surroundings',
-            customDefault: (0, structure_representation_params_1.createStructureRepresentationParams)(plugin, void 0, { type: 'ball-and-stick', size: 'physical', typeParams: { sizeFactor: 0.16 } })
+            customDefault: (0, structure_representation_params_1.createStructureRepresentationParams)(plugin, void 0, {
+                type: 'ball-and-stick',
+                size: 'physical',
+                typeParams: { sizeFactor: 0.16, excludeTypes: ['hydrogen-bond', 'metal-coordination'] }
+            })
         }),
         nciParams: param_definition_1.ParamDefinition.Group(reprParams, {
             label: 'Non-covalent Int.',
@@ -44,6 +52,7 @@ var StructureFocusRepresentationParams = function (plugin) {
         components: param_definition_1.ParamDefinition.MultiSelect(FocusComponents, param_definition_1.ParamDefinition.arrayToOptions(FocusComponents)),
         excludeTargetFromSurroundings: param_definition_1.ParamDefinition.Boolean(false, { label: 'Exclude Target', description: 'Exclude the focus "target" from the surroudings component.' }),
         ignoreHydrogens: param_definition_1.ParamDefinition.Boolean(false),
+        ignoreLight: param_definition_1.ParamDefinition.Boolean(false),
         material: material_1.Material.getParam(),
         clip: param_definition_1.ParamDefinition.Group(clip_1.Clip.Params),
     };
@@ -71,9 +80,9 @@ var StructureFocusRepresentationBehavior = /** @class */ (function (_super) {
         configurable: true
     });
     StructureFocusRepresentationBehavior.prototype.getReprParams = function (reprParams) {
-        return (0, tslib_1.__assign)((0, tslib_1.__assign)({}, this.params.targetParams), { type: {
+        return (0, tslib_1.__assign)((0, tslib_1.__assign)({}, reprParams), { type: {
                 name: reprParams.type.name,
-                params: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, reprParams.type.params), { ignoreHydrogens: this.params.ignoreHydrogens, material: this.params.material, clip: this.params.clip })
+                params: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, reprParams.type.params), { ignoreHydrogens: this.params.ignoreHydrogens, ignoreLight: this.params.ignoreLight, material: this.params.material, clip: this.params.clip })
             } });
     };
     StructureFocusRepresentationBehavior.prototype.ensureShape = function (cell) {
@@ -107,7 +116,7 @@ var StructureFocusRepresentationBehavior = /** @class */ (function (_super) {
         if (components.indexOf('interactions') >= 0 && !refs[StructureFocusRepresentationTags.SurrNciRepr] && cell.obj && interactions_1.InteractionsRepresentationProvider.isApplicable((_a = cell.obj) === null || _a === void 0 ? void 0 : _a.data)) {
             refs[StructureFocusRepresentationTags.SurrNciRepr] = builder
                 .to(refs[StructureFocusRepresentationTags.SurrSel])
-                .apply(transforms_1.StateTransforms.Representation.StructureRepresentation3D, this.params.nciParams, { tags: StructureFocusRepresentationTags.SurrNciRepr }).ref;
+                .apply(transforms_1.StateTransforms.Representation.StructureRepresentation3D, this.getReprParams(this.params.nciParams), { tags: StructureFocusRepresentationTags.SurrNciRepr }).ref;
         }
         return { state: state, builder: builder, refs: refs };
     };
@@ -217,7 +226,7 @@ var StructureFocusRepresentationBehavior = /** @class */ (function (_super) {
                             if (!hasComponent)
                                 builder.delete(repr.transform.ref);
                             else
-                                builder.to(repr).update(this.params.nciParams);
+                                builder.to(repr).update(this.getReprParams(this.params.nciParams));
                         }
                         return [4 /*yield*/, commands_1.PluginCommands.State.Update(this.plugin, { state: state, tree: builder, options: { doNotLogTiming: true, doNotUpdateCurrent: true } })];
                     case 1:

package/lib/commonjs/mol-plugin/behavior/static/representation.js

@@ -89,7 +89,7 @@ function UpdateRepresentationVisibility(ctx) {
 }
 exports.UpdateRepresentationVisibility = UpdateRepresentationVisibility;
 function updateVisibility(cell, r) {
-    if (r.state.visible === cell.state.isHidden) {
+    if (r.state.visible === !!cell.state.isHidden) {
         r.setState({ visible: !cell.state.isHidden });
         return true;
     }

package/lib/commonjs/mol-plugin/commands.d.ts

@@ -278,8 +278,12 @@ export declare const PluginCommands: {
                     rotateSpeed: number;
                     zoomSpeed: number;
                     panSpeed: number;
-                    spin: boolean;
-                    spinSpeed: number;
+                    animate: import("../mol-util/param-definition").ParamDefinition.NamedParams<import("../mol-util/param-definition").ParamDefinition.Normalize<unknown>, "off"> | import("../mol-util/param-definition").ParamDefinition.NamedParams<import("../mol-util/param-definition").ParamDefinition.Normalize<{
+                        speed: any;
+                    }>, "spin"> | import("../mol-util/param-definition").ParamDefinition.NamedParams<import("../mol-util/param-definition").ParamDefinition.Normalize<{
+                        speed: any;
+                        angle: any;
+                    }>, "rock">;
                     staticMoving: boolean;
                     dynamicDampingFactor: number;
                     minDistance: number;

package/lib/commonjs/mol-plugin/spec.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 David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>

package/lib/commonjs/mol-plugin/spec.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 David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
@@ -19,6 +19,7 @@ var transforms_1 = require("../mol-plugin-state/transforms");
 var transformers_1 = require("../mol-plugin/behavior/dynamic/volume-streaming/transformers");
 var state_interpolation_1 = require("../mol-plugin-state/animation/built-in/state-interpolation");
 var spin_structure_1 = require("../mol-plugin-state/animation/built-in/spin-structure");
+var camera_rock_1 = require("../mol-plugin-state/animation/built-in/camera-rock");
 var PluginSpec;
 (function (PluginSpec) {
     function Action(action, params) {
@@ -98,6 +99,7 @@ var DefaultPluginSpec = function () { return ({
     animations: [
         model_index_1.AnimateModelIndex,
         camera_spin_1.AnimateCameraSpin,
+        camera_rock_1.AnimateCameraRock,
         state_snapshots_1.AnimateStateSnapshots,
         assembly_unwind_1.AnimateAssemblyUnwind,
         spin_structure_1.AnimateStructureSpin,

package/lib/commonjs/mol-plugin-state/actions/file.d.ts

@@ -4,15 +4,16 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 import { StateAction } from '../../mol-state';
+import { Asset } from '../../mol-util/assets';
 import { ParamDefinition as PD } from '../../mol-util/param-definition';
 import { PluginStateObject } from '../objects';
 export declare const OpenFiles: StateAction<PluginStateObject.Root, void, PD.Normalize<{
-    files: import("../../mol-util/assets").Asset.File[] | null;
+    files: Asset.File[] | null;
     format: PD.NamedParams<PD.Normalize<unknown>, "auto"> | PD.NamedParams<string, "specific">;
     visuals: boolean;
 }>>;
 export declare const DownloadFile: StateAction<PluginStateObject.Root, void, PD.Normalize<{
-    url: string | import("../../mol-util/assets").Asset.Url;
+    url: string | Asset.Url;
     format: string;
     isBinary: boolean;
     visuals: boolean;

package/lib/commonjs/mol-plugin-state/actions/file.js

@@ -9,8 +9,10 @@ exports.DownloadFile = exports.OpenFiles = void 0;
 var tslib_1 = require("tslib");
 var mol_state_1 = require("../../mol-state");
 var mol_task_1 = require("../../mol-task");
+var assets_1 = require("../../mol-util/assets");
 var file_info_1 = require("../../mol-util/file-info");
 var param_definition_1 = require("../../mol-util/param-definition");
+var zip_1 = require("../../mol-util/zip/zip");
 var objects_1 = require("../objects");
 exports.OpenFiles = mol_state_1.StateAction.build({
     display: { name: 'Open Files', description: 'Load one or more files and optionally create default visuals' },
@@ -34,53 +36,87 @@ exports.OpenFiles = mol_state_1.StateAction.build({
                 case 0:
                     plugin.behaviors.layout.leftPanelTabName.next('data');
                     return [4 /*yield*/, state.transaction(function () { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
-                            var _i, _a, file, info, isBinary, data, provider, parsed, e_1;
-                            var _b, _c;
-                            return (0, tslib_1.__generator)(this, function (_d) {
-                                switch (_d.label) {
+                            var processFile, _i, _a, file, zippedFiles, _b, _c, _d, _e, _f, fn, filedata, asset, e_1;
+                            return (0, tslib_1.__generator)(this, function (_g) {
+                                switch (_g.label) {
                                     case 0:
                                         if (params.files === null) {
                                             plugin.log.error('No file(s) selected');
                                             return [2 /*return*/];
                                         }
+                                        processFile = function (file) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
+                                            var info, isBinary, data, provider, parsed;
+                                            var _a, _b;
+                                            return (0, tslib_1.__generator)(this, function (_c) {
+                                                switch (_c.label) {
+                                                    case 0:
+                                                        info = (0, file_info_1.getFileInfo)(file.file);
+                                                        isBinary = plugin.dataFormats.binaryExtensions.has(info.ext);
+                                                        return [4 /*yield*/, plugin.builders.data.readFile({ file: file, isBinary: isBinary })];
+                                                    case 1:
+                                                        data = (_c.sent()).data;
+                                                        provider = params.format.name === 'auto'
+                                                            ? plugin.dataFormats.auto(info, (_a = data.cell) === null || _a === void 0 ? void 0 : _a.obj)
+                                                            : plugin.dataFormats.get(params.format.params);
+                                                        if (!provider) {
+                                                            plugin.log.warn("OpenFiles: could not find data provider for '".concat(info.name, ".").concat(info.ext, "'"));
+                                                            return [2 /*return*/];
+                                                        }
+                                                        return [4 /*yield*/, provider.parse(plugin, data)];
+                                                    case 2:
+                                                        parsed = _c.sent();
+                                                        if (!params.visuals) return [3 /*break*/, 4];
+                                                        return [4 /*yield*/, ((_b = provider.visuals) === null || _b === void 0 ? void 0 : _b.call(provider, plugin, parsed))];
+                                                    case 3:
+                                                        _c.sent();
+                                                        _c.label = 4;
+                                                    case 4: return [2 /*return*/];
+                                                }
+                                            });
+                                        }); };
                                         _i = 0, _a = params.files;
-                                        _d.label = 1;
+                                        _g.label = 1;
                                     case 1:
-                                        if (!(_i < _a.length)) return [3 /*break*/, 9];
+                                        if (!(_i < _a.length)) return [3 /*break*/, 14];
                                         file = _a[_i];
-                                        _d.label = 2;
+                                        _g.label = 2;
                                     case 2:
-                                        _d.trys.push([2, 7, , 8]);
-                                        info = (0, file_info_1.getFileInfo)(file.file);
-                                        isBinary = plugin.dataFormats.binaryExtensions.has(info.ext);
-                                        return [4 /*yield*/, plugin.builders.data.readFile({ file: file, isBinary: isBinary })];
-                                    case 3:
-                                        data = (_d.sent()).data;
-                                        provider = params.format.name === 'auto'
-                                            ? plugin.dataFormats.auto(info, (_b = data.cell) === null || _b === void 0 ? void 0 : _b.obj)
-                                            : plugin.dataFormats.get(params.format.params);
-                                        if (!provider) {
-                                            plugin.log.warn("OpenFiles: could not find data provider for '".concat(info.name, ".").concat(info.ext, "'"));
-                                            return [3 /*break*/, 8];
-                                        }
-                                        return [4 /*yield*/, provider.parse(plugin, data)];
+                                        _g.trys.push([2, 12, , 13]);
+                                        if (!(file.file && file.name.toLowerCase().endsWith('.zip'))) return [3 /*break*/, 9];
+                                        _b = zip_1.unzip;
+                                        _c = [taskCtx];
+                                        return [4 /*yield*/, file.file.arrayBuffer()];
+                                    case 3: return [4 /*yield*/, _b.apply(void 0, _c.concat([_g.sent()]))];
                                     case 4:
-                                        parsed = _d.sent();
-                                        if (!params.visuals) return [3 /*break*/, 6];
-                                        return [4 /*yield*/, ((_c = provider.visuals) === null || _c === void 0 ? void 0 : _c.call(provider, plugin, parsed))];
+                                        zippedFiles = _g.sent();
+                                        _d = 0, _e = Object.entries(zippedFiles);
+                                        _g.label = 5;
                                     case 5:
-                                        _d.sent();
-                                        _d.label = 6;
-                                    case 6: return [3 /*break*/, 8];
+                                        if (!(_d < _e.length)) return [3 /*break*/, 8];
+                                        _f = _e[_d], fn = _f[0], filedata = _f[1];
+                                        asset = assets_1.Asset.File(new File([filedata], fn));
+                                        return [4 /*yield*/, processFile(asset)];
+                                    case 6:
+                                        _g.sent();
+                                        _g.label = 7;
                                     case 7:
-                                        e_1 = _d.sent();
+                                        _d++;
+                                        return [3 /*break*/, 5];
+                                    case 8: return [3 /*break*/, 11];
+                                    case 9: return [4 /*yield*/, processFile(file)];
+                                    case 10:
+                                        _g.sent();
+                                        _g.label = 11;
+                                    case 11: return [3 /*break*/, 13];
+                                    case 12:
+                                        e_1 = _g.sent();
                                         console.error(e_1);
                                         plugin.log.error("Error opening file '".concat(file.name, "'"));
-                                        return [3 /*break*/, 8];
-                                    case 8:
+                                        return [3 /*break*/, 13];
+                                    case 13:
                                         _i++;
                                         return [3 /*break*/, 1];
-                                    case 9: return [2 /*return*/];
+                                    case 14: return [2 /*return*/];
                                 }
                             });
                         }); }).runInContext(taskCtx)];

package/lib/commonjs/mol-plugin-state/actions/volume.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2020 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 David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>

package/lib/commonjs/mol-plugin-state/actions/volume.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2018-2020 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 David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
@@ -74,8 +74,8 @@ var DownloadDensity = mol_state_1.StateAction.build({
                         case 'pdb-xray':
                             downloadParams = src.params.provider.server === 'pdbe' ? {
                                 url: assets_1.Asset.Url(src.params.type === '2fofc'
-                                    ? "http://www.ebi.ac.uk/pdbe/coordinates/files/".concat(src.params.provider.id.toLowerCase(), ".ccp4")
-                                    : "http://www.ebi.ac.uk/pdbe/coordinates/files/".concat(src.params.provider.id.toLowerCase(), "_diff.ccp4")),
+                                    ? "https://www.ebi.ac.uk/pdbe/coordinates/files/".concat(src.params.provider.id.toLowerCase(), ".ccp4")
+                                    : "https://www.ebi.ac.uk/pdbe/coordinates/files/".concat(src.params.provider.id.toLowerCase(), "_diff.ccp4")),
                                 isBinary: true,
                                 label: "PDBe X-ray map: ".concat(src.params.provider.id)
                             } : {

package/lib/commonjs/mol-plugin-state/animation/built-in/camera-rock.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright (c) 2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ */
+import { Camera } from '../../../mol-canvas3d/camera';
+import { PluginStateAnimation } from '../model';
+declare type State = {
+    snapshot: Camera.Snapshot;
+};
+export declare const AnimateCameraRock: PluginStateAnimation<{
+    durationInMs: number;
+    speed: number;
+    angle: number;
+}, State | undefined>;
+export {};

package/lib/commonjs/mol-plugin-state/animation/built-in/camera-rock.js

@@ -0,0 +1,62 @@
+"use strict";
+/**
+ * Copyright (c) 2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author Alexander Rose <alexander.rose@weirdbyte.de>
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AnimateCameraRock = void 0;
+var tslib_1 = require("tslib");
+var interpolate_1 = require("../../../mol-math/interpolate");
+var quat_1 = require("../../../mol-math/linear-algebra/3d/quat");
+var vec3_1 = require("../../../mol-math/linear-algebra/3d/vec3");
+var misc_1 = require("../../../mol-math/misc");
+var param_definition_1 = require("../../../mol-util/param-definition");
+var model_1 = require("../model");
+var _dir = (0, vec3_1.Vec3)(), _axis = (0, vec3_1.Vec3)(), _rot = (0, quat_1.Quat)();
+exports.AnimateCameraRock = model_1.PluginStateAnimation.create({
+    name: 'built-in.animate-camera-rock',
+    display: { name: 'Camera Rock', description: 'Rock the 3D scene around the x-axis in view space' },
+    isExportable: true,
+    params: function () { return ({
+        durationInMs: param_definition_1.ParamDefinition.Numeric(4000, { min: 100, max: 20000, step: 100 }),
+        speed: param_definition_1.ParamDefinition.Numeric(1, { min: 1, max: 10, step: 1 }, { description: 'How many times to rock from side to side.' }),
+        angle: param_definition_1.ParamDefinition.Numeric(10, { min: 0, max: 180, step: 1 }, { description: 'How many degrees to rotate in each direction.' }),
+    }); },
+    initialState: function (p, ctx) { return ({ snapshot: ctx.canvas3d.camera.getSnapshot() }); },
+    getDuration: function (p) { return ({ kind: 'fixed', durationMs: p.durationInMs }); },
+    teardown: function (_, state, ctx) {
+        var _a;
+        (_a = ctx.canvas3d) === null || _a === void 0 ? void 0 : _a.requestCameraReset({ snapshot: state.snapshot, durationMs: 0 });
+    },
+    apply: function (animState, t, ctx) {
+        var _a, _b;
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var snapshot, phase, angle, position;
+            return (0, tslib_1.__generator)(this, function (_c) {
+                if (t.current === 0) {
+                    return [2 /*return*/, { kind: 'next', state: animState }];
+                }
+                snapshot = animState.snapshot;
+                if (snapshot.radiusMax < 0.0001) {
+                    return [2 /*return*/, { kind: 'finished' }];
+                }
+                phase = t.animation
+                    ? ((_a = t.animation) === null || _a === void 0 ? void 0 : _a.currentFrame) / (t.animation.frameCount + 1)
+                    : (0, interpolate_1.clamp)(t.current / ctx.params.durationInMs, 0, 1);
+                angle = Math.sin(phase * ctx.params.speed * Math.PI * 2) * (0, misc_1.degToRad)(ctx.params.angle);
+                vec3_1.Vec3.sub(_dir, snapshot.position, snapshot.target);
+                vec3_1.Vec3.normalize(_axis, snapshot.up);
+                quat_1.Quat.setAxisAngle(_rot, _axis, angle);
+                vec3_1.Vec3.transformQuat(_dir, _dir, _rot);
+                position = vec3_1.Vec3.add((0, vec3_1.Vec3)(), snapshot.target, _dir);
+                (_b = ctx.plugin.canvas3d) === null || _b === void 0 ? void 0 : _b.requestCameraReset({ snapshot: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, snapshot), { position: position }), durationMs: 0 });
+                if (phase >= 0.99999) {
+                    return [2 /*return*/, { kind: 'finished' }];
+                }
+                return [2 /*return*/, { kind: 'next', state: animState }];
+            });
+        });
+    }
+});
+//# sourceMappingURL=camera-rock.js.map

package/lib/commonjs/mol-plugin-state/animation/built-in/camera-spin.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/mol-plugin-state/animation/built-in/camera-spin.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>
  */
@@ -15,11 +15,11 @@ var model_1 = require("../model");
 var _dir = (0, vec3_1.Vec3)(), _axis = (0, vec3_1.Vec3)(), _rot = (0, quat_1.Quat)();
 exports.AnimateCameraSpin = model_1.PluginStateAnimation.create({
     name: 'built-in.animate-camera-spin',
-    display: { name: 'Camera Spin' },
+    display: { name: 'Camera Spin', description: 'Spin the 3D scene around the x-axis in view space' },
     isExportable: true,
     params: function () { return ({
         durationInMs: param_definition_1.ParamDefinition.Numeric(4000, { min: 100, max: 20000, step: 100 }),
-        speed: param_definition_1.ParamDefinition.Numeric(1, { min: 1, max: 10, step: 1 }, { description: 'How many times to spin in the specified dutation.' }),
+        speed: param_definition_1.ParamDefinition.Numeric(1, { min: 1, max: 10, step: 1 }, { description: 'How many times to spin in the specified duration.' }),
         direction: param_definition_1.ParamDefinition.Select('cw', [['cw', 'Clockwise'], ['ccw', 'Counter Clockwise']], { cycle: true })
     }); },
     initialState: function (_, ctx) { var _a; return ({ snapshot: (_a = ctx.canvas3d) === null || _a === void 0 ? void 0 : _a.camera.getSnapshot() }); },
@@ -40,11 +40,9 @@ exports.AnimateCameraSpin = model_1.PluginStateAnimation.create({
                 if (snapshot.radiusMax < 0.0001) {
                     return [2 /*return*/, { kind: 'finished' }];
                 }
-                phase = (0, interpolate_1.clamp)(t.current / ctx.params.durationInMs, 0, 1);
-                if (phase >= 0.99999) {
-                    (_a = ctx.plugin.canvas3d) === null || _a === void 0 ? void 0 : _a.requestCameraReset({ snapshot: snapshot, durationMs: 0 });
-                    return [2 /*return*/, { kind: 'finished' }];
-                }
+                phase = t.animation
+                    ? ((_a = t.animation) === null || _a === void 0 ? void 0 : _a.currentFrame) / (t.animation.frameCount + 1)
+                    : (0, interpolate_1.clamp)(t.current / ctx.params.durationInMs, 0, 1);
                 angle = 2 * Math.PI * phase * ctx.params.speed * (ctx.params.direction === 'ccw' ? -1 : 1);
                 vec3_1.Vec3.sub(_dir, snapshot.position, snapshot.target);
                 vec3_1.Vec3.normalize(_axis, snapshot.up);
@@ -52,6 +50,9 @@ exports.AnimateCameraSpin = model_1.PluginStateAnimation.create({
                 vec3_1.Vec3.transformQuat(_dir, _dir, _rot);
                 position = vec3_1.Vec3.add((0, vec3_1.Vec3)(), snapshot.target, _dir);
                 (_b = ctx.plugin.canvas3d) === null || _b === void 0 ? void 0 : _b.requestCameraReset({ snapshot: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, snapshot), { position: position }), durationMs: 0 });
+                if (phase >= 0.99999) {
+                    return [2 /*return*/, { kind: 'finished' }];
+                }
                 return [2 /*return*/, { kind: 'next', state: animState }];
             });
         });

package/lib/commonjs/mol-plugin-state/animation/model.d.ts

@@ -56,6 +56,10 @@ declare namespace PluginStateAnimation {
     interface Time {
         lastApplied: number;
         current: number;
+        animation?: {
+            currentFrame: number;
+            frameCount: number;
+        };
     }
     type ApplyResult<S> = {
         kind: 'finished';

package/lib/commonjs/mol-plugin-state/builder/structure/hierarchy-preset.d.ts

@@ -28,7 +28,7 @@ export declare namespace TrajectoryHierarchyPresetProvider {
                 [x: string]: any;
             }>;
         }>> | undefined>;
-        representationPreset: PD.Base<"auto" | "empty" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined>;
+        representationPreset: PD.Base<"auto" | "empty" | "illustrative" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined>;
     };
 }
 export declare const PresetTrajectoryHierarchy: {
@@ -41,7 +41,7 @@ export declare const PresetTrajectoryHierarchy: {
             autoAttach: any;
             properties: any;
         }>> | undefined;
-        representationPreset: "auto" | "empty" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
+        representationPreset: "auto" | "empty" | "illustrative" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
         model: PD.Normalize<PD.Normalize<{
             modelIndex: any;
         }>> | undefined;
@@ -66,6 +66,7 @@ export declare const PresetTrajectoryHierarchy: {
         }>, "symmetry-assembly"> | undefined;
         representationPresetParams: PD.Normalize<{
             ignoreHydrogens: any;
+            ignoreLight: any;
             quality: any;
             theme: any;
         }> | undefined;
@@ -86,10 +87,11 @@ export declare const PresetTrajectoryHierarchy: {
             autoAttach: any;
             properties: any;
         }>> | undefined;
-        representationPreset: "auto" | "empty" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
+        representationPreset: "auto" | "empty" | "illustrative" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
         useDefaultIfSingleModel: boolean | undefined;
         representationPresetParams: PD.Normalize<{
             ignoreHydrogens: any;
+            ignoreLight: any;
             quality: any;
             theme: any;
         }> | undefined;
@@ -116,7 +118,7 @@ export declare const PresetTrajectoryHierarchy: {
             autoAttach: any;
             properties: any;
         }>> | undefined;
-        representationPreset: "auto" | "empty" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
+        representationPreset: "auto" | "empty" | "illustrative" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
         model: PD.Normalize<PD.Normalize<{
             modelIndex: any;
         }>> | undefined;
@@ -137,7 +139,7 @@ export declare const PresetTrajectoryHierarchy: {
             autoAttach: any;
             properties: any;
         }>> | undefined;
-        representationPreset: "auto" | "empty" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
+        representationPreset: "auto" | "empty" | "illustrative" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
         model: PD.Normalize<PD.Normalize<{
             modelIndex: any;
         }>> | undefined;
@@ -158,7 +160,7 @@ export declare const PresetTrajectoryHierarchy: {
             autoAttach: any;
             properties: any;
         }>> | undefined;
-        representationPreset: "auto" | "empty" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
+        representationPreset: "auto" | "empty" | "illustrative" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
         model: PD.Normalize<PD.Normalize<{
             modelIndex: any;
         }>> | undefined;

package/lib/commonjs/mol-plugin-state/builder/structure/hierarchy.d.ts

@@ -23,7 +23,7 @@ export declare class TrajectoryHierarchyBuilder {
             autoAttach: any;
             properties: any;
         }>> | undefined;
-        representationPreset: "auto" | "empty" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
+        representationPreset: "auto" | "empty" | "illustrative" | "atomic-detail" | "polymer-cartoon" | "polymer-and-ligand" | "protein-and-nucleic" | "coarse-surface" | undefined;
         model: PD.Normalize<PD.Normalize<{
             modelIndex: any;
         }>> | undefined;
@@ -48,6 +48,7 @@ export declare class TrajectoryHierarchyBuilder {
         }>, "symmetry-assembly"> | undefined;
         representationPresetParams: PD.Normalize<{
             ignoreHydrogens: any;
+            ignoreLight: any;
             quality: any;
             theme: any;
         }> | undefined;