Remove QBackendNode::updateFromPeer()

Implemented a few missing initializeFromPeer() implementations along
with the corresponding frontend node creation change creation functions.

Adapted unit tests.

Change-Id: I571e53a7b68a5544bd0e308df0baf7e52533306e
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

26 files changed, 2 insertions, 138 deletions

diff --git a/src/render/framegraph/cameraselectornode.cpp b/src/render/framegraph/cameraselectornode.cpp
index aaea9c41a..09095ff7c 100644
--- a/src/render/framegraph/cameraselectornode.cpp
+++ b/src/render/framegraph/cameraselectornode.cpp
@@ -57,14 +57,6 @@ CameraSelector::CameraSelector()
 {
 }
 
-void CameraSelector::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    QCameraSelector *selector = static_cast<QCameraSelector *>(peer);
-    m_cameraUuid = QNodeId();
-    if (selector->camera() != nullptr)
-        m_cameraUuid = selector->camera()->id();
-}
-
 void CameraSelector::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     FrameGraphNode::initializeFromPeer(change);
diff --git a/src/render/framegraph/cameraselectornode_p.h b/src/render/framegraph/cameraselectornode_p.h
index 8d6def2cd..e20d0cf8e 100644
--- a/src/render/framegraph/cameraselectornode_p.h
+++ b/src/render/framegraph/cameraselectornode_p.h
@@ -69,8 +69,6 @@ class CameraSelector : public FrameGraphNode
 public:
     CameraSelector();
 
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
-
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     Qt3DCore::QNodeId cameraUuid() const;
 
diff --git a/src/render/framegraph/clearbuffers.cpp b/src/render/framegraph/clearbuffers.cpp
index 7b6bc4c83..2908dc03c 100644
--- a/src/render/framegraph/clearbuffers.cpp
+++ b/src/render/framegraph/clearbuffers.cpp
@@ -56,15 +56,6 @@ ClearBuffers::ClearBuffers()
 {
 }
 
-void ClearBuffers::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    QClearBuffers *clearBuffers = static_cast<QClearBuffers *>(peer);
-    m_type = clearBuffers->buffers();
-    m_clearColor = clearBuffers->clearColor();
-    m_clearDepthValue = clearBuffers->clearDepthValue();
-    m_clearStencilValue = clearBuffers->clearStencilValue();
-}
-
 void ClearBuffers::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     FrameGraphNode::initializeFromPeer(change);
diff --git a/src/render/framegraph/clearbuffers_p.h b/src/render/framegraph/clearbuffers_p.h
index f53bde2db..4b2f262bd 100644
--- a/src/render/framegraph/clearbuffers_p.h
+++ b/src/render/framegraph/clearbuffers_p.h
@@ -67,7 +67,6 @@ class ClearBuffers : public FrameGraphNode
 public:
     ClearBuffers();
 
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     QClearBuffers::BufferType type() const;
     QColor clearColor() const;
diff --git a/src/render/framegraph/dispatchcompute.cpp b/src/render/framegraph/dispatchcompute.cpp
index 5cd8e9e45..3cebb7e02 100644
--- a/src/render/framegraph/dispatchcompute.cpp
+++ b/src/render/framegraph/dispatchcompute.cpp
@@ -66,14 +66,6 @@ void DispatchCompute::cleanup()
     m_workGroups[2] = 1;
 }
 
-void DispatchCompute::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    QDispatchCompute *computeDispatch = static_cast<QDispatchCompute *>(peer);
-    m_workGroups[0] = computeDispatch->workGroupX();
-    m_workGroups[1] = computeDispatch->workGroupY();
-    m_workGroups[2] = computeDispatch->workGroupZ();
-}
-
 void DispatchCompute::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     FrameGraphNode::initializeFromPeer(change);
diff --git a/src/render/framegraph/dispatchcompute_p.h b/src/render/framegraph/dispatchcompute_p.h
index 7b611f34d..724bce742 100644
--- a/src/render/framegraph/dispatchcompute_p.h
+++ b/src/render/framegraph/dispatchcompute_p.h
@@ -68,7 +68,6 @@ public:
 
     void cleanup();
 
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     inline int x() const Q_DECL_NOEXCEPT { return m_workGroups[0]; }
     inline int y() const Q_DECL_NOEXCEPT { return m_workGroups[1]; }
