summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/qt3d/deferred-renderer-cpp/gbuffer.cpp9
-rw-r--r--examples/qt3d/deferred-renderer-qml/GBuffer.qml4
-rw-r--r--examples/qt3d/planets-qml/PlanetFrameGraph.qml2
-rw-r--r--examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml2
-rw-r--r--src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp12
-rw-r--r--src/render/backend/rendertarget.cpp28
-rw-r--r--src/render/backend/rendertarget_p.h8
-rw-r--r--src/render/frontend/qrendertarget.cpp30
-rw-r--r--src/render/frontend/qrendertarget.h6
-rw-r--r--src/render/frontend/qrendertarget_p.h2
-rw-r--r--src/render/jobs/renderviewjobutils.cpp8
11 files changed, 55 insertions, 56 deletions
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
index c9607fdc2..b388af344 100644
--- a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
+++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp
@@ -68,7 +68,7 @@ GBuffer::GBuffer(Qt3DCore::QNode *parent)
};
for (int i = 0; i < AttachmentsCount; i++) {
- Qt3DRender::QRenderTargetOutput *attachment = new Qt3DRender::QRenderTargetOutput(this);
+ Qt3DRender::QRenderTargetOutput *output = new Qt3DRender::QRenderTargetOutput(this);
m_textures[i] = new Qt3DRender::QTexture2D();
m_textures[i]->setFormat(formats[i]);
@@ -79,10 +79,9 @@ GBuffer::GBuffer(Qt3DCore::QNode *parent)
m_textures[i]->setMinificationFilter(Qt3DRender::QAbstractTextureProvider::Linear);
m_textures[i]->setMagnificationFilter(Qt3DRender::QAbstractTextureProvider::Linear);
- attachment->setTexture(m_textures[i]);
- attachment->setAttachmentPoint(attachmentPoints[i]);
-
- addAttachment(attachment);
+ output->setTexture(m_textures[i]);
+ output->setAttachmentPoint(attachmentPoints[i]);
+ addOutput(output);
}
}
diff --git a/examples/qt3d/deferred-renderer-qml/GBuffer.qml b/examples/qt3d/deferred-renderer-qml/GBuffer.qml
index 3111704f7..a5cfbaa29 100644
--- a/examples/qt3d/deferred-renderer-qml/GBuffer.qml
+++ b/examples/qt3d/deferred-renderer-qml/GBuffer.qml
@@ -58,7 +58,7 @@ RenderTarget {
property alias normal : normalAttachment
property alias depth : depthAttachment
- attachments : [
+ outputs : [
RenderTargetOutput {
objectName : "color"
@@ -132,5 +132,5 @@ RenderTarget {
}
}
}
- ] // attachments
+ ] // outputs
}
diff --git a/examples/qt3d/planets-qml/PlanetFrameGraph.qml b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
index 81e6c813e..1495c33d6 100644
--- a/examples/qt3d/planets-qml/PlanetFrameGraph.qml
+++ b/examples/qt3d/planets-qml/PlanetFrameGraph.qml
@@ -72,7 +72,7 @@ FrameGraph {
RenderTargetSelector {
target: RenderTarget {
- attachments: [
+ outputs: [
RenderTargetOutput {
objectName: "depth"
attachmentPoint: RenderTargetOutput.Depth
diff --git a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
index 91ff3eeac..7183b4e3b 100644
--- a/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
+++ b/examples/qt3d/shadow-map-qml/ShadowMapFrameGraph.qml
@@ -68,7 +68,7 @@ FrameGraph {
RenderTargetSelector {
target: RenderTarget {
- attachments: [
+ outputs: [
RenderTargetOutput {
objectName: "depth"
attachmentPoint: RenderTargetOutput.Depth
diff --git a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
index bbb57c35f..a72bd560d 100644
--- a/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
+++ b/src/quick3d/quick3drender/items/quick3drendertargetoutput.cpp
@@ -59,18 +59,18 @@ QQmlListProperty<QRenderTargetOutput> Quick3DRenderTargetOutput::qmlAttachments(
&Quick3DRenderTargetOutput::clearRenderAttachments);
}
-void Quick3DRenderTargetOutput::appendRenderAttachment(QQmlListProperty<QRenderTargetOutput> *list, QRenderTargetOutput *attachment)
+void Quick3DRenderTargetOutput::appendRenderAttachment(QQmlListProperty<QRenderTargetOutput> *list, QRenderTargetOutput *output)
{
Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
if (rT)
- rT->parentRenderTarget()->addAttachment(attachment);
+ rT->parentRenderTarget()->addOutput(output);
}
QRenderTargetOutput *Quick3DRenderTargetOutput::renderAttachmentAt(QQmlListProperty<QRenderTargetOutput> *list, int index)
{
Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
if (rT)
- return rT->parentRenderTarget()->attachments().at(index);
+ return rT->parentRenderTarget()->outputs().at(index);
return Q_NULLPTR;
}
@@ -78,7 +78,7 @@ int Quick3DRenderTargetOutput::renderAttachmentCount(QQmlListProperty<QRenderTar
{
Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
if (rT)
- return rT->parentRenderTarget()->attachments().count();
+ return rT->parentRenderTarget()->outputs().count();
return -1;
}
@@ -86,8 +86,8 @@ void Quick3DRenderTargetOutput::clearRenderAttachments(QQmlListProperty<QRenderT
{
Quick3DRenderTargetOutput *rT = qobject_cast<Quick3DRenderTargetOutput *>(list->object);
if (rT) {
- Q_FOREACH (QRenderTargetOutput *att, rT->parentRenderTarget()->attachments())
- rT->parentRenderTarget()->removeAttachment(att);
+ Q_FOREACH (QRenderTargetOutput *output, rT->parentRenderTarget()->outputs())
+ rT->parentRenderTarget()->removeOutput(output);
}
}
diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp
index 9279a63ca..96471867f 100644
--- a/src/render/backend/rendertarget.cpp
+++ b/src/render/backend/rendertarget.cpp
@@ -58,38 +58,38 @@ RenderTarget::RenderTarget()
void RenderTarget::updateFromPeer(Qt3DCore::QNode *peer)
{
QRenderTarget *target = static_cast<QRenderTarget *>(peer);
- m_renderAttachments.clear();
- Q_FOREACH (QRenderTargetOutput *att, target->attachments())
- appendRenderAttachment(att->id());
+ m_renderOutputs.clear();
+ Q_FOREACH (QRenderTargetOutput *att, target->outputs())
+ appendRenderOutput(att->id());
}
void RenderTarget::cleanup()
{
}
-void RenderTarget::appendRenderAttachment(QNodeId attachmentId)
+void RenderTarget::appendRenderOutput(QNodeId outputId)
{
- if (!m_renderAttachments.contains(attachmentId))
- m_renderAttachments.append(attachmentId);
+ if (!m_renderOutputs.contains(outputId))
+ m_renderOutputs.append(outputId);
}
-void RenderTarget::removeRenderAttachment(QNodeId attachmentId)
+void RenderTarget::removeRenderOutput(QNodeId outputId)
{
- m_renderAttachments.removeOne(attachmentId);
+ m_renderOutputs.removeOne(outputId);
}
-QVector<Qt3DCore::QNodeId> RenderTarget::renderAttachments() const
+QVector<Qt3DCore::QNodeId> RenderTarget::renderOutputs() const
{
- return m_renderAttachments;
+ return m_renderOutputs;
}
void RenderTarget::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
{
QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
- if (e->type() == NodeAdded && propertyChange->propertyName() == QByteArrayLiteral("attachment"))
- appendRenderAttachment(propertyChange->value().value<QNodeId>());
- else if (e->type() == NodeRemoved && propertyChange->propertyName() == QByteArrayLiteral("attachment"))
- removeRenderAttachment(propertyChange->value().value<QNodeId>());
+ if (e->type() == NodeAdded && propertyChange->propertyName() == QByteArrayLiteral("output"))
+ appendRenderOutput(propertyChange->value().value<QNodeId>());
+ else if (e->type() == NodeRemoved && propertyChange->propertyName() == QByteArrayLiteral("output"))
+ removeRenderOutput(propertyChange->value().value<QNodeId>());
markDirty(AbstractRenderer::AllDirty);
}
diff --git a/src/render/backend/rendertarget_p.h b/src/render/backend/rendertarget_p.h
index 8a0736bd1..4f3f3cfa6 100644
--- a/src/render/backend/rendertarget_p.h
+++ b/src/render/backend/rendertarget_p.h
@@ -73,15 +73,15 @@ public:
void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
void cleanup();
- void appendRenderAttachment(Qt3DCore::QNodeId attachmentId);
- void removeRenderAttachment(Qt3DCore::QNodeId attachmentId);
+ void appendRenderOutput(Qt3DCore::QNodeId outputId);
+ void removeRenderOutput(Qt3DCore::QNodeId outputId);
- QVector<Qt3DCore::QNodeId> renderAttachments() const;
+ QVector<Qt3DCore::QNodeId> renderOutputs() const;
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
private:
- QVector<Qt3DCore::QNodeId> m_renderAttachments;
+ QVector<Qt3DCore::QNodeId> m_renderOutputs;
};
} // namespace Render
diff --git a/src/render/frontend/qrendertarget.cpp b/src/render/frontend/qrendertarget.cpp
index 9410fe695..92ad485e2 100644
--- a/src/render/frontend/qrendertarget.cpp
+++ b/src/render/frontend/qrendertarget.cpp
@@ -57,8 +57,8 @@ void QRenderTarget::copy(const QNode *ref)
{
QNode::copy(ref);
const QRenderTarget *other = static_cast<const QRenderTarget*>(ref);
- Q_FOREACH (QRenderTargetOutput *attachment, other->d_func()->m_attachments)
- addAttachment(qobject_cast<QRenderTargetOutput *>(QNode::clone(attachment)));
+ Q_FOREACH (QRenderTargetOutput *output, other->d_func()->m_outputs)
+ addOutput(qobject_cast<QRenderTargetOutput *>(QNode::clone(output)));
}
QRenderTarget::QRenderTarget(QNode *parent)
@@ -77,41 +77,41 @@ QRenderTarget::QRenderTarget(QRenderTargetPrivate &dd, QNode *parent)
{
}
-void QRenderTarget::addAttachment(QRenderTargetOutput *attachment)
+void QRenderTarget::addOutput(QRenderTargetOutput *output)
{
Q_D(QRenderTarget);
- if (!d->m_attachments.contains(attachment)) {
- d->m_attachments.append(attachment);
+ if (!d->m_outputs.contains(output)) {
+ d->m_outputs.append(output);
- if (!attachment->parent())
- attachment->setParent(this);
+ if (!output->parent())
+ output->setParent(this);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeAdded, QSceneChange::Node, id()));
- change->setPropertyName("attachment");
- change->setValue(QVariant::fromValue(attachment->id()));
+ change->setPropertyName("output");
+ change->setValue(QVariant::fromValue(output->id()));
d->notifyObservers(change);
}
}
}
-void QRenderTarget::removeAttachment(QRenderTargetOutput *attachment)
+void QRenderTarget::removeOutput(QRenderTargetOutput *output)
{
Q_D(QRenderTarget);
if (d->m_changeArbiter != Q_NULLPTR) {
QScenePropertyChangePtr change(new QScenePropertyChange(NodeRemoved, QSceneChange::Node, id()));
- change->setPropertyName("attachment");
- change->setValue(QVariant::fromValue(attachment->id()));
+ change->setPropertyName("output");
+ change->setValue(QVariant::fromValue(output->id()));
d->notifyObservers(change);
}
- d->m_attachments.removeOne(attachment);
+ d->m_outputs.removeOne(output);
}
-QList<QRenderTargetOutput *> QRenderTarget::attachments() const
+QList<QRenderTargetOutput *> QRenderTarget::outputs() const
{
Q_D(const QRenderTarget);
- return d->m_attachments;
+ return d->m_outputs;
}
} // namespace Qt3DRender
diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h
index 0ee136973..0bd09a445 100644
--- a/src/render/frontend/qrendertarget.h
+++ b/src/render/frontend/qrendertarget.h
@@ -57,9 +57,9 @@ public:
explicit QRenderTarget(Qt3DCore::QNode *parent = 0);
~QRenderTarget();
- void addAttachment(QRenderTargetOutput *attachment);
- void removeAttachment(QRenderTargetOutput *attachment);
- QList<QRenderTargetOutput *> attachments() const;
+ void addOutput(QRenderTargetOutput *output);
+ void removeOutput(QRenderTargetOutput *output);
+ QList<QRenderTargetOutput *> outputs() const;
protected:
QRenderTarget(QRenderTargetPrivate &dd, Qt3DCore::QNode *parent = 0);
diff --git a/src/render/frontend/qrendertarget_p.h b/src/render/frontend/qrendertarget_p.h
index 60d51a625..4545b96db 100644
--- a/src/render/frontend/qrendertarget_p.h
+++ b/src/render/frontend/qrendertarget_p.h
@@ -66,7 +66,7 @@ public:
QRenderTargetPrivate();
Q_DECLARE_PUBLIC(QRenderTarget)
- QList<QRenderTargetOutput *> m_attachments;
+ QList<QRenderTargetOutput *> m_outputs;
};
}
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp
index 982fa67b0..e0723c6ee 100644
--- a/src/render/jobs/renderviewjobutils.cpp
+++ b/src/render/jobs/renderviewjobutils.cpp
@@ -141,10 +141,10 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
rv->setDrawBuffers(targetSelector->drawBuffers());
// Copy attachments
- Q_FOREACH (QNodeId attachmentId, renderTarget->renderAttachments()) {
- RenderTargetOutput *attachment = manager->attachmentManager()->lookupResource(attachmentId);
- if (attachment)
- rv->addRenderAttachment(attachment->attachment());
+ Q_FOREACH (QNodeId outputId, renderTarget->renderOutputs()) {
+ RenderTargetOutput *output = manager->attachmentManager()->lookupResource(outputId);
+ if (output)
+ rv->addRenderAttachment(output->attachment());
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 17:57:25 +0000