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>

5 files changed, 23 insertions, 19 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) {
diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller.h b/examples/qt3d/examples-common/qfirstpersoncameracontroller.h
index b1755d7d4..6f8d21ebf 100644
--- a/examples/qt3d/examples-common/qfirstpersoncameracontroller.h
+++ b/examples/qt3d/examples-common/qfirstpersoncameracontroller.h
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 class QCamera;
 }
 
@@ -52,7 +52,7 @@ class QFirstPersonCameraControllerPrivate;
 class QFirstPersonCameraController : public Qt3DCore::QEntity
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3DCore::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged)
+    Q_PROPERTY(Qt3DRender::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged)
     Q_PROPERTY(float linearSpeed READ linearSpeed WRITE setLinearSpeed NOTIFY linearSpeedChanged)
     Q_PROPERTY(float lookSpeed READ lookSpeed WRITE setLookSpeed NOTIFY lookSpeedChanged)
 
@@ -60,11 +60,11 @@ public:
     explicit QFirstPersonCameraController(Qt3DCore::QNode *parent = Q_NULLPTR);
     ~QFirstPersonCameraController();
 
-    Qt3DCore::QCamera *camera() const;
+    Qt3DRender::QCamera *camera() const;
     float linearSpeed() const;
     float lookSpeed() const;
 
-    void setCamera(Qt3DCore::QCamera *camera);
+    void setCamera(Qt3DRender::QCamera *camera);
     void setLinearSpeed(float linearSpeed);
     void setLookSpeed(float lookSpeed);
 
diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h b/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h
index 985b9f536..d5ac58d56 100644
--- a/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h
+++ b/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h
@@ -43,7 +43,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 class QCamera;
 }
 
@@ -69,7 +69,7 @@ public:
 
     void init();
 
-    Qt3DCore::QCamera *m_camera;
+    Qt3DRender::QCamera *m_camera;
     QAction *m_leftMouseButtonAction;
     QAction *m_fineMotionAction;
     QAxis *m_rxAxis;
diff --git a/examples/qt3d/examples-common/qt3dwindow.cpp b/examples/qt3d/examples-common/qt3dwindow.cpp
index 9575424a8..e46b052a7 100644
--- a/examples/qt3d/examples-common/qt3dwindow.cpp
+++ b/examples/qt3d/examples-common/qt3dwindow.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DLogic/qlogicaspect.h>
 
 #include <Qt3DCore/qaspectengine.h>
-#include <Qt3DCore/qcamera.h>
+#include <Qt3DRender/qcamera.h>
 #include <Qt3DCore/qentity.h>
 
 #include <QtGui/qopenglcontext.h>
@@ -57,7 +57,7 @@ Qt3DWindow::Qt3DWindow(QScreen *screen)
     , m_inputAspect(new Qt3DInput::QInputAspect)
     , m_logicAspect(new Qt3DLogic::QLogicAspect)
     , m_frameGraph(nullptr)
-    , m_defaultCamera(new Qt3DCore::QCamera)
+    , m_defaultCamera(new Qt3DRender::QCamera)
     , m_root(new Qt3DCore::QEntity)
     , m_userRoot(nullptr)
     , m_initialized(false)
@@ -89,7 +89,7 @@ Qt3DWindow::Qt3DWindow(QWindow *parent)
     , m_inputAspect(new Qt3DInput::QInputAspect)
     , m_logicAspect(new Qt3DLogic::QLogicAspect)
     , m_frameGraph(nullptr)
-    , m_defaultCamera(new Qt3DCore::QCamera)
+    , m_defaultCamera(new Qt3DRender::QCamera)
     , m_root(new Qt3DCore::QEntity)
     , m_userRoot(nullptr)
     , m_initialized(false)
@@ -135,7 +135,12 @@ void Qt3DWindow::setRootEntity(Qt3DCore::QEntity *root)
     m_userRoot = root;
 }
 
-Qt3DCore::QCamera *Qt3DWindow::camera() const
+void Qt3DWindow::setFrameGraph(Qt3DRender::QFrameGraph *frameGraph)
+{
+    m_frameGraph = frameGraph;
+}
+
+Qt3DRender::QCamera *Qt3DWindow::camera() const
 {
     return m_defaultCamera;
 }
@@ -162,9 +167,6 @@ void Qt3DWindow::showEvent(QShowEvent *e)
         m_root->addComponent(m_frameGraph);
         m_aspectEngine->setRootEntity(m_root);
 
-        // TODO: Get rid of this too
-        m_inputAspect->setCamera(m_defaultCamera);
-
         m_initialized = true;
     }
 
diff --git a/examples/qt3d/examples-common/qt3dwindow.h b/examples/qt3d/examples-common/qt3dwindow.h
index b42e3d81c..df527acd6 100644
--- a/examples/qt3d/examples-common/qt3dwindow.h
+++ b/examples/qt3d/examples-common/qt3dwindow.h
@@ -43,11 +43,12 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DCore {
 class QAspectEngine;
-class QCamera;
+class QAbstractAspect;
 class QEntity;
 }
 
 namespace Qt3DRender {
+class QCamera;
 class QFrameGraph;
 class QRenderAspect;
 }
@@ -72,8 +73,9 @@ public:
     void registerAspect(const QString &name);
 
     void setRootEntity(Qt3DCore::QEntity *root);
+    void setFrameGraph(Qt3DRender::QFrameGraph *frameGraph);
 
-    Qt3DCore::QCamera *camera() const;
+    Qt3DRender::QCamera *camera() const;
 
 public Q_SLOTS:
 
@@ -93,7 +95,7 @@ private:
 
     // Renderer configuration
     Qt3DRender::QFrameGraph *m_frameGraph;
-    Qt3DCore::QCamera *m_defaultCamera;
+    Qt3DRender::QCamera *m_defaultCamera;
 
     // Input configuration