Merge branch 'Tweak-Arcball-Integration'

kellyegan · Oct 27, 2014 · 938d2df · 938d2df
2 parents 6bd29e4 + cfb616a
commit 938d2df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/ArcBall.pde b/ArcBall.pde
@@ -86,22 +86,24 @@ public class ArcBall implements PConstants{
   public void dragEnd() {
     dragging = false;
   }
-
-
 
   /**
    * Update currentRotation with data from dragging
    */
   public void update(){
     if( dragging ) {
       currentRotation = quaternion.mult(deltaRotation, startRotation);
+
+      if(frameCount % 3 == 0) {
+        startRotation.set(currentRotation);
+        deltaRotation.setToIdentity();
+        startPoint.set(endPoint);
+      }
     } else {
       currentRotation = quaternion.mult(deltaRotation, currentRotation);
-      deltaRotation = deltaRotation.power(0.9f);
+      deltaRotation = deltaRotation.power(0.999f);      
     }
-
-    applyRotation(currentRotation);
-
+    applyRotation(currentRotation); 
   }
 
   /**

diff --git a/sketch3d.pde b/sketch3d.pde
@@ -406,7 +406,7 @@ void mousePressed() {
 }
 
 void mouseDragged() {
-  arcBall.dragging(mouseX, mouseY);
+  //arcBall.dragging(mouseX, mouseY);
 }
 
 void mouseReleased() {