Added back rotation by arcBall

Needs some fixing. Little springy when you let go.
kellyegan · Oct 14, 2014 · 6bd29e4 · 6bd29e4
1 parent 0d221d1
commit 6bd29e4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/ArcBall.pde b/ArcBall.pde
@@ -56,8 +56,6 @@ public class ArcBall implements PConstants{
     currentRotation = new Quaternion();
     startRotation = new Quaternion();
     deltaRotation = new Quaternion();
-
-
   }
 
   /**
@@ -95,13 +93,15 @@ public class ArcBall implements PConstants{
    * Update currentRotation with data from dragging
    */
   public void update(){
-//  if( dragging ) {
-    currentRotation = quaternion.mult(deltaRotation, startRotation);
-//  } else {
-//    Quaternion.mult(deltaRotation, currentRotation, currentRotation);
-//    deltaRotation = deltaRotation.power(0.8f);
-//  }
+    if( dragging ) {
+      currentRotation = quaternion.mult(deltaRotation, startRotation);
+    } else {
+      currentRotation = quaternion.mult(deltaRotation, currentRotation);
+      deltaRotation = deltaRotation.power(0.9f);
+    }
+
     applyRotation(currentRotation);
+
   }
 
   /**

diff --git a/sketch3d.pde b/sketch3d.pde
@@ -368,7 +368,7 @@ void update() {
     }
     if ( rotatingNow ) {
       //arcBall.dragging( mouseX, mouseY );
-      arcBall.dragging(secondaryHandScreen.x, secondaryHandScreen.y );       
+      arcBall.dragging(secondaryHandScreen.x, secondaryHandScreen.y );     
     }
     if ( moveDrawing && !drawingNow ) {
       moveNow.set( secondaryHand );