Merge remote-tracking branch 'origin/release-6.1'

dartsim · Jan 31, 2017 · bdbdd9d · bdbdd9d
2 parents cfac681 + c6581c8
commit bdbdd9d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/dart/gui/Win3D.cpp b/dart/gui/Win3D.cpp
@@ -123,11 +123,11 @@ void Win3D::click(int _button, int _state, int _x, int _y) {
     } else if (_button == 3 && _state == GLUT_DOWN) {  // mouse wheel up
       // each scroll generates a down and an immediate up,
       // so ignore ups
-      mZoom += 0.1;
+      mZoom += mZoom * 0.1;
     } else if (_button == 4 && _state == GLUT_DOWN) {  // mouse wheel down?
       // each scroll generates a down and an immediate up,
       // so ignore ups
-      mZoom -= 0.1;
+      mZoom -= mZoom * 0.1;
     }
     mMouseX = _x;
     mMouseY = _y;
@@ -152,7 +152,7 @@ void Win3D::drag(int _x, int _y) {
   }
   if (mTranslate) {
     Eigen::Matrix3d rot = mTrackBall.getRotationMatrix();
-    mTrans += rot.transpose()*Eigen::Vector3d(deltaX, -deltaY, 0.0);
+    mTrans += (1 / mZoom) * rot.transpose()*Eigen::Vector3d(deltaX, -deltaY, 0.0);
   }
   if (mZooming) {
     mZoom += deltaY*0.01;