Port all the pure C++ examples to Qt3DRender::QWindow

Change-Id: I43b4a5fcfb4ec00ccaec013cb31d00ca92d3c224
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

9 files changed, 46 insertions, 116 deletions

diff --git a/examples/qt3d/assimp-cpp/main.cpp b/examples/qt3d/assimp-cpp/main.cpp
index bd077568b..59f49a8fb 100644
--- a/examples/qt3d/assimp-cpp/main.cpp
+++ b/examples/qt3d/assimp-cpp/main.cpp
@@ -37,7 +37,6 @@
 #include <QFileDialog>
 #include <QApplication>
 
-#include <window.h>
 #include <Qt3DCore/QCamera>
 #include <Qt3DCore/QEntity>
 #include <Qt3DCore/QAspectEngine>
@@ -46,6 +45,7 @@
 #include <Qt3DRender/QSceneLoader>
 #include <Qt3DRender/QRenderAspect>
 #include <Qt3DRender/QForwardRenderer>
+#include <Qt3DRender/QWindow>
 
 class SceneWalker : public QObject
 {
@@ -104,22 +104,15 @@ int main(int ac, char **av)
 {
     QApplication app(ac, av);
 
-    Window view;
-
-    Qt3DCore::QAspectEngine engine;
+    Qt3DRender::QWindow view;
     Qt3DInput::QInputAspect *inputAspect = new Qt3DInput::QInputAspect();
-    engine.registerAspect(new Qt3DRender::QRenderAspect());
-    engine.registerAspect(inputAspect);
-    QVariantMap data;
-    data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view)));
-    data.insert(QStringLiteral("eventSource"), QVariant::fromValue(&view));
-    engine.setData(data);
+    view.registerAspect(inputAspect);
 
     // Root entity
     Qt3DCore::QEntity *sceneRoot = new Qt3DCore::QEntity();
 
     // Scene Camera
-    Qt3DCore::QCamera *basicCamera = new Qt3DCore::QCamera(sceneRoot);
+    Qt3DCore::QCamera *basicCamera = view.defaultCamera();
     basicCamera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection);
     basicCamera->setAspectRatio(view.width() / view.height());
     basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f));
@@ -136,7 +129,7 @@ int main(int ac, char **av)
     forwardRenderer->setCamera(basicCamera);
     forwardRenderer->setClearColor(Qt::black);
     frameGraphComponent->setActiveFrameGraph(forwardRenderer);
-    sceneRoot->addComponent(frameGraphComponent);
+    view.setFrameGraph(frameGraphComponent);
 
     // Scene loader
     Qt3DCore::QEntity *sceneLoaderEntity = new Qt3DCore::QEntity(sceneRoot);
@@ -161,7 +154,7 @@ int main(int ac, char **av)
 
     sceneLoader->setSource(sourceFileName);
 
-    engine.setRootEntity(sceneRoot);
+    view.setRootEntity(sceneRoot);
     view.show();
 
     return app.exec();
diff --git a/examples/qt3d/basicshapes-cpp/main.cpp b/examples/qt3d/basicshapes-cpp/main.cpp
index cf711172d..f7e50fdd5 100644
--- a/examples/qt3d/basicshapes-cpp/main.cpp
+++ b/examples/qt3d/basicshapes-cpp/main.cpp
@@ -38,7 +38,6 @@
 
 #include <QGuiApplication>
 
-#include <window.h>
 #include <Qt3DCore/qcamera.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qcameralens.h>
@@ -60,6 +59,7 @@
 #include <Qt3DRender/qtexture.h>
 #include <Qt3DRender/qrenderpass.h>
 #include <Qt3DRender/qsceneloader.h>
+#include <Qt3DRender/qwindow.h>
 
 #include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/qaspectengine.h>
@@ -71,7 +71,7 @@
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
-    Window *view = new Window();
+    Qt3DRender::QWindow *view = new Qt3DRender::QWindow();
     QWidget *container = QWidget::createWindowContainer(view);
     QSize screenSize = view->screen()->size();
     container->setMinimumSize(QSize(200, 100));
@@ -86,21 +86,14 @@ int main(int argc, char **argv)
 
     widget->setWindowTitle(QStringLiteral("Basic shapes"));
 
-    Qt3DCore::QAspectEngine engine;
-    engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
-    engine.registerAspect(input);
-    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
     Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
 
     // Camera
-    Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity);
-    cameraEntity->setObjectName(QStringLiteral("cameraEntity"));
+    Qt3DCore::QCamera *cameraEntity = view->defaultCamera();
 
     cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f);
     cameraEntity->setPosition(QVector3D(0, 0, 20.0f));
@@ -117,13 +110,13 @@ int main(int argc, char **argv)
     frameGraph->setActiveFrameGraph(forwardRenderer);
 
     // Setting the FrameGraph
