Use adaptive motion speed for zooming depending on camera distance (#65)

BlueBrain · Nov 23, 2016 · 801b26a · 801b26a
1 parent aef0233
commit 801b26a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/apps/ui/BaseWindow.cpp b/apps/ui/BaseWindow.cpp
@@ -438,14 +438,12 @@ void BaseWindow::_resetCamera()
 
 void BaseWindow::_increaseMotionSpeed()
 {
-    const auto speed = _brayns->getCameraManipulator().getMotionSpeed();
-    _brayns->getCameraManipulator().setMotionSpeed( speed * DEFAULT_MOTION_ACCELERATION );
+    _brayns->getCameraManipulator().updateMotionSpeed( DEFAULT_MOTION_ACCELERATION );
 }
 
 void BaseWindow::_decreaseMotionSpeed()
 {
-    const auto speed = _brayns->getCameraManipulator().getMotionSpeed();
-    _brayns->getCameraManipulator().setMotionSpeed( speed / DEFAULT_MOTION_ACCELERATION );
+    _brayns->getCameraManipulator().updateMotionSpeed( 1.f / DEFAULT_MOTION_ACCELERATION );
 }
 
 void BaseWindow::_displayCameraInformation()

diff --git a/brayns/common/camera/AbstractManipulator.cpp b/brayns/common/camera/AbstractManipulator.cpp
@@ -30,21 +30,16 @@ namespace
 {
 const Vector3f UNIT_Y = { 0.f, 1.f, 0.f };
 const Vector3f UNIT_Z = { 0.f, 0.f, 1.f };
+const float DEFAULT_MOTION_SPEED = 0.01f;
 const float DEFAULT_ROTATION_SPEED = 0.005f;
 
-float _getDefaultMotionSpeed( const Camera& camera )
-{
-    const auto& position = camera.getPosition();
-    const auto& target = camera.getTarget();
-    return Vector3f{ target - position }.length() * 0.001f;
-}
 }
 
 AbstractManipulator::AbstractManipulator( Camera& camera,
                                           KeyboardHandler& keyboardHandler )
     : _camera( camera )
     , _keyboardHandler( keyboardHandler )
-    , _motionSpeed{ _getDefaultMotionSpeed( camera ) }
+    , _motionSpeed{ DEFAULT_MOTION_SPEED }
     , _rotationSpeed{ DEFAULT_ROTATION_SPEED }
 {}
 
@@ -57,12 +52,14 @@ float AbstractManipulator::getRotationSpeed() const
 
 float AbstractManipulator::getMotionSpeed() const
 {
-    return _motionSpeed;
+    const auto& position = _camera.getPosition();
+    const auto& target = _camera.getTarget();
+    return Vector3f{ target - position }.length() * _motionSpeed;
 }
 
-void AbstractManipulator::setMotionSpeed( const float speed )
+void AbstractManipulator::updateMotionSpeed( const float speed )
 {
-    _motionSpeed = speed;
+    _motionSpeed *= speed;
 }
 
 void AbstractManipulator::translate( const Vector3f& vector,

diff --git a/brayns/common/camera/AbstractManipulator.h b/brayns/common/camera/AbstractManipulator.h
@@ -50,7 +50,7 @@ class AbstractManipulator
     virtual void wheel( const Vector2i& position, float delta ) = 0;
 
     float getMotionSpeed() const;
-    void setMotionSpeed( float speed );
+    void updateMotionSpeed( float speed );
 
     float getRotationSpeed() const;
 

diff --git a/brayns/common/camera/FlyingModeManipulator.cpp b/brayns/common/camera/FlyingModeManipulator.cpp
@@ -80,7 +80,7 @@ void FlyingModeManipulator::dragMiddle( const Vector2i& to,
 void FlyingModeManipulator::wheel( const Vector2i& /*position*/,
                                    const float delta )
 {
-    translate( forwardDirection * delta, false );
+    translate( forwardDirection * delta * getMotionSpeed(), false );
 }
 
 void FlyingModeManipulator::_strafeLeft()

diff --git a/brayns/common/camera/InspectCenterManipulator.cpp b/brayns/common/camera/InspectCenterManipulator.cpp
@@ -92,8 +92,9 @@ void InspectCenterManipulator::dragMiddle( const Vector2i& to,
 }
 
 void InspectCenterManipulator::wheel( const Vector2i& /*position*/,
-                                      const float delta )
+                                      float delta )
 {
+    delta *= getMotionSpeed();
     if( delta < ( _camera.getTarget() - _camera.getPosition( )).length( ))
         translate( forwardDirection * delta, false );
 }