[3d] Allow Shift+up/down/left/right keys to rotate/tilt camera

wonder-sk · wonder-sk · commit 9f3b3e50d587 · 2017-12-30T01:25:28.000+01:00
Just like user can drag map with mouse or move it with up/down/left/right keys,
for consistency with Shift+drag we have now also support for arrow keys.
diff --git a/src/3d/qgscameracontroller.cpp b/src/3d/qgscameracontroller.cpp
@@ -240,7 +240,7 @@ void QgsCameraController::frameTriggered( float dt )
   float tx = mTxAxis->value() * dt * mCameraData.dist * 1.5;
   float ty = -mTyAxis->value() * dt * mCameraData.dist * 1.5;
 
-  if ( tx || ty )
+  if ( !mShiftAction->isActive() && ( tx || ty ) )
   {
     // moving with keyboard - take into account yaw of camera
     float t = sqrt( tx * tx + ty * ty );
@@ -253,9 +253,16 @@ void QgsCameraController::frameTriggered( float dt )
 
   if ( ( mLeftMouseButtonAction->isActive() && mShiftAction->isActive() ) || mMiddleMouseButtonAction->isActive() )
   {
+    // rotate/tilt using mouse
     mCameraData.pitch += dy;
     mCameraData.yaw -= dx / 2;
   }
+  else if ( mShiftAction->isActive() && ( mTxAxis->value() || mTyAxis->value() ) )
+  {
+    // rotate/tilt using keyboard
+    mCameraData.pitch -= mTyAxis->value();   // down key = moving camera toward terrain
+    mCameraData.yaw -= mTxAxis->value();     // right key = moving camera clockwise
+  }
   else if ( mLeftMouseButtonAction->isActive() && !mShiftAction->isActive() )
   {
     // translation works as if one grabbed a point on the plane and dragged it

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ void QgsCameraController::frameTriggered( float dt )`
`240`	`240`	`float tx = mTxAxis->value() * dt * mCameraData.dist * 1.5;`
`241`	`241`	`float ty = -mTyAxis->value() * dt * mCameraData.dist * 1.5;`
`242`	`242`
`243`		`- if ( tx \|\| ty )`
	`243`	`+ if ( !mShiftAction->isActive() && ( tx \|\| ty ) )`
`244`	`244`	`{`
`245`	`245`	`// moving with keyboard - take into account yaw of camera`
`246`	`246`	`float t = sqrt( tx * tx + ty * ty );`
`@@ -253,9 +253,16 @@ void QgsCameraController::frameTriggered( float dt )`
`253`	`253`
`254`	`254`	`if ( ( mLeftMouseButtonAction->isActive() && mShiftAction->isActive() ) \|\| mMiddleMouseButtonAction->isActive() )`
`255`	`255`	`{`
	`256`	`+ // rotate/tilt using mouse`
`256`	`257`	`mCameraData.pitch += dy;`
`257`	`258`	`mCameraData.yaw -= dx / 2;`
`258`	`259`	`}`
	`260`	`+ else if ( mShiftAction->isActive() && ( mTxAxis->value() \|\| mTyAxis->value() ) )`
	`261`	`+ {`
	`262`	`+ // rotate/tilt using keyboard`
	`263`	`+ mCameraData.pitch -= mTyAxis->value(); // down key = moving camera toward terrain`
	`264`	`+ mCameraData.yaw -= mTxAxis->value(); // right key = moving camera clockwise`
	`265`	`+ }`
`259`	`266`	`else if ( mLeftMouseButtonAction->isActive() && !mShiftAction->isActive() )`
`260`	`267`	`{`
`261`	`268`	`// translation works as if one grabbed a point on the plane and dragged it`