diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2015-11-03 17:38:10 +0100 |
---|---|---|
committer | Andy Nichols <andy.nichols@theqtcompany.com> | 2015-11-16 09:17:29 +0000 |
commit | 7c408322b4678d302e57615bbc58053ae78ad3e5 (patch) | |
tree | 0ee77a6be1b821225bf2571af17cf2b1120e6cbb /src/render/geometry/geometry.cpp | |
parent | 67b22593aa986ae011e5e61d0eb71ea6757b014d (diff) |
Geometry updated to copy properties from QBoundingVolumeSpecifier
Change-Id: I94e3cadb0ede77336b41f2241198b877b7dd57a7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'src/render/geometry/geometry.cpp')
-rw-r--r-- | src/render/geometry/geometry.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp index 6b63c6294..5209d9d26 100644 --- a/src/render/geometry/geometry.cpp +++ b/src/render/geometry/geometry.cpp @@ -38,6 +38,7 @@ #include <Qt3DCore/qscenepropertychange.h> #include <Qt3DCore/qabstractattribute.h> #include <Qt3DRender/qgeometry.h> +#include <Qt3DRender/qboundingvolumespecifier.h> QT_BEGIN_NAMESPACE @@ -62,6 +63,7 @@ void Geometry::cleanup() m_verticesPerPatch = 0; m_attributes.clear(); m_geometryDirty = false; + m_boundingPositionAttribute = Qt3DCore::QNodeId(); } void Geometry::updateFromPeer(Qt3DCore::QNode *peer) @@ -73,6 +75,8 @@ void Geometry::updateFromPeer(Qt3DCore::QNode *peer) m_attributes.push_back(attribute->id()); m_verticesPerPatch = geometry->verticesPerPatch(); m_geometryDirty = true; + if (geometry->boundingVolumeSpecifier()->positionAttribute() != Q_NULLPTR) + m_boundingPositionAttribute = geometry->boundingVolumeSpecifier()->positionAttribute()->id(); } } @@ -105,6 +109,9 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) // Note: doesn't set dirtyness as this parameter changing doesn't need // a new VAO update. + } else if (propertyName == QByteArrayLiteral("boundingVolumeSpecifierPositionAttribute")) { + m_boundingPositionAttribute = propertyChange->value().value<Qt3DCore::QNodeId>(); + break; } default: |