diff options
Diffstat (limited to 'src/extras/geometries/qspheregeometry_p.h')
-rw-r--r-- | src/extras/geometries/qspheregeometry_p.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/extras/geometries/qspheregeometry_p.h b/src/extras/geometries/qspheregeometry_p.h index 2dc83495e..cf31e17c6 100644 --- a/src/extras/geometries/qspheregeometry_p.h +++ b/src/extras/geometries/qspheregeometry_p.h @@ -51,20 +51,21 @@ // We mean it. // -#include <Qt3DRender/private/qgeometry_p.h> +#include <Qt3DCore/private/qgeometry_p.h> +#include <Qt3DExtras/qspheregeometry.h> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DCore { class QAttribute; class QBuffer; -} // Qt3DRender +} // Qt3DCore namespace Qt3DExtras { -class QSphereGeometryPrivate : public Qt3DRender::QGeometryPrivate +class QSphereGeometryPrivate : public Qt3DCore::QGeometryPrivate { public: QSphereGeometryPrivate(); @@ -74,15 +75,15 @@ public: int m_rings; int m_slices; float m_radius; - Qt3DRender::QAttribute *m_positionAttribute; - Qt3DRender::QAttribute *m_normalAttribute; - Qt3DRender::QAttribute *m_texCoordAttribute; - Qt3DRender::QAttribute *m_tangentAttribute; - Qt3DRender::QAttribute *m_indexAttribute; - Qt3DRender::QBuffer *m_vertexBuffer; - Qt3DRender::QBuffer *m_indexBuffer; - - Q_DECLARE_PUBLIC(QSphereGeometry); + Qt3DCore::QAttribute *m_positionAttribute; + Qt3DCore::QAttribute *m_normalAttribute; + Qt3DCore::QAttribute *m_texCoordAttribute; + Qt3DCore::QAttribute *m_tangentAttribute; + Qt3DCore::QAttribute *m_indexAttribute; + Qt3DCore::QBuffer *m_vertexBuffer; + Qt3DCore::QBuffer *m_indexBuffer; + + Q_DECLARE_PUBLIC(QSphereGeometry) QByteArray generateVertexData() const; QByteArray generateIndexData() const; |