diff --git a/src/render/framegraph/frustumculling.cpp b/src/render/framegraph/frustumculling.cpp
index 6ccb9ed11..dea5840ba 100644
--- a/src/render/framegraph/frustumculling.cpp
+++ b/src/render/framegraph/frustumculling.cpp
@@ -56,11 +56,6 @@ FrustumCulling::~FrustumCulling()
 {
 }
 
-void FrustumCulling::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    Q_UNUSED(peer)
-}
-
 } // namespace Render
 
 } // namespace Qt3DRender
diff --git a/src/render/framegraph/frustumculling_p.h b/src/render/framegraph/frustumculling_p.h
index 1f87100b4..7f9959c6e 100644
--- a/src/render/framegraph/frustumculling_p.h
+++ b/src/render/framegraph/frustumculling_p.h
@@ -64,8 +64,6 @@ class FrustumCulling : public FrameGraphNode
 public:
     FrustumCulling();
     ~FrustumCulling();
-
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 };
 
 } // namespace Render
diff --git a/src/render/framegraph/layerfilternode.cpp b/src/render/framegraph/layerfilternode.cpp
index 998a320f0..6a61151fb 100644
--- a/src/render/framegraph/layerfilternode.cpp
+++ b/src/render/framegraph/layerfilternode.cpp
@@ -55,12 +55,6 @@ LayerFilterNode::LayerFilterNode()
 {
 }
 
-void LayerFilterNode::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    QLayerFilter *layerFilter = static_cast<QLayerFilter *>(peer);
-    setLayers(layerFilter->layers());
-}
-
 void LayerFilterNode::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     FrameGraphNode::initializeFromPeer(change);
diff --git a/src/render/framegraph/layerfilternode_p.h b/src/render/framegraph/layerfilternode_p.h
index a559864ba..6056a2a2f 100644
--- a/src/render/framegraph/layerfilternode_p.h
+++ b/src/render/framegraph/layerfilternode_p.h
@@ -69,7 +69,6 @@ class LayerFilterNode : public FrameGraphNode
 public:
     LayerFilterNode();
 
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     QStringList layers() const;
     QVector<int> layerIds() const Q_DECL_NOEXCEPT { return m_layerIds; }
diff --git a/src/render/framegraph/nodraw.cpp b/src/render/framegraph/nodraw.cpp
index 771ebc7b6..96af7ca4c 100644
--- a/src/render/framegraph/nodraw.cpp
+++ b/src/render/framegraph/nodraw.cpp
@@ -57,11 +57,6 @@ NoDraw::~NoDraw()
 {
 }
 
-void NoDraw::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    Q_UNUSED(peer)
-}
-
 } // namespace Render
 } // namespace Qt3DRender
 
diff --git a/src/render/framegraph/nodraw_p.h b/src/render/framegraph/nodraw_p.h
index 46c42c77a..ae9fa6713 100644
--- a/src/render/framegraph/nodraw_p.h
+++ b/src/render/framegraph/nodraw_p.h
@@ -64,8 +64,6 @@ class NoDraw : public FrameGraphNode
 public:
     NoDraw();
     ~NoDraw();
-
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 };
 
 } // namespace Render
diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index 32a478cee..e5d143fb1 100644
--- a/src/render/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
@@ -58,25 +58,13 @@ RenderPassFilter::RenderPassFilter()
 {
 }
 
-void RenderPassFilter::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    QRenderPassFilter *filter = static_cast<QRenderPassFilter *>(peer);
-    m_filters.clear();
-    m_parameterPack.clear();
-    const auto criteria = filter->matchAny();
-    for (QFilterKey *criterion : criteria)
-        appendFilter(criterion->id());
-    const auto parameters = filter->parameters();
-    for (QParameter *p : parameters)
-        m_parameterPack.appendParameter(p->id());
-}
-
 void RenderPassFilter::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     FrameGraphNode::initializeFromPeer(change);
     const auto typedChange = qSharedPointerCast<Qt3DCore::QNodeCreatedChange<QRenderPassFilterData>>(change);
     const auto &data = typedChange->data;
     m_filters = data.matchIds;
+    m_parameterPack.clear();
     m_parameterPack.setParameters(data.parameterIds);
 }
 
diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h
index 4047beb89..ee9137b04 100644
--- a/src/render/framegraph/renderpassfilternode_p.h
+++ b/src/render/framegraph/renderpassfilternode_p.h
@@ -67,13 +67,11 @@ class QHandle;
 
 namespace Render {
 
-class RenderPassFilter
-        : public Render::FrameGraphNode
+class RenderPassFilter : public Render::FrameGraphNode
 {
 public:
     RenderPassFilter();
 
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     QVector<Qt3DCore::QNodeId> filters() const;
     QVector<Qt3DCore::QNodeId> parameters() const;
     void appendFilter(Qt3DCore::QNodeId criterionId);
diff --git a/src/render/framegraph/rendersurfaceselector.cpp b/src/render/framegraph/rendersurfaceselector.cpp
index 9c77a6024..894fbb815 100644
--- a/src/render/framegraph/rendersurfaceselector.cpp
+++ b/src/render/framegraph/rendersurfaceselector.cpp
@@ -80,22 +80,6 @@ RenderSurfaceSelector::RenderSurfaceSelector()
 {
 }
 
-void RenderSurfaceSelector::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    QRenderSurfaceSelector *selector = static_cast<QRenderSurfaceSelector *>(peer);
-    m_surface = surfaceFromQObject(selector->surface());
-    setRenderTargetSize(selector->externalRenderTargetSize());
-    if (m_surface) {
-        if (m_surface->surfaceClass() == QSurface::Window) {
-            QWindow *window = static_cast<QWindow *>(m_surface);
-            m_width = window->width();
-            m_height = window->height();
-            if (window->screen())
-                m_devicePixelRatio = window->screen()->devicePixelRatio();
-        }
-    }
-}
-
 void RenderSurfaceSelector::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     FrameGraphNode::initializeFromPeer(change);
diff --git a/src/render/framegraph/rendersurfaceselector_p.h b/src/render/framegraph/rendersurfaceselector_p.h
index a623d9b34..6602cd18b 100644
--- a/src/render/framegraph/rendersurfaceselector_p.h
+++ b/src/render/framegraph/rendersurfaceselector_p.h
@@ -68,7 +68,6 @@ public:
     QSize renderTargetSize() const;
     void setRenderTargetSize(const QSize &size) { m_renderTargetSize = size; }
 
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     QSurface *surface() const { return m_surface; }
diff --git a/src/render/framegraph/rendertargetselectornode.cpp b/src/render/framegraph/rendertargetselectornode.cpp
index b1bc6f976..a29230c11 100644
--- a/src/render/framegraph/rendertargetselectornode.cpp
+++ b/src/render/framegraph/rendertargetselectornode.cpp
@@ -59,15 +59,6 @@ RenderTargetSelector::RenderTargetSelector() :
 {
 }
 
-void RenderTargetSelector::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    QRenderTargetSelector *selector = static_cast<QRenderTargetSelector *>(peer);
-    m_renderTargetUuid = QNodeId();
-    if (selector->target() != nullptr)
-        m_renderTargetUuid = selector->target()->id();
-    m_outputs = selector->outputs();
-}
-
 void RenderTargetSelector::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     FrameGraphNode::initializeFromPeer(change);
diff --git a/src/render/framegraph/rendertargetselectornode_p.h b/src/render/framegraph/rendertargetselectornode_p.h
index 5d932c6ee..359a433ec 100644
--- a/src/render/framegraph/rendertargetselectornode_p.h
+++ b/src/render/framegraph/rendertargetselectornode_p.h
@@ -66,7 +66,6 @@ class RenderTargetSelector : public FrameGraphNode
 public:
     RenderTargetSelector();
 
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     Qt3DCore::QNodeId renderTargetUuid() const { return m_renderTargetUuid; }
diff --git a/src/render/framegraph/sortpolicy.cpp b/src/render/framegraph/sortpolicy.cpp
index f04243d6a..697bc0476 100644
--- a/src/render/framegraph/sortpolicy.cpp
+++ b/src/render/framegraph/sortpolicy.cpp
@@ -53,14 +53,6 @@ SortPolicy::SortPolicy()
 {
 }
 
-void SortPolicy::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    QSortPolicy *sortPolicy = static_cast<QSortPolicy *>(peer);
-    m_sortTypes.clear();
-    Q_FOREACH (QSortPolicy::SortType c, sortPolicy->sortTypes())
-        m_sortTypes.append(c);
-}
-
 void SortPolicy::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QNodePropertyChangePtr propertyChange = qSharedPointerCast<QNodePropertyChange>(e);
