diff options
Diffstat (limited to 'src/render/geometry/qgeometryrenderer.h')
| -rw-r--r-- | src/render/geometry/qgeometryrenderer.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 5a98329f6..435a315ad 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -41,11 +41,17 @@ #define QT3DRENDER_QGEOMETRYRENDERER_H #include <Qt3DCore/qcomponent.h> -#include <Qt3DRender/qgeometry.h> +#include <Qt3DCore/qgeometry.h> #include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE +namespace Qt3DCore { +class QGeometryFactory; + +typedef QSharedPointer<QGeometryFactory> QGeometryFactoryPtr; +} + namespace Qt3DRender { class QGeometryRendererPrivate; @@ -62,7 +68,7 @@ class Q_3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent Q_PROPERTY(int restartIndexValue READ restartIndexValue WRITE setRestartIndexValue NOTIFY restartIndexValueChanged) Q_PROPERTY(int verticesPerPatch READ verticesPerPatch WRITE setVerticesPerPatch NOTIFY verticesPerPatchChanged) Q_PROPERTY(bool primitiveRestartEnabled READ primitiveRestartEnabled WRITE setPrimitiveRestartEnabled NOTIFY primitiveRestartEnabledChanged) - Q_PROPERTY(Qt3DRender::QGeometry* geometry READ geometry WRITE setGeometry NOTIFY geometryChanged) + Q_PROPERTY(Qt3DCore::QGeometry* geometry READ geometry WRITE setGeometry NOTIFY geometryChanged) Q_PROPERTY(PrimitiveType primitiveType READ primitiveType WRITE setPrimitiveType NOTIFY primitiveTypeChanged) public: @@ -97,7 +103,7 @@ public: int restartIndexValue() const; int verticesPerPatch() const; bool primitiveRestartEnabled() const; - QGeometry *geometry() const; + Qt3DCore::QGeometry *geometry() const; PrimitiveType primitiveType() const; public Q_SLOTS: @@ -110,7 +116,7 @@ public Q_SLOTS: void setRestartIndexValue(int index); void setVerticesPerPatch(int verticesPerPatch); void setPrimitiveRestartEnabled(bool enabled); - void setGeometry(QGeometry *geometry); + void setGeometry(Qt3DCore::QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); Q_SIGNALS: @@ -123,7 +129,7 @@ Q_SIGNALS: void restartIndexValueChanged(int restartIndexValue); void verticesPerPatchChanged(int verticesPerPatch); void primitiveRestartEnabledChanged(bool primitiveRestartEnabled); - void geometryChanged(QGeometry *geometry); + void geometryChanged(Qt3DCore::QGeometry *geometry); void primitiveTypeChanged(PrimitiveType primitiveType); protected: |