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/dynamicscene-cpp/main.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/dynamicscene-cpp/main.cpp')
-rw-r--r-- | examples/qt3d/dynamicscene-cpp/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp index ea7a86330..95e53be85 100644 --- a/examples/qt3d/dynamicscene-cpp/main.cpp +++ b/examples/qt3d/dynamicscene-cpp/main.cpp @@ -37,37 +37,37 @@ #include <QGuiApplication> #include <Qt3DCore/QAspectEngine> -#include <Qt3DCore/QCamera> +#include <Qt3DRender/QCamera> #include <Qt3DInput/QInputAspect> #include <Qt3DRender/QRenderAspect> #include <Qt3DRender/QFrameGraph> #include <Qt3DRender/QForwardRenderer> -#include <Qt3DRender/QWindow> #include "forwardrenderer.h" #include "examplescene.h" +#include "qt3dwindow.h" +#include "qfirstpersoncameracontroller.h" int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Qt3DRender::QWindow view; - Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect; - view.registerAspect(input); + Qt3DWindow view; ExampleScene *sceneRoot = new ExampleScene(); // Scene Camera - Qt3DCore::QCamera *basicCamera = view.defaultCamera(); - basicCamera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection); + Qt3DRender::QCamera *basicCamera = view.camera(); + basicCamera->setProjectionType(Qt3DRender::QCameraLens::PerspectiveProjection); basicCamera->setAspectRatio(view.width() / view.height()); basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f)); basicCamera->setViewCenter(QVector3D(0.0f, 3.5f, 0.0f)); basicCamera->setPosition(QVector3D(0.0f, 3.5f, 25.0f)); // For camera controls - input->setCamera(basicCamera); + Qt3DInput::QFirstPersonCameraController *camController = new Qt3DInput::QFirstPersonCameraController(sceneRoot); + camController->setCamera(basicCamera); view.setRootEntity(sceneRoot); view.show(); |