Camera: add pointer back to aspect

Needed later to submit one shot jobs

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

3 files changed, 52 insertions, 1 deletions

diff --git a/src/render/backend/cameralens.cpp b/src/render/backend/cameralens.cpp
index 3d0e7fdaf..5bb3ca863 100644
--- a/src/render/backend/cameralens.cpp
+++ b/src/render/backend/cameralens.cpp
@@ -41,6 +41,8 @@
 #include <Qt3DRender/qcameralens.h>
 #include <Qt3DRender/private/qcameralens_p.h>
 #include <Qt3DRender/private/renderlogging_p.h>
+#include <Qt3DRender/private/managers_p.h>
+#include <Qt3DRender/private/nodemanagers_p.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qpropertyupdatedchange.h>
 #include <Qt3DCore/qtransform.h>
@@ -54,6 +56,7 @@ namespace Render {
 
 CameraLens::CameraLens()
     : BackendNode()
+    , m_renderAspect(nullptr)
     , m_exposure(0.0f)
 {
 }
@@ -68,6 +71,11 @@ void CameraLens::cleanup()
     QBackendNode::setEnabled(false);
 }
 
+void CameraLens::setRenderAspect(QRenderAspect *renderAspect)
+{
+    m_renderAspect = renderAspect;
+}
+
 void CameraLens::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QCameraLensData>>(change);
@@ -109,6 +117,31 @@ void CameraLens::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     BackendNode::sceneChangeEvent(e);
 }
 
+CameraLensFunctor::CameraLensFunctor(AbstractRenderer *renderer, QRenderAspect *renderAspect)
+    : m_manager(renderer->nodeManagers()->manager<CameraLens, CameraManager>())
+    , m_renderer(renderer)
+    , m_renderAspect(renderAspect)
+{
+}
+
+QBackendNode *CameraLensFunctor::create(const QNodeCreatedChangeBasePtr &change) const
+{
+    CameraLens *backend = m_manager->getOrCreateResource(change->subjectId());
+    backend->setRenderer(m_renderer);
+    backend->setRenderAspect(m_renderAspect);
+    return backend;
+}
+
+QBackendNode *CameraLensFunctor::get(QNodeId id) const
+{
+    return m_manager->lookupResource(id);
+}
+
+void CameraLensFunctor::destroy(QNodeId id) const
+{
+    m_manager->releaseResource(id);
+}
+
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/render/backend/cameralens_p.h b/src/render/backend/cameralens_p.h
index 72282a88b..4d9df84e1 100644
--- a/src/render/backend/cameralens_p.h
+++ b/src/render/backend/cameralens_p.h
@@ -63,6 +63,20 @@ namespace Render {
 
 class CameraManager;
 
+class CameraLensFunctor : public Qt3DCore::QBackendNodeMapper
+{
+public:
+    explicit CameraLensFunctor(AbstractRenderer *renderer, QRenderAspect *renderAspect);
+    Qt3DCore::QBackendNode *create(const Qt3DCore::QNodeCreatedChangeBasePtr &change) const Q_DECL_OVERRIDE;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE;
+
+private:
+    CameraManager *m_manager;
+    AbstractRenderer *m_renderer;
+    QRenderAspect *m_renderAspect;
+};
+
 class CameraLens : public BackendNode
 {
 public:
@@ -70,6 +84,8 @@ public:
     ~CameraLens();
     void cleanup();
 
+    void setRenderAspect(QRenderAspect* renderAspect);
+
     void setProjection(const QMatrix4x4 &projection);
     inline QMatrix4x4 projection() const { return m_projection; }
 
@@ -81,6 +97,7 @@ public:
 private:
     void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) Q_DECL_FINAL;
 
+    QRenderAspect *m_renderAspect;
     QMatrix4x4 m_projection;
     float m_exposure;
 };
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index 11c03e7db..4d775aeb3 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -86,6 +86,7 @@
 
 #include <Qt3DRender/private/cameraselectornode_p.h>
 #include <Qt3DRender/private/layerfilternode_p.h>
+#include <Qt3DRender/private/cameralens_p.h>
 #include <Qt3DRender/private/filterkey_p.h>
 #include <Qt3DRender/private/entity_p.h>
 #include <Qt3DRender/private/renderer_p.h>
@@ -211,7 +212,7 @@ void QRenderAspectPrivate::registerBackendTypes()
     q->registerBackendType<Qt3DCore::QEntity>(QSharedPointer<Render::RenderEntityFunctor>::create(m_renderer, m_nodeManagers));
     q->registerBackendType<Qt3DCore::QTransform>(QSharedPointer<Render::NodeFunctor<Render::Transform, Render::TransformManager> >::create(m_renderer));
 
-    q->registerBackendType<Qt3DRender::QCameraLens>(QSharedPointer<Render::NodeFunctor<Render::CameraLens, Render::CameraManager> >::create(m_renderer));
+    q->registerBackendType<Qt3DRender::QCameraLens>(QSharedPointer<Render::CameraLensFunctor>::create(m_renderer, q));
     q->registerBackendType<QLayer>(QSharedPointer<Render::NodeFunctor<Render::Layer, Render::LayerManager> >::create(m_renderer));
     q->registerBackendType<QLevelOfDetail>(QSharedPointer<Render::NodeFunctor<Render::LevelOfDetail, Render::LevelOfDetailManager> >::create(m_renderer));
     q->registerBackendType<QLevelOfDetailSwitch>(QSharedPointer<Render::NodeFunctor<Render::LevelOfDetail, Render::LevelOfDetailManager> >::create(m_renderer));