diff --git a/src/render/framegraph/sortpolicy_p.h b/src/render/framegraph/sortpolicy_p.h
index 749965b47..32d2888c3 100644
--- a/src/render/framegraph/sortpolicy_p.h
+++ b/src/render/framegraph/sortpolicy_p.h
@@ -65,7 +65,6 @@ class SortPolicy : public FrameGraphNode
 public:
     SortPolicy();
 
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     QVector<Qt3DRender::QSortPolicy::SortType> sortTypes() const;
diff --git a/src/render/framegraph/statesetnode.cpp b/src/render/framegraph/statesetnode.cpp
index ecc72217f..e0dc9b45d 100644
--- a/src/render/framegraph/statesetnode.cpp
+++ b/src/render/framegraph/statesetnode.cpp
@@ -63,15 +63,6 @@ StateSetNode::~StateSetNode()
 {
 }
 
-void StateSetNode::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    QRenderStateSet *stateSet = static_cast<QRenderStateSet*>(peer);
-
-    const auto renderStates = stateSet->renderStates();
-    for (QRenderState *renderState : renderStates)
-        appendRenderState(renderState->id());
-}
-
 void StateSetNode::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     FrameGraphNode::initializeFromPeer(change);
diff --git a/src/render/framegraph/statesetnode_p.h b/src/render/framegraph/statesetnode_p.h
index 189e326e8..bb7b88603 100644
--- a/src/render/framegraph/statesetnode_p.h
+++ b/src/render/framegraph/statesetnode_p.h
@@ -66,8 +66,6 @@ public:
     StateSetNode();
     ~StateSetNode();
 
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
-
 protected:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp
index 79c249c85..08a7600c7 100644
--- a/src/render/framegraph/techniquefilternode.cpp
+++ b/src/render/framegraph/techniquefilternode.cpp
@@ -59,19 +59,6 @@ TechniqueFilter::TechniqueFilter()
 {
 }
 
-void TechniqueFilter::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    QTechniqueFilter *filter = static_cast<QTechniqueFilter *>(peer);
-    m_filters.clear();
-    m_parameterPack.clear();
-    const auto criteria = filter->matchAll();
-    for (QFilterKey *criterion : criteria)
-        appendFilter(criterion->id());
-    const auto parameters = filter->parameters();
-    for (QParameter *p : parameters)
-        m_parameterPack.appendParameter(p->id());
-}
-
 void TechniqueFilter::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     FrameGraphNode::initializeFromPeer(change);
diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h
index 61b7a4b6d..091dc1cf7 100644
--- a/src/render/framegraph/techniquefilternode_p.h
+++ b/src/render/framegraph/techniquefilternode_p.h
@@ -75,7 +75,6 @@ class TechniqueFilter
 {
 public:
     TechniqueFilter();
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     QVector<Qt3DCore::QNodeId> parameters() const;
 
diff --git a/src/render/framegraph/viewportnode.cpp b/src/render/framegraph/viewportnode.cpp
index e0b3d62bc..55d7d16c1 100644
--- a/src/render/framegraph/viewportnode.cpp
+++ b/src/render/framegraph/viewportnode.cpp
@@ -58,15 +58,6 @@ ViewportNode::ViewportNode()
 {
 }
 
-void ViewportNode::updateFromPeer(Qt3DCore::QNode *peer)
-{
-    QViewport *viewport = static_cast<QViewport *>(peer);
-    setXMin(viewport->normalizedRect().x());
-    setXMax(viewport->normalizedRect().width());
-    setYMin(viewport->normalizedRect().y());
-    setYMax(viewport->normalizedRect().height());
-}
-
 void ViewportNode::initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change)
 {
     FrameGraphNode::initializeFromPeer(change);
diff --git a/src/render/framegraph/viewportnode_p.h b/src/render/framegraph/viewportnode_p.h
index c20d05767..882aa4d86 100644
--- a/src/render/framegraph/viewportnode_p.h
+++ b/src/render/framegraph/viewportnode_p.h
@@ -69,8 +69,6 @@ class ViewportNode : public FrameGraphNode
 public:
     ViewportNode();
 
-    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
-
     float xMin() const;
     void setXMin(float xMin);