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 /tests/auto/render/triangleboundingvolume | |
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 'tests/auto/render/triangleboundingvolume')
-rw-r--r-- | tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp b/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp index 5d6cd7711..d8457c947 100644 --- a/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp +++ b/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp @@ -39,8 +39,8 @@ #include <Qt3DRender/private/triangleboundingvolume_p.h> #include <Qt3DRender/private/qraycastingservice_p.h> #include <Qt3DCore/qray3d.h> -#include <Qt3DCore/qcameralens.h> -#include <Qt3DCore/qcamera.h> +#include <Qt3DRender/qcameralens.h> +#include <Qt3DRender/qcamera.h> #include <Qt3DRender/private/qboundingvolume_p.h> class tst_TriangleBoundingVolume : public QObject @@ -109,8 +109,8 @@ private Q_SLOTS: a, b, c); - Qt3DCore::QCamera camera; - camera.setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection); + Qt3DRender::QCamera camera; + camera.setProjectionType(Qt3DRender::QCameraLens::PerspectiveProjection); camera.setFieldOfView(45.0f); camera.setAspectRatio(800.0/600.0f); camera.setNearPlane(0.1f); |