summaryrefslogtreecommitdiffstats
path: root/src/extras/defaults
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2018-01-30 14:20:45 +0100
committerPaul Lemire <paul.lemire@kdab.com>2018-02-02 08:02:25 +0000
commit627167bd4a2e1dc12ffee813e82f9b33bff19a22 (patch)
tree33990fc20f43248737d393b3b8b69769d14db823 /src/extras/defaults
parentb4353c98ed242796cdd434b86cf1154a47ded125 (diff)
CameraControllers: use the Camera's upVector
Instead of assuming +Y everywhere Change-Id: Ie0ddc40a4b3cdc60df02cffd11f899e1c32caaa3 Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/extras/defaults')
-rw-r--r--src/extras/defaults/qfirstpersoncameracontroller.cpp2
-rw-r--r--src/extras/defaults/qorbitcameracontroller.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/extras/defaults/qfirstpersoncameracontroller.cpp b/src/extras/defaults/qfirstpersoncameracontroller.cpp
index 0561bbc37..bba6bcdfd 100644
--- a/src/extras/defaults/qfirstpersoncameracontroller.cpp
+++ b/src/extras/defaults/qfirstpersoncameracontroller.cpp
@@ -102,7 +102,7 @@ void QFirstPersonCameraController::moveCamera(const QAbstractCameraController::I
theLookSpeed *= 0.2f;
}
- const QVector3D upVector(0.0f, 1.0f, 0.0f);
+ const QVector3D upVector(theCamera->upVector());
theCamera->pan(state.rxAxisValue * theLookSpeed * dt, upVector);
theCamera->tilt(state.ryAxisValue * theLookSpeed * dt);
diff --git a/src/extras/defaults/qorbitcameracontroller.cpp b/src/extras/defaults/qorbitcameracontroller.cpp
index 61b930569..903d1587b 100644
--- a/src/extras/defaults/qorbitcameracontroller.cpp
+++ b/src/extras/defaults/qorbitcameracontroller.cpp
@@ -150,7 +150,7 @@ void QOrbitCameraController::moveCamera(const QAbstractCameraController::InputSt
if (theCamera == nullptr)
return;
- const QVector3D upVector(0.0f, 1.0f, 0.0f);
+ const QVector3D upVector(theCamera->upVector());
// Mouse input
if (state.leftMouseButtonActive) {