diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-01-15 15:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-16 17:17:49 +0000 |
| commit | b0404a42ced2ea5a583e1c6ddc22940ffdc1e48e (patch) | |
| tree | b073c3c680e388bda00228b204743b092b11de6a /examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp | |
| parent | 8656b95ffb67efe7dd1cc3a65b12d277e83e1d22 (diff) | |
Move QCamera/QCameraLens to Qt3DRender
Also get rid of Qt3DRender::QWindow and of the hard codes camera
controller.
Change-Id: I307735d01caf97b7a690b28de8dc99fc9866c35f
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp')
| -rw-r--r-- | examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp index 46ae0c115..10b0d7ec7 100644 --- a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp +++ b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp @@ -36,7 +36,7 @@ #include "qfirstpersoncameracontroller_p.h" #include "qfirstpersoncameracontroller.h" -#include <Qt3DCore/QCamera> +#include <Qt3DRender/QCamera> #include <Qt3DInput/QAxis> #include <Qt3DInput/QAxisInput> #include <Qt3DInput/QAction> @@ -226,7 +226,7 @@ QFirstPersonCameraController::~QFirstPersonCameraController() { } -Qt3DCore::QCamera *QFirstPersonCameraController::camera() const +Qt3DRender::QCamera *QFirstPersonCameraController::camera() const { Q_D(const QFirstPersonCameraController); return d->m_camera; @@ -244,7 +244,7 @@ float QFirstPersonCameraController::lookSpeed() const return d->m_lookSpeed; } -void QFirstPersonCameraController::setCamera(Qt3DCore::QCamera *camera) +void QFirstPersonCameraController::setCamera(Qt3DRender::QCamera *camera) { Q_D(QFirstPersonCameraController); if (d->m_camera != camera) { |