From 208b85977f885867b90dfd928a2f08c94248412b Mon Sep 17 00:00:00 2001
From: David Sehnal <david.sehnal@gmail.com>
Date: Mon, 18 Feb 2019 13:25:34 +0100
Subject: [PATCH] mol-canvas: move spin() to update()
---
src/mol-canvas3d/controls/trackball.ts | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/mol-canvas3d/controls/trackball.ts b/src/mol-canvas3d/controls/trackball.ts
index 7955ab4c5..63234d324 100644
--- a/src/mol-canvas3d/controls/trackball.ts
+++ b/src/mol-canvas3d/controls/trackball.ts
@@ -209,6 +209,8 @@ namespace TrackballControls {
/** Update the object's position, direction and up vectors */
function update() {
+ if (p.spin) spin();
+
Vec3.sub(_eye, object.position, target)
rotateCamera()
@@ -300,7 +302,6 @@ namespace TrackballControls {
function spin() {
_spinSpeed[0] = (p.spinSpeed || 0) / 1000;
if (!_isInteracting) Vec2.add(_moveCurr, _movePrev, _spinSpeed);
- if (p.spin) requestAnimationFrame(spin);
}
// force an update at start
@@ -313,9 +314,7 @@ namespace TrackballControls {
get props() { return p as Readonly<TrackballControlsProps> },
setProps: (props: Partial<TrackballControlsProps>) => {
- const wasSpinning = p.spin
Object.assign(p, props)
- if (p.spin && !wasSpinning) requestAnimationFrame(spin)
},
update,
--
GitLab