From c19d28e36d89664c3f1fe7c2861f8df8959b470c Mon Sep 17 00:00:00 2001 From: David Sehnal <david.sehnal@gmail.com> Date: Wed, 9 Jan 2019 11:45:33 +0100 Subject: [PATCH] mol-canvas3d: tweaked Trackball.maxDistance --- src/mol-canvas3d/controls/trackball.ts | 2 +- src/mol-plugin/state.ts | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/mol-canvas3d/controls/trackball.ts b/src/mol-canvas3d/controls/trackball.ts index 163ed4c53..40f34459a 100644 --- a/src/mol-canvas3d/controls/trackball.ts +++ b/src/mol-canvas3d/controls/trackball.ts @@ -25,7 +25,7 @@ export const TrackballControlsParams = { dynamicDampingFactor: PD.Numeric(0.2, {}, { isHidden: true }), minDistance: PD.Numeric(0.01, {}, { isHidden: true }), - maxDistance: PD.Numeric(Infinity, {}, { isHidden: true }) + maxDistance: PD.Numeric(1e150, {}, { isHidden: true }) } export type TrackballControlsProps = PD.Values<typeof TrackballControlsParams> diff --git a/src/mol-plugin/state.ts b/src/mol-plugin/state.ts index 54d48baac..616538d62 100644 --- a/src/mol-plugin/state.ts +++ b/src/mol-plugin/state.ts @@ -52,14 +52,6 @@ class PluginState { } async setSnapshot(snapshot: PluginState.Snapshot) { - // TODO - // JSON.stringify of Infinity => null ... is this a good place to fix it? - if (snapshot.canvas3d && snapshot.canvas3d.viewport && snapshot.canvas3d.viewport.trackball) { - if (snapshot.canvas3d.viewport.trackball.maxDistance === null) { - snapshot.canvas3d.viewport.trackball.maxDistance = Infinity; - } - } - await this.plugin.runTask(this.behaviorState.setSnapshot(snapshot.behaviour)); await this.plugin.runTask(this.dataState.setSnapshot(snapshot.data)); PluginCommands.Canvas3D.SetSettings.dispatch(this.plugin, { settings: snapshot.canvas3d.viewport || { } }); -- GitLab