diff options
Diffstat (limited to 'src/extras/geometries/qspheregeometry.h')
-rw-r--r-- | src/extras/geometries/qspheregeometry.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/extras/geometries/qspheregeometry.h b/src/extras/geometries/qspheregeometry.h index 8bd8c9c94..8f42e4a31 100644 --- a/src/extras/geometries/qspheregeometry.h +++ b/src/extras/geometries/qspheregeometry.h @@ -40,33 +40,33 @@ #ifndef QT3DEXTRAS_QSPHEREGEOMETRY_H #define QT3DEXTRAS_QSPHEREGEOMETRY_H -#include <Qt3DRender/qgeometry.h> +#include <Qt3DCore/qgeometry.h> #include <Qt3DExtras/qt3dextras_global.h> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DCore { class QAttribute; -} // Qt3DRender +} // Qt3DCore namespace Qt3DExtras { class QSphereGeometryPrivate; -class Q_3DEXTRASSHARED_EXPORT QSphereGeometry : public Qt3DRender::QGeometry +class Q_3DEXTRASSHARED_EXPORT QSphereGeometry : public Qt3DCore::QGeometry { Q_OBJECT Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged) Q_PROPERTY(int slices READ slices WRITE setSlices NOTIFY slicesChanged) Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged) Q_PROPERTY(bool generateTangents READ generateTangents WRITE setGenerateTangents NOTIFY generateTangentsChanged) - Q_PROPERTY(Qt3DRender::QAttribute *positionAttribute READ positionAttribute CONSTANT) - Q_PROPERTY(Qt3DRender::QAttribute *normalAttribute READ normalAttribute CONSTANT) - Q_PROPERTY(Qt3DRender::QAttribute *texCoordAttribute READ texCoordAttribute CONSTANT) - Q_PROPERTY(Qt3DRender::QAttribute *tangentAttribute READ tangentAttribute CONSTANT) - Q_PROPERTY(Qt3DRender::QAttribute *indexAttribute READ indexAttribute CONSTANT) + Q_PROPERTY(Qt3DCore::QAttribute *positionAttribute READ positionAttribute CONSTANT) + Q_PROPERTY(Qt3DCore::QAttribute *normalAttribute READ normalAttribute CONSTANT) + Q_PROPERTY(Qt3DCore::QAttribute *texCoordAttribute READ texCoordAttribute CONSTANT) + Q_PROPERTY(Qt3DCore::QAttribute *tangentAttribute READ tangentAttribute CONSTANT) + Q_PROPERTY(Qt3DCore::QAttribute *indexAttribute READ indexAttribute CONSTANT) public: explicit QSphereGeometry(QNode *parent = nullptr); @@ -80,11 +80,11 @@ public: int slices() const; float radius() const; - Qt3DRender::QAttribute *positionAttribute() const; - Qt3DRender::QAttribute *normalAttribute() const; - Qt3DRender::QAttribute *texCoordAttribute() const; - Qt3DRender::QAttribute *tangentAttribute() const; - Qt3DRender::QAttribute *indexAttribute() const; + Qt3DCore::QAttribute *positionAttribute() const; + Qt3DCore::QAttribute *normalAttribute() const; + Qt3DCore::QAttribute *texCoordAttribute() const; + Qt3DCore::QAttribute *tangentAttribute() const; + Qt3DCore::QAttribute *indexAttribute() const; public Q_SLOTS: void setRings(int rings); |