summaryrefslogtreecommitdiffstats
path: root/src/render/geometry/geometry.cpp
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2016-03-22 19:59:55 +0000
committerSean Harmer <sean.harmer@kdab.com>2016-03-22 20:50:08 +0000
commit971cfa74e6475c52a969ea58040b11d410d8716f (patch)
tree531d318cb13ef261185eb71d631e8f6fe2a7518f /src/render/geometry/geometry.cpp
parent873a96eafbc80d0b12ffc83cda936e39e2f4936f (diff)
Remove QBoundingVolumeSpecifier
Replaced with boundingVolumePositionAttribute Task-number: QTBUG-51495 Change-Id: Ic404ce6e53ebb23d792b01a414dbd8cc21e2dbc7 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/geometry/geometry.cpp')
-rw-r--r--src/render/geometry/geometry.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp
index 9c08662b5..5be4ef56b 100644
--- a/src/render/geometry/geometry.cpp
+++ b/src/render/geometry/geometry.cpp
@@ -41,7 +41,6 @@
#include <Qt3DCore/qscenepropertychange.h>
#include <Qt3DRender/qattribute.h>
#include <Qt3DRender/qgeometry.h>
-#include <Qt3DRender/qboundingvolumespecifier.h>
QT_BEGIN_NAMESPACE
@@ -75,8 +74,8 @@ void Geometry::updateFromPeer(Qt3DCore::QNode *peer)
Q_FOREACH (QAttribute *attribute, geometry->attributes())
m_attributes.push_back(attribute->id());
m_geometryDirty = true;
- if (geometry->boundingVolumeSpecifier()->positionAttribute() != Q_NULLPTR)
- m_boundingPositionAttribute = geometry->boundingVolumeSpecifier()->positionAttribute()->id();
+ if (geometry->boundingVolumePositionAttribute() != Q_NULLPTR)
+ m_boundingPositionAttribute = geometry->boundingVolumePositionAttribute()->id();
}
}
@@ -105,8 +104,8 @@ void Geometry::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
case NodeUpdated:
// Note: doesn't set dirtyness as this parameter changing doesn't need
// a new VAO update.
- if (propertyName == QByteArrayLiteral("boundingVolumeSpecifierPositionAttribute")) {
- m_boundingPositionAttribute = propertyChange->value().value<Qt3DCore::QNodeId>();
+ if (propertyName == QByteArrayLiteral("boundingVolumePositionAttribute")) {
+ m_boundingPositionAttribute = propertyChange->value().value<QNodeId>();
break;
}