QRenderPassFilter fixes

- Only pass the id (to avoid clones) when an annotation is added
- Make clones of the parameters when a QRenderPassFilter is cloned

Change-Id: Id7e19f11d35ea5d891ce2a031c872400a8550197
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>

3 files changed, 10 insertions, 8 deletions

diff --git a/src/render/framegraph/qrenderpassfilter.cpp b/src/render/framegraph/qrenderpassfilter.cpp
index eb3fec7a1..0eb9fc45e 100644
--- a/src/render/framegraph/qrenderpassfilter.cpp
+++ b/src/render/framegraph/qrenderpassfilter.cpp
@@ -89,7 +89,7 @@ void QRenderPassFilter::addInclude(QAnnotation *annotation)
         if (d->m_changeArbiter != Q_NULLPTR) {
             QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id()));
             propertyChange->setPropertyName("include");
-            propertyChange->setValue(QVariant::fromValue(annotation));
+            propertyChange->setValue(QVariant::fromValue(annotation->id()));
             d->notifyObservers(propertyChange);
         }
     }
@@ -101,7 +101,7 @@ void QRenderPassFilter::removeInclude(QAnnotation *annotation)
     if (d->m_changeArbiter != Q_NULLPTR) {
         QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id()));
         propertyChange->setPropertyName("include");
-        propertyChange->setValue(QVariant::fromValue(annotation));
+        propertyChange->setValue(QVariant::fromValue(annotation->id()));
         d->notifyObservers(propertyChange);
     }
     d->m_includeList.removeOne(annotation);
@@ -113,6 +113,8 @@ void QRenderPassFilter::copy(const QNode *ref)
     const QRenderPassFilter *other = static_cast<const QRenderPassFilter*>(ref);
     Q_FOREACH (QAnnotation *c, other->d_func()->m_includeList)
         addInclude(qobject_cast<QAnnotation *>(QNode::clone(c)));
+    Q_FOREACH (QParameter *p, other->d_func()->m_parameters)
+        addParameter(qobject_cast<QParameter *>(QNode::clone(p)));
 }
 
 void QRenderPassFilter::addParameter(QParameter *parameter)
diff --git a/src/render/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index 920460121..a2088d0aa 100644
--- a/src/render/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
@@ -59,7 +59,7 @@ void RenderPassFilter::updateFromPeer(Qt3DCore::QNode *peer)
     m_parameterPack.clear();
     setEnabled(filter->isEnabled());
     Q_FOREACH (QAnnotation *criterion, filter->includes())
-        appendFilter(criterion);
+        appendFilter(criterion->id());
     Q_FOREACH (QParameter *p, filter->parameters())
         m_parameterPack.appendParameter(p->id());
 }
@@ -69,10 +69,10 @@ QList<Qt3DCore::QNodeId> RenderPassFilter::filters() const
     return m_filters;
 }
 
-void RenderPassFilter::appendFilter(QAnnotation *criterion)
+void RenderPassFilter::appendFilter(const Qt3DCore::QNodeId &criterionId)
 {
-    if (!m_filters.contains(criterion->id()))
-        m_filters.append(criterion->id());
+    if (!m_filters.contains(criterionId))
+        m_filters.append(criterionId);
 }
 
 void RenderPassFilter::removeFilter(const Qt3DCore::QNodeId &criterionId)
@@ -98,7 +98,7 @@ void RenderPassFilter::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 
     case NodeAdded: {
         if (propertyChange->propertyName() == QByteArrayLiteral("include"))
-            appendFilter(propertyChange->value().value<QAnnotation *>());
+            appendFilter(propertyChange->value().value<QNodeId>());
         else if (propertyChange->propertyName() == QByteArrayLiteral("parameter"))
             m_parameterPack.appendParameter(propertyChange->value().value<QNodeId>());
     }
diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h
index a413f10bc..498afd70d 100644
--- a/src/render/framegraph/renderpassfilternode_p.h
+++ b/src/render/framegraph/renderpassfilternode_p.h
@@ -73,7 +73,7 @@ public:
     void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     QList<Qt3DCore::QNodeId> filters() const;
     QList<Qt3DCore::QNodeId> parameters() const;
-    void appendFilter(QAnnotation *criterion);
+    void appendFilter(const Qt3DCore::QNodeId &criterionId);
     void removeFilter(const Qt3DCore::QNodeId &criterionId);
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;