-    rootEntity->addComponent(frameGraph);
+    view->setFrameGraph(frameGraph);
 
     // Scenemodifier
     SceneModifier *modifier = new SceneModifier(rootEntity);
 
     // Set root object of the scene
-    engine.setRootEntity(rootEntity);
+    view->setRootEntity(rootEntity);
 
     // Create control widgets
     QCommandLinkButton *info = new QCommandLinkButton();
@@ -171,10 +164,5 @@ int main(int argc, char **argv)
     widget->show();
     widget->resize(1200, 800);
 
-    // Update the aspect ratio
-    QSize widgetSize =  container->size();
-    float aspectRatio = float(widgetSize.width()) / float(widgetSize.height());
-    cameraEntity->lens()->setPerspectiveProjection(45.0f, aspectRatio, 0.1f, 1000.0f);
-
     return app.exec();
 }
diff --git a/examples/qt3d/bigscene-cpp/main.cpp b/examples/qt3d/bigscene-cpp/main.cpp
index 984df2490..6cd25a5b4 100644
--- a/examples/qt3d/bigscene-cpp/main.cpp
+++ b/examples/qt3d/bigscene-cpp/main.cpp
@@ -37,7 +37,6 @@
 #include "entity.h"
 
 #include <QGuiApplication>
-#include <window.h>
 
 #include <QPropertyAnimation>
 #include <QUrl>
@@ -54,6 +53,7 @@
 #include <Qt3DRender/QCameraSelector>
 #include <Qt3DRender/QPhongMaterial>
 #include <Qt3DRender/QForwardRenderer>
+#include <Qt3DRender/QWindow>
 #include <qmath.h>
 
 using namespace Qt3DCore;
@@ -63,19 +63,13 @@ int main(int ac, char **av)
 {
     QGuiApplication app(ac, av);
 
-    Window view;
-    Qt3DCore::QAspectEngine engine;
-    engine.registerAspect(new Qt3DRender::QRenderAspect());
+    Qt3DRender::QWindow view;
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
-    engine.registerAspect(input);
-    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);
     QEntity *root = new QEntity();
 
     // Camera
-    QCamera *cameraEntity = new QCamera(root);
+    QCamera *cameraEntity = view.defaultCamera();
     cameraEntity->setObjectName(QStringLiteral("cameraEntity"));
     cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f);
     cameraEntity->setPosition(QVector3D(0, 250.0f, 50.0f));
@@ -89,7 +83,7 @@ int main(int ac, char **av)
     forwardRenderer->setCamera(cameraEntity);
     forwardRenderer->setClearColor(Qt::black);
     frameGraph->setActiveFrameGraph(forwardRenderer);
-    root->addComponent(frameGraph);
+    view.setFrameGraph(frameGraph);
 
     const float radius = 100.0f;
     const int max = 1000;
@@ -122,7 +116,7 @@ int main(int ac, char **av)
         e->setParent(root);
     }
 
-    engine.setRootEntity(root);
+    view.setRootEntity(root);
     view.show();
 
     if (app.arguments().contains(("--bench")))
diff --git a/examples/qt3d/cpp_example/main.cpp b/examples/qt3d/cpp_example/main.cpp
index 31bd6fc4f..955e0d593 100644
--- a/examples/qt3d/cpp_example/main.cpp
+++ b/examples/qt3d/cpp_example/main.cpp
@@ -36,7 +36,6 @@
 
 #include <QGuiApplication>
 
-#include <window.h>
 #include <Qt3DCore/qcamera.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qcameralens.h>
@@ -60,20 +59,15 @@
 #include <Qt3DRender/qrenderaspect.h>
 #include <Qt3DRender/qframegraph.h>
 #include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qwindow.h>
 
 int main(int ac, char **av)
 {
     QGuiApplication app(ac, av);
 
-    Window view;
-    Qt3DCore::QAspectEngine engine;
-    engine.registerAspect(new Qt3DRender::QRenderAspect());
+    Qt3DRender::QWindow view;
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
-    engine.registerAspect(input);
-    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
     Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
@@ -105,7 +99,7 @@ int main(int ac, char **av)
     sceneEntity->addComponent(scene);
 
     // Camera
-    Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity);
+    Qt3DCore::QCamera *cameraEntity = view.defaultCamera();
     cameraEntity->setObjectName(QStringLiteral("cameraEntity"));
     cameraEntity->lens()->setPerspectiveProjection(60.0f, 16.0f/9.0f, 0.1f, 1000.0f);
     cameraEntity->setPosition(QVector3D(5, 0, 20.0f));
@@ -128,10 +122,10 @@ int main(int ac, char **av)
     frameGraph->setActiveFrameGraph(techniqueFilter);
 
     // Setting the FrameGraph
