summaryrefslogtreecommitdiffstats
path: root/src/render/io/qmeshdata_p.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2014-11-16 16:37:32 +0000
committerSean Harmer <sean.harmer@kdab.com>2014-11-18 08:19:12 +0100
commit2c40bab456c3ccdeb4b3a24376db9049f4e1f3f9 (patch)
tree2c1cc6dea57ef067ad9c6eba0e807a2d66b5c7ab /src/render/io/qmeshdata_p.h
parent787b65130c31c3a911e760a1387e717940b697ef (diff)
Rename AxisAlignedBoundingBox->QAxisAlignedBoundingBox
We may be able to make this a private class so as to not use up the name for a type we may need to export to QML in order to allow the user to specify a custom bounding box for use with culling if the shader they are using does some non-standard scaling (e.g. instancing). Change-Id: Id7120eba6407060507ac3d4c45061ce9670557c7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/io/qmeshdata_p.h')
-rw-r--r--src/render/io/qmeshdata_p.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/io/qmeshdata_p.h b/src/render/io/qmeshdata_p.h
index 774626754..4774d5915 100644
--- a/src/render/io/qmeshdata_p.h
+++ b/src/render/io/qmeshdata_p.h
@@ -43,7 +43,7 @@
#define QT3D_QMESHDATA_P_H
#include <Qt3DCore/qt3dcore_global.h>
-#include <Qt3DCore/axisalignedboundingbox.h>
+#include <Qt3DCore/qaxisalignedboundingbox.h>
#include <QMap>
#include <QSharedPointer>
@@ -68,7 +68,7 @@ public:
QMap<QString, QAbstractAttributePtr> m_attributes;
QAbstractAttributePtr m_indexAttr;
- AxisAlignedBoundingBox m_bbox;
+ QAxisAlignedBoundingBox m_bbox;
int m_verticesPerPatch;
int m_primitiveType;
};