diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-02-24 14:32:40 +0000 |
|---|---|---|
| committer | Robert Brock <robert.brock@kdab.com> | 2016-02-25 11:46:24 +0000 |
| commit | dfe0d0cb24a554455f774741e06e1cbd50831b1a (patch) | |
| tree | 3fbf552a54f3fcd9c2332568300ec9c9f62ffb44 /examples | |
| parent | 143b1c9a0993c371941919acbe52c76f7636502e (diff) | |
Remove QRenderAttachment name property
As per API review, name property is not needed as we can simply
use the QObject::objectName property.
Change-Id: I575c658a4af68145b50ad03e55971856479225e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/qt3d/deferred-renderer-cpp/gbuffer.cpp | 8 | ||||
| -rw-r--r-- | examples/qt3d/deferred-renderer-qml/GBuffer.qml | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp index da128f784..cdf47d119 100644 --- a/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp +++ b/examples/qt3d/deferred-renderer-cpp/gbuffer.cpp @@ -67,13 +67,6 @@ GBuffer::GBuffer(Qt3DCore::QNode *parent) Qt3DRender::QRenderAttachment::DepthAttachment }; - const QString attachmentNames[AttachmentsCount] = { - QString::fromLatin1("color"), - QString::fromLatin1("position"), - QString::fromLatin1("normal"), - QString::fromLatin1("depth") - }; - for (int i = 0; i < AttachmentsCount; i++) { Qt3DRender::QRenderAttachment *attachment = new Qt3DRender::QRenderAttachment(this); @@ -88,7 +81,6 @@ GBuffer::GBuffer(Qt3DCore::QNode *parent) attachment->setTexture(m_textures[i]); attachment->setType(attachmentTypes[i]); - attachment->setName(attachmentNames[i]); addAttachment(attachment); } diff --git a/examples/qt3d/deferred-renderer-qml/GBuffer.qml b/examples/qt3d/deferred-renderer-qml/GBuffer.qml index e7c5fe82c..3104307a4 100644 --- a/examples/qt3d/deferred-renderer-qml/GBuffer.qml +++ b/examples/qt3d/deferred-renderer-qml/GBuffer.qml @@ -61,7 +61,7 @@ RenderTarget { attachments : [ RenderAttachment { - name : "color" + objectName : "color" type : RenderAttachment.ColorAttachment0 texture : Texture2D { id : colorAttachment @@ -78,7 +78,7 @@ RenderTarget { } }, RenderAttachment { - name : "position" + objectName : "position" type : RenderAttachment.ColorAttachment1 texture : Texture2D { id : positionAttachment @@ -97,7 +97,7 @@ RenderTarget { } }, RenderAttachment { - name : "normal" + objectName : "normal" type : RenderAttachment.ColorAttachment2 texture : Texture2D { id : normalAttachment @@ -116,7 +116,7 @@ RenderTarget { } }, RenderAttachment { - name : "depth" + objectName : "depth" type : RenderAttachment.DepthAttachment texture : Texture2D { id : depthAttachment |