diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-01-22 21:35:32 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2020-02-27 06:29:57 +0000 |
commit | 17706144e9dc6c2dfde580b7821f18c5f6924682 (patch) | |
tree | 5f77929db358607fe63a1d438b7a746a6966cbfb /src/extras/geometries/qconegeometry_p.h | |
parent | 7f625e93620b313466d0223e911c0c3a5b492617 (diff) |
Geometry refactoring
Move QBuffer, QAttribute, QGeometry to Qt3DCore.
Change-Id: I59dfd091eefadcada93350b3aba955f40b304385
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/extras/geometries/qconegeometry_p.h')
-rw-r--r-- | src/extras/geometries/qconegeometry_p.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/extras/geometries/qconegeometry_p.h b/src/extras/geometries/qconegeometry_p.h index 39c3913fc..a87aa41c6 100644 --- a/src/extras/geometries/qconegeometry_p.h +++ b/src/extras/geometries/qconegeometry_p.h @@ -51,20 +51,20 @@ // We mean it. // -#include <Qt3DRender/private/qgeometry_p.h> +#include <Qt3DCore/private/qgeometry_p.h> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DCore { class QAttribute; class QBuffer; -} // namespace Qt3DRender +} // namespace Qt3DCore namespace Qt3DExtras { -class QConeGeometryPrivate : public Qt3DRender::QGeometryPrivate +class QConeGeometryPrivate : public Qt3DCore::QGeometryPrivate { public: QConeGeometryPrivate(); @@ -80,13 +80,13 @@ public: float m_topRadius; float m_bottomRadius; float m_length; - Qt3DRender::QAttribute *m_positionAttribute; - Qt3DRender::QAttribute *m_normalAttribute; - Qt3DRender::QAttribute *m_texCoordAttribute; - Qt3DRender::QAttribute *m_indexAttribute; - Qt3DRender::QBuffer *m_positionBuffer; - Qt3DRender::QBuffer *m_vertexBuffer; - Qt3DRender::QBuffer *m_indexBuffer; + Qt3DCore::QAttribute *m_positionAttribute; + Qt3DCore::QAttribute *m_normalAttribute; + Qt3DCore::QAttribute *m_texCoordAttribute; + Qt3DCore::QAttribute *m_indexAttribute; + Qt3DCore::QBuffer *m_positionBuffer; + Qt3DCore::QBuffer *m_vertexBuffer; + Qt3DCore::QBuffer *m_indexBuffer; QByteArray generateVertexData() const; QByteArray generateIndexData() const; |