fix drag zoom outside viewport

qgis · Jan 31, 2023 · 90bfb51 · 90bfb51
1 parent 8162042
commit 90bfb51
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/3d/qgscameracontroller.cpp b/src/3d/qgscameracontroller.cpp
@@ -19,6 +19,8 @@
 #include "qgsvector3d.h"
 #include "qgssettings.h"
 #include "qgs3dutils.h"
+#include "qgswindow3dengine.h"
+#include "qgs3dmapscene.h"
 
 #include "qgis.h"
 
@@ -68,6 +70,10 @@ QgsCameraController::QgsCameraController( Qt3DCore::QNode *parent )
   mFpsNavTimer->setInterval( 10 );
   connect( mFpsNavTimer, &QTimer::timeout, this, &QgsCameraController::applyFlyModeKeyMovements );
   mFpsNavTimer->start();
+
+  Qgs3DMapScene *scene = qobject_cast< Qgs3DMapScene * >( parent );
+  if ( scene )
+    mWindowEngine = qobject_cast<QgsWindow3DEngine *>( scene->engine() );
 }
 
 void QgsCameraController::setCameraNavigationMode( QgsCameraController::NavigationMode navigationMode )
@@ -485,17 +491,19 @@ void QgsCameraController::onPositionChangedTerrainNavigation( Qt3DInput::QMouseE
 
     float dist = ( mCameraBeforeDrag->position() - mDragPoint ).length();
 
+    const int yOffset = mWindowEngine->window()->mapToGlobal( QPoint( 0, 0 ) ).y();
+    const int screenHeight = mWindowEngine->window()->screen()->size().height();
     // Applies smoothing
     if ( mMousePos.y() > mDragButtonClickPos.y() ) // zoom in
     {
-      double f = ( double )( mMousePos.y() - mDragButtonClickPos.y() ) / ( double )( mViewport.height() - mDragButtonClickPos.y() );
+      double f = ( double )( mMousePos.y() - mDragButtonClickPos.y() ) / ( double )( screenHeight - mDragButtonClickPos.y() - yOffset );
       f = std::max( 0.0, std::min( 1.0, f ) );
       f = 1 - ( std::expm1( -2 * f ) ) / ( std::expm1( -2 ) );
       dist = dist * f;
     }
     else // zoom out
     {
-      double f = 1 - ( double )( mMousePos.y() ) / ( double )( mDragButtonClickPos.y() );
+      double f = 1 - ( double )( mMousePos.y() + yOffset ) / ( double )( mDragButtonClickPos.y() + yOffset );
       f = std::max( 0.0, std::min( 1.0, f ) );
       f = ( std::expm1( 2 * f ) ) / ( std::expm1( 2 ) );
       dist = dist + 2 * dist * f;

diff --git a/src/3d/qgscameracontroller.h b/src/3d/qgscameracontroller.h
@@ -49,6 +49,7 @@ class QDomElement;
 class QgsCameraPose;
 class QgsTerrainEntity;
 class QgsVector3D;
+class QgsWindow3DEngine;
 
 #define SIP_NO_FILE
 
@@ -287,8 +288,10 @@ class _3D_EXPORT QgsCameraController : public Qt3DCore::QEntity
   private:
     //! Camera that is being controlled
     Qt3DRender::QCamera *mCamera = nullptr;
+
     //! used for computation of translation when dragging mouse
     QRect mViewport;
+    QgsWindow3DEngine *mWindowEngine = nullptr;
     //! height of terrain when mouse button was last pressed - for camera control
     float mLastPressedHeight = 0;