diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-08-07 16:52:48 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-08-11 17:28:35 +0000 |
commit | ed145776205d5e1adcf95802468d2a1fe8c8bc13 (patch) | |
tree | b1d60704b12c1b2fc5f9eab56f01b6fcaf4d3d09 /examples/qt3d/simple-cpp/main.cpp | |
parent | eaf0ab3922c743e19515e97359b90438d7dceb00 (diff) |
simple-cpp: uses the Qt3D::QWindow
Note: we don't have the blue clear color because it defaults to white with the
default framegraph
Change-Id: I993675105530d8f01b1b80b65bc37ec35e98426b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/simple-cpp/main.cpp')
-rw-r--r-- | examples/qt3d/simple-cpp/main.cpp | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/examples/qt3d/simple-cpp/main.cpp b/examples/qt3d/simple-cpp/main.cpp index 873df84dd..431b0ac8a 100644 --- a/examples/qt3d/simple-cpp/main.cpp +++ b/examples/qt3d/simple-cpp/main.cpp @@ -36,7 +36,6 @@ #include <QGuiApplication> -#include <window.h> #include <Qt3DCore/QEntity> #include <Qt3DCore/QCamera> #include <Qt3DCore/QCameraLens> @@ -57,30 +56,22 @@ #include <Qt3DRenderer/QCylinderMesh> #include <Qt3DRenderer/QSphereMesh> #include <Qt3DRenderer/QTorusMesh> +#include <Qt3DRenderer/QWindow> #include <QPropertyAnimation> int main(int argc, char* argv[]) { QGuiApplication app(argc, argv); - Window view; - - Qt3D::QAspectEngine engine; - engine.registerAspect(new Qt3D::QRenderAspect()); + Qt3D::QWindow view; Qt3D::QInputAspect *input = new Qt3D::QInputAspect; - engine.registerAspect(input); - engine.initialize(); - QVariantMap data; - data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); - data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view)); - engine.setData(data); + view.registerAspect(input); // Root entity Qt3D::QEntity *rootEntity = new Qt3D::QEntity(); - // Camera - Qt3D::QCamera *cameraEntity = new Qt3D::QCamera(rootEntity); + Qt3D::QCamera *cameraEntity = view.defaultCamera(); cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f); cameraEntity->setPosition(QVector3D(0, 0, -40.0f)); @@ -88,14 +79,6 @@ int main(int argc, char* argv[]) cameraEntity->setViewCenter(QVector3D(0, 0, 0)); input->setCamera(cameraEntity); - - // FrameGraph - Qt3D::QFrameGraph *frameGraph = new Qt3D::QFrameGraph(); - Qt3D::QForwardRenderer *forwardRenderer = new Qt3D::QForwardRenderer(); - forwardRenderer->setClearColor(QColor::fromRgbF(0.0, 0.5, 1.0, 1.0)); - forwardRenderer->setCamera(cameraEntity); - frameGraph->setActiveFrameGraph(forwardRenderer); - // Material Qt3D::QMaterial *material = new Qt3D::QPhongMaterial(rootEntity); @@ -123,7 +106,6 @@ int main(int argc, char* argv[]) torusEntity->addComponent(torusTransform); torusEntity->addComponent(material); - // Sphere Qt3D::QEntity *sphereEntity = new Qt3D::QEntity(rootEntity); Qt3D::QSphereMesh *sphereMesh = new Qt3D::QSphereMesh; @@ -153,9 +135,7 @@ int main(int argc, char* argv[]) sphereEntity->addComponent(sphereTransform); sphereEntity->addComponent(material); - rootEntity->addComponent(frameGraph); - - engine.setRootEntity(rootEntity); + view.setRootEntity(rootEntity); view.show(); return app.exec(); |