diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-10-20 08:44:50 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2014-10-22 10:45:16 +0200 |
| commit | 5d31b5f774475f87a00447c4eac6eb96e9651675 (patch) | |
| tree | e0206fbc355033b2d41a2ef423feb5c8fc488e8e /src/render/io/qmeshdata_p.h | |
| parent | 0c8a6df93997e7aba0c8269ce986bd8fe4168d5b (diff) | |
QAbstractMeshData merged with QMeshData and moved to Renderer
That implied moving QAbstractMesh to Renderer as well.
Change-Id: I9013bf0458b849f7805d214a70580a80e86d8c84
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/io/qmeshdata_p.h')
| -rw-r--r-- | src/render/io/qmeshdata_p.h | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/src/render/io/qmeshdata_p.h b/src/render/io/qmeshdata_p.h index 9776e2719..774626754 100644 --- a/src/render/io/qmeshdata_p.h +++ b/src/render/io/qmeshdata_p.h @@ -42,20 +42,34 @@ #ifndef QT3D_QMESHDATA_P_H #define QT3D_QMESHDATA_P_H -#include <private/qabstractmeshdata_p.h> -#include <Qt3DRenderer/qt3drenderer_global.h> -#include <Qt3DRenderer/qmeshdata.h> +#include <Qt3DCore/qt3dcore_global.h> +#include <Qt3DCore/axisalignedboundingbox.h> + +#include <QMap> +#include <QSharedPointer> QT_BEGIN_NAMESPACE namespace Qt3D { -class QT3DRENDERERSHARED_EXPORT QMeshDataPrivate : public QAbstractMeshDataPrivate +class QMeshData; +class QAbstractAttribute; +class QAbstractBuffer; + +typedef QSharedPointer<QAbstractAttribute> QAbstractAttributePtr; + +class QT3DCORESHARED_EXPORT QMeshDataPrivate { public: QMeshDataPrivate(QMeshData *qq); Q_DECLARE_PUBLIC(QMeshData) + QMeshData *q_ptr; + + QMap<QString, QAbstractAttributePtr> m_attributes; + QAbstractAttributePtr m_indexAttr; + AxisAlignedBoundingBox m_bbox; + int m_verticesPerPatch; int m_primitiveType; }; |