reuse existing spin object for subsequent spin(true) calls

This makes sure spinning does not get faster when calling spin(true) multiple times.
biasmv · Mar 14, 2015 · d4ad81f · d4ad81f
1 parent 9afbd5a
commit d4ad81f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/gfx/animation.js b/src/gfx/animation.js
@@ -165,7 +165,13 @@ utils.derive(Spin, Animation, {
       mat3.mul(rotation, axisRot, rotation);
       cam.setRotation(rotation);
     };
-  })()
+  })(),
+  setSpeed : function(speed) {
+    this._speed = speed;
+  },
+  setAxis : function(axis) {
+    this._axis = axis;
+  }
 });
 
 

diff --git a/src/viewer.js b/src/viewer.js
@@ -749,8 +749,13 @@ Viewer.prototype = {
       speed = Math.PI/8;
     }
     axis = axis || [0, 1, 0];
-    this._spin = anim.spin(axis, speed);
-    this._animControl.add(this._spin);
+    if (this._spin === null) {
+      this._spin = anim.spin(axis, speed);
+      this._animControl.add(this._spin);
+    } else {
+      this._spin.setSpeed(speed);
+      this._spin.setAxis(axis);
+    }
     this.requestRedraw();
     return true;
   },