-    rootEntity->addComponent(frameGraph);
+    view.setFrameGraph(frameGraph);
 
     // Set root object of the scene
-    engine.setRootEntity(rootEntity);
+    view.setRootEntity(rootEntity);
     // Show window
     view.show();
 
diff --git a/examples/qt3d/custom-mesh-cpp/main.cpp b/examples/qt3d/custom-mesh-cpp/main.cpp
index 804d4b79d..6bd75dff7 100644
--- a/examples/qt3d/custom-mesh-cpp/main.cpp
+++ b/examples/qt3d/custom-mesh-cpp/main.cpp
@@ -36,7 +36,6 @@
 
 #include <QGuiApplication>
 
-#include <window.h>
 #include <Qt3DCore/QEntity>
 #include <Qt3DCore/QCamera>
 #include <Qt3DCore/QCameraLens>
@@ -55,28 +54,23 @@
 #include <Qt3DRender/QGeometry>
 #include <Qt3DRender/QAttribute>
 #include <Qt3DRender/QBuffer>
+#include <Qt3DRender/QWindow>
 
 #include <QPropertyAnimation>
 
 int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
-    Window view;
+    Qt3DRender::QWindow view;
 
-    Qt3DCore::QAspectEngine engine;
-    engine.registerAspect(new Qt3DRender::QRenderAspect());
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
-    engine.registerAspect(input);
-    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
     Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
 
     // Camera
-    Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity);
+    Qt3DCore::QCamera *cameraEntity = view.defaultCamera();
 
     cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f);
     cameraEntity->setPosition(QVector3D(0, 0, 40.0f));
@@ -245,9 +239,9 @@ int main(int argc, char* argv[])
     customMeshEntity->addComponent(material);
 
 
-    rootEntity->addComponent(frameGraph);
+    view.setFrameGraph(frameGraph);
 
-    engine.setRootEntity(rootEntity);
+    view.setRootEntity(rootEntity);
     view.show();
 
     return app.exec();
diff --git a/examples/qt3d/cylinder-cpp/main.cpp b/examples/qt3d/cylinder-cpp/main.cpp
index a7230ffd8..f45492926 100644
--- a/examples/qt3d/cylinder-cpp/main.cpp
+++ b/examples/qt3d/cylinder-cpp/main.cpp
@@ -36,7 +36,6 @@
 
 #include <QGuiApplication>
 
-#include <window.h>
 #include <Qt3DCore/qcamera.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qcameralens.h>
@@ -57,26 +56,21 @@
 #include <Qt3DRender/qrenderaspect.h>
 #include <Qt3DRender/qframegraph.h>
 #include <Qt3DRender/qforwardrenderer.h>
+#include <Qt3DRender/qwindow.h>
 
 int main(int argc, char **argv)
 {
     QGuiApplication app(argc, argv);
 
-    Window view;
-    Qt3DCore::QAspectEngine engine;
-    engine.registerAspect(new Qt3DRender::QRenderAspect());
+    Qt3DRender::QWindow view;
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
-    engine.registerAspect(input);
-    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
     Qt3DCore::QEntity *rootEntity = new Qt3DCore::QEntity();
 
     // Camera
-    Qt3DCore::QCamera *cameraEntity = new Qt3DCore::QCamera(rootEntity);
+    Qt3DCore::QCamera *cameraEntity = view.defaultCamera();
     cameraEntity->setObjectName(QStringLiteral("cameraEntity"));
 
     cameraEntity->lens()->setPerspectiveProjection(45.0f, 16.0f/9.0f, 0.1f, 1000.0f);
@@ -114,10 +108,10 @@ int main(int argc, char **argv)
     cylinderEntity->addComponent(cylinderTransform);
 
     // Setting the FrameGraph
-    rootEntity->addComponent(frameGraph);
+    view.setFrameGraph(frameGraph);
 
     // Set root object of the scene
-    engine.setRootEntity(rootEntity);
+    view.setRootEntity(rootEntity);
     // Show window
     view.show();
 
diff --git a/examples/qt3d/deferred-renderer-cpp/main.cpp b/examples/qt3d/deferred-renderer-cpp/main.cpp
index 3ab122b0a..b3df94b1a 100644
--- a/examples/qt3d/deferred-renderer-cpp/main.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/main.cpp
@@ -35,7 +35,6 @@
 ****************************************************************************/
 
 #include <Qt3DCore/QEntity>
-#include <window.h>
 
 #include <Qt3DInput/QInputAspect>
 
diff --git a/examples/qt3d/dynamicscene-cpp/main.cpp b/examples/qt3d/dynamicscene-cpp/main.cpp
index 29c920cd8..ea7a86330 100644
--- a/examples/qt3d/dynamicscene-cpp/main.cpp
+++ b/examples/qt3d/dynamicscene-cpp/main.cpp
@@ -36,7 +36,6 @@
 
 #include <QGuiApplication>
 
-#include <window.h>
 #include <Qt3DCore/QAspectEngine>
 #include <Qt3DCore/QCamera>
 
@@ -45,6 +44,7 @@
 #include <Qt3DRender/QRenderAspect>
 #include <Qt3DRender/QFrameGraph>
 #include <Qt3DRender/QForwardRenderer>
+#include <Qt3DRender/QWindow>
 
 #include "forwardrenderer.h"
 #include "examplescene.h"
@@ -53,20 +53,14 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Window view;
-    Qt3DCore::QAspectEngine engine;
-    engine.registerAspect(new Qt3DRender::QRenderAspect());
+    Qt3DRender::QWindow view;
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
-    engine.registerAspect(input);
-    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);
 
     ExampleScene *sceneRoot = new ExampleScene();
 
     // Scene Camera
