[3d] Make right and middle mouse drag while in fly mode behavior

consistent with other parts of qgis Now - right click+drag = camera dolly, to match the same behavior as when in terrain navigation mode - middle click+drag = pan camera left/right/up/down, which matches the middle click+drag behavior for 2d maps
qgis · Jan 17, 2021 · 4317c4c · 4317c4c
1 parent 47c1072
commit 4317c4c
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/3d/qgscameracontroller.cpp b/src/3d/qgscameracontroller.cpp
@@ -676,18 +676,20 @@ void QgsCameraController::onPositionChangedFlyNavigation( Qt3DInput::QMouseEvent
     return;
   }
 
-  if ( hasRightButton )
+  if ( hasMiddleButton )
   {
+    // middle button drag = pan camera in place (strafe)
     QVector3D cameraUp = mCamera->upVector().normalized();
     QVector3D cameraFront = ( QVector3D( mCameraPose.centerPoint().x(), mCameraPose.centerPoint().y(), mCameraPose.centerPoint().z() ) - mCamera->position() ).normalized();
     QVector3D cameraLeft = QVector3D::crossProduct( cameraUp, cameraFront );
     QVector3D cameraPosDiff = -dx * cameraLeft - dy * cameraUp;
     moveCameraPositionBy( mCameraMovementSpeed * cameraPosDiff / 10.0 );
   }
-  else if ( hasMiddleButton )
+  else if ( hasRightButton )
   {
+    // right button drag = camera dolly
     QVector3D cameraFront = ( QVector3D( mCameraPose.centerPoint().x(), mCameraPose.centerPoint().y(), mCameraPose.centerPoint().z() ) - mCamera->position() ).normalized();
-    QVector3D cameraPosDiff = -dy * cameraFront;
+    QVector3D cameraPosDiff = dy * cameraFront;
     moveCameraPositionBy( mCameraMovementSpeed * cameraPosDiff / 5.0 );
   }
   else