diff options
Diffstat (limited to 'src/extras/geometries/qtorusgeometry.h')
-rw-r--r-- | src/extras/geometries/qtorusgeometry.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/extras/geometries/qtorusgeometry.h b/src/extras/geometries/qtorusgeometry.h index cd4a4bb06..3fe159aa7 100644 --- a/src/extras/geometries/qtorusgeometry.h +++ b/src/extras/geometries/qtorusgeometry.h @@ -41,31 +41,31 @@ #define QT3DEXTRAS_QTORUSGEOMETRY_H #include <Qt3DExtras/qt3dextras_global.h> -#include <Qt3DRender/qgeometry.h> +#include <Qt3DCore/qgeometry.h> QT_BEGIN_NAMESPACE -namespace Qt3DRender { +namespace Qt3DCore { class QAttribute; -} // Qt3DRender +} // Qt3DCore namespace Qt3DExtras { class QTorusGeometryPrivate; -class Q_3DEXTRASSHARED_EXPORT QTorusGeometry : public Qt3DRender::QGeometry +class Q_3DEXTRASSHARED_EXPORT QTorusGeometry : 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(float minorRadius READ minorRadius WRITE setMinorRadius NOTIFY minorRadiusChanged) - 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 *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 *indexAttribute READ indexAttribute CONSTANT) public: explicit QTorusGeometry(QNode *parent = nullptr); @@ -79,10 +79,10 @@ public: float radius() const; float minorRadius() const; - Qt3DRender::QAttribute *positionAttribute() const; - Qt3DRender::QAttribute *normalAttribute() const; - Qt3DRender::QAttribute *texCoordAttribute() const; - Qt3DRender::QAttribute *indexAttribute() const; + Qt3DCore::QAttribute *positionAttribute() const; + Qt3DCore::QAttribute *normalAttribute() const; + Qt3DCore::QAttribute *texCoordAttribute() const; + Qt3DCore::QAttribute *indexAttribute() const; public Q_SLOTS: void setRings(int rings); |