-    Qt3DCore::QCamera *basicCamera = new Qt3DCore::QCamera(sceneRoot);
+    Qt3DCore::QCamera *basicCamera = view.defaultCamera();
     basicCamera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection);
     basicCamera->setAspectRatio(view.width() / view.height());
     basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f));
@@ -75,14 +69,7 @@ int main(int argc, char* argv[])
     // For camera controls
     input->setCamera(basicCamera);
 
-    // Forward Renderer FrameGraph
-    Qt3DRender::QFrameGraph *frameGraph = new Qt3DRender::QFrameGraph(sceneRoot);
-    Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer();
-    forwardRenderer->setCamera(basicCamera);
-    frameGraph->setActiveFrameGraph(forwardRenderer);
-    sceneRoot->addComponent(frameGraph);
-
-    engine.setRootEntity(sceneRoot);
+    view.setRootEntity(sceneRoot);
     view.show();
 
     return app.exec();
diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp
index b9f7a72d7..f8b8afc66 100644
--- a/examples/qt3d/materials-cpp/main.cpp
+++ b/examples/qt3d/materials-cpp/main.cpp
@@ -36,7 +36,6 @@
 
 #include <QGuiApplication>
 
-#include <window.h>
 #include <Qt3DCore/QEntity>
 #include <Qt3DCore/QAspectEngine>
 #include <Qt3DCore/QCamera>
@@ -49,6 +48,7 @@
 #include <Qt3DRender/QForwardRenderer>
 #include <Qt3DRender/QFrameGraph>
 #include <Qt3DRender/QTextureImage>
+#include <Qt3DRender/QWindow>
 
 #include "planeentity.h"
 #include "rotatingtrefoilknot.h"
@@ -59,21 +59,15 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc, argv);
 
-    Window view;
-    Qt3DCore::QAspectEngine engine;
-    engine.registerAspect(new Qt3DRender::QRenderAspect());
+    Qt3DRender::QWindow view;
     Qt3DInput::QInputAspect *input = new Qt3DInput::QInputAspect;
-    engine.registerAspect(input);
-    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);
 
     // Scene Root
     Qt3DCore::QEntity *sceneRoot = new Qt3DCore::QEntity();
 
     // Scene Camera
-    Qt3DCore::QCamera *basicCamera = new Qt3DCore::QCamera(sceneRoot);
+    Qt3DCore::QCamera *basicCamera = view.defaultCamera();
     basicCamera->setProjectionType(Qt3DCore::QCameraLens::PerspectiveProjection);
     basicCamera->setAspectRatio(view.width() / view.height());
     basicCamera->setUpVector(QVector3D(0.0f, 1.0f, 0.0f));
@@ -82,13 +76,6 @@ int main(int argc, char* argv[])
     // For camera controls
     input->setCamera(basicCamera);
 
-    // Forward Renderer FrameGraph
-    Qt3DRender::QFrameGraph *frameGraphComponent = new Qt3DRender::QFrameGraph(sceneRoot);
-    Qt3DRender::QForwardRenderer *forwardRenderer = new Qt3DRender::QForwardRenderer();
-    forwardRenderer->setCamera(basicCamera);
-    frameGraphComponent->setActiveFrameGraph(forwardRenderer);
-    sceneRoot->addComponent(frameGraphComponent);
-
     // Scene floor
     PlaneEntity *planeEntity = new PlaneEntity(sceneRoot);
     planeEntity->mesh()->setHeight(100.0f);
@@ -194,7 +181,7 @@ int main(int argc, char* argv[])
     crossShrub->setPosition(QVector3D(0.0f, 0.0f, 8.0f));
     crossShrub->setScale(0.05f);
 
-    engine.setRootEntity(sceneRoot);
+    view.setRootEntity(sceneRoot);
     view.show();
 
     return app.exec();