diff options
10 files changed, 52 insertions, 52 deletions
diff --git a/examples/deferred-renderer-cpp/deferredrenderer.cpp b/examples/deferred-renderer-cpp/deferredrenderer.cpp index 5d328fcaf..607ae96c6 100644 --- a/examples/deferred-renderer-cpp/deferredrenderer.cpp +++ b/examples/deferred-renderer-cpp/deferredrenderer.cpp @@ -70,7 +70,7 @@ void DeferredRenderer::setGBuffer(Qt3D::QRenderTarget *gBuffer) void DeferredRenderer::setGeometryPassCriteria(QList<Qt3D::QAnnotation *> criteria) { Q_FOREACH (Qt3D::QAnnotation *c, criteria) - m_geometryPassFilter->addCriterion(c); + m_geometryPassFilter->addInclude(c); } void DeferredRenderer::setFinalPassCriteria(QList<Qt3D::QAnnotation *> criteria) diff --git a/examples/deferred-renderer-qml/DeferredRenderer.qml b/examples/deferred-renderer-qml/DeferredRenderer.qml index 810f0dce9..e3e9bf834 100644 --- a/examples/deferred-renderer-qml/DeferredRenderer.qml +++ b/examples/deferred-renderer-qml/DeferredRenderer.qml @@ -59,7 +59,7 @@ Viewport { RenderPassFilter { id : geometryPass - criteria : Annotation { name : "pass"; value : "geometry" } + includes : Annotation { name : "pass"; value : "geometry" } CameraSelector { id : sceneCameraSelector @@ -77,7 +77,7 @@ Viewport { RenderPassFilter { id : finalPass - criteria : Annotation { name : "pass"; value : "final" } + includes : Annotation { name : "pass"; value : "final" } } } diff --git a/examples/playground-qml/ForwardRenderer.qml b/examples/playground-qml/ForwardRenderer.qml index fe8b187a1..9feda4d6d 100644 --- a/examples/playground-qml/ForwardRenderer.qml +++ b/examples/playground-qml/ForwardRenderer.qml @@ -84,7 +84,7 @@ TechniqueFilter { LayerFilter { id : layerFilter objectName : "layerFilter" - RenderPassFilter { criteria : [Annotation {name : "Name"; value : "TextureLighting";}] } + RenderPassFilter { includes : [Annotation {name : "Name"; value : "TextureLighting";}] } } } } @@ -108,10 +108,10 @@ TechniqueFilter { } ] } - RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Texture";}] } - RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Lighting";}] } + RenderPassFilter { includes : [Annotation {name : "Name"; value : "Texture";}] } + RenderPassFilter { includes : [Annotation {name : "Name"; value : "Lighting";}] } } - RenderPassFilter { criteria : [Annotation {name : "Name"; value : "Final";}] } + RenderPassFilter { includes : [Annotation {name : "Name"; value : "Final";}] } } } } diff --git a/examples/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/shadow-map-qml/ShadowMapFrameGraph.qml index 7164c0ffc..592412bc1 100644 --- a/examples/shadow-map-qml/ShadowMapFrameGraph.qml +++ b/examples/shadow-map-qml/ShadowMapFrameGraph.qml @@ -62,7 +62,7 @@ FrameGraph { clearColor: Qt.rgba(0.0, 0.4, 0.7, 1.0) RenderPassFilter { - criteria: [ Annotation { name: "pass"; value: "shadowmap" } ] + includes: [ Annotation { name: "pass"; value: "shadowmap" } ] RenderTargetSelector { target: RenderTarget { @@ -96,7 +96,7 @@ FrameGraph { } RenderPassFilter { - criteria: [ Annotation { name: "pass"; value: "forward" } ] + includes: [ Annotation { name: "pass"; value: "forward" } ] ClearBuffer { buffers: ClearBuffer.ColorDepthBuffer diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp index f867277fd..a2e410ca2 100644 --- a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp +++ b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.cpp @@ -54,46 +54,46 @@ Quick3DRenderPassFilter::Quick3DRenderPassFilter(QObject *parent) { } -QQmlListProperty<QAnnotation> Quick3DRenderPassFilter::criteriaList() +QQmlListProperty<QAnnotation> Quick3DRenderPassFilter::includeList() { return QQmlListProperty<Qt3D::QAnnotation>(this, 0, - &Quick3DRenderPassFilter::appendCriterion, - &Quick3DRenderPassFilter::criteriaCount, - &Quick3DRenderPassFilter::criterionAt, - &Quick3DRenderPassFilter::clearCriteria); + &Quick3DRenderPassFilter::appendInclude, + &Quick3DRenderPassFilter::includesCount, + &Quick3DRenderPassFilter::includeAt, + &Quick3DRenderPassFilter::clearIncludes); } -void Quick3DRenderPassFilter::appendCriterion(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion) +void Quick3DRenderPassFilter::appendInclude(QQmlListProperty<QAnnotation> *list, QAnnotation *annotation) { Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object); if (filter) { - criterion->setParent(filter->parentRenderPassFilter()); - filter->parentRenderPassFilter()->addCriterion(criterion); + annotation->setParent(filter->parentRenderPassFilter()); + filter->parentRenderPassFilter()->addInclude(annotation); } } -QAnnotation *Quick3DRenderPassFilter::criterionAt(QQmlListProperty<QAnnotation> *list, int index) +QAnnotation *Quick3DRenderPassFilter::includeAt(QQmlListProperty<QAnnotation> *list, int index) { Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object); if (filter) - return filter->parentRenderPassFilter()->criteria().at(index); + return filter->parentRenderPassFilter()->includes().at(index); return 0; } -int Quick3DRenderPassFilter::criteriaCount(QQmlListProperty<QAnnotation> *list) +int Quick3DRenderPassFilter::includesCount(QQmlListProperty<QAnnotation> *list) { Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object); if (filter) - return filter->parentRenderPassFilter()->criteria().count(); + return filter->parentRenderPassFilter()->includes().count(); return 0; } -void Quick3DRenderPassFilter::clearCriteria(QQmlListProperty<QAnnotation> *list) +void Quick3DRenderPassFilter::clearIncludes(QQmlListProperty<QAnnotation> *list) { Quick3DRenderPassFilter *filter = qobject_cast<Quick3DRenderPassFilter *>(list->object); if (filter) { - Q_FOREACH (QAnnotation *criterion, filter->parentRenderPassFilter()->criteria()) - filter->parentRenderPassFilter()->removeCriterion(criterion); + Q_FOREACH (QAnnotation *criterion, filter->parentRenderPassFilter()->includes()) + filter->parentRenderPassFilter()->removeInclude(criterion); } } diff --git a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h index 67f690f7e..b115fe00f 100644 --- a/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h +++ b/src/quick3d/quick3drenderer/items/quick3drenderpassfilter.h @@ -58,19 +58,19 @@ namespace Quick { class QT3DQUICKRENDERERSHARED_EXPORT Quick3DRenderPassFilter : public QObject { Q_OBJECT - Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> criteria READ criteriaList) + Q_PROPERTY(QQmlListProperty<Qt3D::QAnnotation> includes READ includeList) public: explicit Quick3DRenderPassFilter(QObject *parent = 0); - QQmlListProperty<Qt3D::QAnnotation> criteriaList(); + QQmlListProperty<Qt3D::QAnnotation> includeList(); inline QRenderPassFilter *parentRenderPassFilter() const { return qobject_cast<Qt3D::QRenderPassFilter*>(parent()); } private: - static void appendCriterion(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion); - static QAnnotation *criterionAt(QQmlListProperty<QAnnotation> *list, int index); - static int criteriaCount(QQmlListProperty<QAnnotation> *list); - static void clearCriteria(QQmlListProperty<QAnnotation> *list); + static void appendInclude(QQmlListProperty<QAnnotation> *list, QAnnotation *criterion); + static QAnnotation *includeAt(QQmlListProperty<QAnnotation> *list, int index); + static int includesCount(QQmlListProperty<QAnnotation> *list); + static void clearIncludes(QQmlListProperty<QAnnotation> *list); }; } // Quick diff --git a/src/render/backend/framegraph/renderpassfilternode.cpp b/src/render/backend/framegraph/renderpassfilternode.cpp index 54362bcc1..e38c922a8 100644 --- a/src/render/backend/framegraph/renderpassfilternode.cpp +++ b/src/render/backend/framegraph/renderpassfilternode.cpp @@ -58,7 +58,7 @@ void RenderPassFilter::updateFromPeer(QNode *peer) { QRenderPassFilter *filter = static_cast<QRenderPassFilter *>(peer); m_filters.clear(); - Q_FOREACH (QAnnotation *criterion, filter->criteria()) + Q_FOREACH (QAnnotation *criterion, filter->includes()) appendFilter(criterion); } @@ -83,13 +83,13 @@ void RenderPassFilter::sceneChangeEvent(const QSceneChangePtr &e) switch (e->type()) { case NodeAdded: { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); - if (propertyChange->propertyName() == QByteArrayLiteral("renderPassCriterion")) + if (propertyChange->propertyName() == QByteArrayLiteral("include")) appendFilter(propertyChange->value().value<QAnnotation *>()); } break; case NodeRemoved: { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); - if (propertyChange->propertyName() == QByteArrayLiteral("renderPassCriterion")) + if (propertyChange->propertyName() == QByteArrayLiteral("include")) removeFilter(propertyChange->value().toUuid()); } break; diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp index 5ef5143bc..0cebbfe4d 100644 --- a/src/render/frontend/framegraph-components/qrenderpassfilter.cpp +++ b/src/render/frontend/framegraph-components/qrenderpassfilter.cpp @@ -58,44 +58,44 @@ QRenderPassFilter::QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent { } -QList<QAnnotation *> QRenderPassFilter::criteria() const +QList<QAnnotation *> QRenderPassFilter::includes() const { Q_D(const QRenderPassFilter); - return d->m_criteriaList; + return d->m_includeList; } -void QRenderPassFilter::addCriterion(QAnnotation *criterion) +void QRenderPassFilter::addInclude(QAnnotation *annotation) { Q_D(QRenderPassFilter); - if (!d->m_criteriaList.contains(criterion)) { - d->m_criteriaList.append(criterion); + if (!d->m_includeList.contains(annotation)) { + d->m_includeList.append(annotation); // We need to add it as a child of the current node if it has been declared inline // Or not previously added as a child of the current node so that // 1) The backend gets notified about it's creation // 2) When the current node is destroyed, it gets destroyed as well - if (!criterion->parent()) - criterion->setParent(this); + if (!annotation->parent()) + annotation->setParent(this); if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeAdded, this)); - propertyChange->setPropertyName(QByteArrayLiteral("renderPassCriterion")); - propertyChange->setValue(QVariant::fromValue(criterion)); + propertyChange->setPropertyName(QByteArrayLiteral("include")); + propertyChange->setValue(QVariant::fromValue(annotation)); d->notifyObservers(propertyChange); } } } -void QRenderPassFilter::removeCriterion(QAnnotation *criterion) +void QRenderPassFilter::removeInclude(QAnnotation *annotation) { Q_D(QRenderPassFilter); if (d->m_changeArbiter != Q_NULLPTR) { QScenePropertyChangePtr propertyChange(new QScenePropertyChange(NodeRemoved, this)); - propertyChange->setPropertyName(QByteArrayLiteral("renderPassCriterion")); - propertyChange->setValue(QVariant::fromValue(criterion)); + propertyChange->setPropertyName(QByteArrayLiteral("include")); + propertyChange->setValue(QVariant::fromValue(annotation)); d->notifyObservers(propertyChange); } - d->m_criteriaList.removeOne(criterion); + d->m_includeList.removeOne(annotation); } void QRenderPassFilter::copy(const QNode *ref) @@ -104,8 +104,8 @@ void QRenderPassFilter::copy(const QNode *ref) const QRenderPassFilter *other = static_cast<const QRenderPassFilter*>(ref); Q_FOREACH (QFrameGraphItem *fgChild, other->d_func()->m_fgChildren) appendFrameGraphItem(qobject_cast<QFrameGraphItem *>(QNodePrivate::get(fgChild)->clone())); - Q_FOREACH (QAnnotation *c, other->d_func()->m_criteriaList) - addCriterion(qobject_cast<QAnnotation *>(QNodePrivate::get(c)->clone())); + Q_FOREACH (QAnnotation *c, other->d_func()->m_includeList) + addInclude(qobject_cast<QAnnotation *>(QNodePrivate::get(c)->clone())); } } // Qt3D diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter.h b/src/render/frontend/framegraph-components/qrenderpassfilter.h index 363ea5802..d4b593f96 100644 --- a/src/render/frontend/framegraph-components/qrenderpassfilter.h +++ b/src/render/frontend/framegraph-components/qrenderpassfilter.h @@ -61,9 +61,9 @@ class QT3DRENDERERSHARED_EXPORT QRenderPassFilter : public QFrameGraphItem public: explicit QRenderPassFilter(QNode *parent = 0); - QList<QAnnotation *> criteria() const; - void addCriterion(QAnnotation *criterion); - void removeCriterion(QAnnotation *criterion); + QList<QAnnotation *> includes() const; + void addInclude(QAnnotation *criterion); + void removeInclude(QAnnotation *criterion); protected: QRenderPassFilter(QRenderPassFilterPrivate &dd, QNode *parent = 0); diff --git a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h index da58d810f..76d2a87cd 100644 --- a/src/render/frontend/framegraph-components/qrenderpassfilter_p.h +++ b/src/render/frontend/framegraph-components/qrenderpassfilter_p.h @@ -59,7 +59,7 @@ public: Q_DECLARE_PUBLIC(QRenderPassFilter) QString m_renderPassName; - QList<QAnnotation *> m_criteriaList; + QList<QAnnotation *> m_includeList; }; } // Qt3D |