Slower the pan speed, increase wheel speed, make pan and pinch exclus…

…ive in DeflectPlugin
BlueBrain · Nov 24, 2016 · 3165088 · 3165088
1 parent 793c3d2
commit 3165088
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 11 deletions.
diff --git a/brayns/common/camera/AbstractManipulator.cpp b/brayns/common/camera/AbstractManipulator.cpp
@@ -30,7 +30,7 @@ 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_MOTION_SPEED = 0.001f;
 const float DEFAULT_ROTATION_SPEED = 0.005f;
 
 }
@@ -50,6 +50,11 @@ float AbstractManipulator::getRotationSpeed() const
     return _rotationSpeed;
 }
 
+float AbstractManipulator::getWheelSpeed() const
+{
+    return getMotionSpeed() * 100.f;
+}
+
 float AbstractManipulator::getMotionSpeed() const
 {
     const auto& position = _camera.getPosition();

diff --git a/brayns/common/camera/AbstractManipulator.h b/brayns/common/camera/AbstractManipulator.h
@@ -53,6 +53,7 @@ class AbstractManipulator
     void updateMotionSpeed( float speed );
 
     float getRotationSpeed() const;
+    float getWheelSpeed() const;
 
 protected:
     /*! target camera */

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 * getMotionSpeed(), false );
+    translate( forwardDirection * delta * getWheelSpeed(), false );
 }
 
 void FlyingModeManipulator::_strafeLeft()
@@ -95,12 +95,12 @@ void FlyingModeManipulator::_strafeRight()
 
 void FlyingModeManipulator::_flyForward()
 {
-    translate( forwardDirection * getMotionSpeed(), true );
+    translate( forwardDirection * getWheelSpeed(), true );
 }
 
 void FlyingModeManipulator::_flyBackwards()
 {
-    translate( forwardDirection * -getMotionSpeed(), true );
+    translate( forwardDirection * -getWheelSpeed(), true );
 }
 
 }
diff --git a/brayns/common/camera/InspectCenterManipulator.cpp b/brayns/common/camera/InspectCenterManipulator.cpp
@@ -94,7 +94,7 @@ void InspectCenterManipulator::dragMiddle( const Vector2i& to,
 void InspectCenterManipulator::wheel( const Vector2i& /*position*/,
                                       float delta )
 {
-    delta *= getMotionSpeed();
+    delta *= getWheelSpeed();
     if( delta < ( _camera.getTarget() - _camera.getPosition( )).length( ))
         translate( forwardDirection * delta, false );
 }

diff --git a/plugins/extensions/plugins/DeflectPlugin.cpp b/plugins/extensions/plugins/DeflectPlugin.cpp
@@ -158,32 +158,36 @@ bool DeflectPlugin::_handleDeflectEvents()
         {
         case deflect::Event::EVT_PRESS:
             _previousPos = _getWindowPos( event );
-            _panOrPinch = false;
+            _pan = _pinch = false;
             break;
         case deflect::Event::EVT_MOVE:
         case deflect::Event::EVT_RELEASE:
         {
             const auto pos = _getWindowPos( event );
-            if( !_panOrPinch )
+            if( !_pan && !_pinch )
                 _brayns.getCameraManipulator().dragLeft( pos, _previousPos );
             _previousPos = pos;
-            _panOrPinch = false;
+            _pan = _pinch = false;
             break;
         }
         case deflect::Event::EVT_PAN:
         {
+            if( _pinch )
+                break;
             const auto pos = _getWindowPos( event );
             _brayns.getCameraManipulator().dragMiddle( pos, _previousPos );
             _previousPos = pos;
-            _panOrPinch = true;
+            _pan = true;
             break;
         }
         case deflect::Event::EVT_PINCH:
         {
+            if( _pan )
+                break;
             const auto pos = _getWindowPos( event );
             const auto delta = _getZoomDelta( event );
             _brayns.getCameraManipulator().wheel( pos, delta * wheelFactor );
-            _panOrPinch = true;
+            _pinch = true;
             break;
         }
         case deflect::Event::EVT_KEY_PRESS:

diff --git a/plugins/extensions/plugins/DeflectPlugin.h b/plugins/extensions/plugins/DeflectPlugin.h
@@ -93,7 +93,8 @@ class DeflectPlugin : public ExtensionPlugin
     double _getZoomDelta( const deflect::Event& pinchEvent ) const;
 
     Vector2d _previousPos;
-    bool _panOrPinch = false;
+    bool _pan = false;
+    bool _pinch = false;
     std::unique_ptr< deflect::Stream > _stream;
     ::lexis::render::Stream _params;
     std::string _previousHost;