diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-08-31 15:14:17 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-13 07:15:15 +0000 |
| commit | af40840eedf35404ba4b39e890c158e2328ff6ec (patch) | |
| tree | ce4ac1f925c34b56704c99bd332e0436e68dbecc /src/render/backend/renderattachment.cpp | |
| parent | 0269afd106da5d4d999585b3bdb1332a2c01af12 (diff) | |
Move Render aspect into the Qt3DRender namespace
Updated examples and tests accordingly.
Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/renderattachment.cpp')
| -rw-r--r-- | src/render/backend/renderattachment.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/backend/renderattachment.cpp b/src/render/backend/renderattachment.cpp index 295872a17..a62ae76a5 100644 --- a/src/render/backend/renderattachment.cpp +++ b/src/render/backend/renderattachment.cpp @@ -41,8 +41,9 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +using namespace Qt3D; +namespace Qt3DRender { namespace Render { RenderAttachment::RenderAttachment() @@ -50,7 +51,7 @@ RenderAttachment::RenderAttachment() { } -void RenderAttachment::updateFromPeer(QNode *peer) +void RenderAttachment::updateFromPeer(Qt3D::QNode *peer) { QRenderAttachment *attachment = static_cast<QRenderAttachment *>(peer); @@ -63,7 +64,7 @@ void RenderAttachment::updateFromPeer(QNode *peer) m_attachmentData.m_textureUuid = attachment->texture()->id(); } -QNodeId RenderAttachment::textureUuid() const +Qt3D::QNodeId RenderAttachment::textureUuid() const { return m_attachmentData.m_textureUuid; } @@ -93,7 +94,7 @@ QRenderAttachment::RenderAttachmentType RenderAttachment::type() const return m_attachmentData.m_type; } -void RenderAttachment::sceneChangeEvent(const QSceneChangePtr &e) +void RenderAttachment::sceneChangeEvent(const Qt3D::QSceneChangePtr &e) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); if (e->type() == NodeUpdated) { @@ -123,8 +124,7 @@ Attachment RenderAttachment::attachment() const return m_attachmentData; } -} // Render - -} // Qt3D +} // namespace Render +} // namespace Qt3DRender QT_END_NAMESPACE |