diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-02-11 14:14:30 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-02-27 12:10:04 +0000 |
| commit | 703090204ef41bced5634bbb332551dea1dd7b37 (patch) | |
| tree | a2e65326b1783d9cce71436bf787d2bdcfd106df /src/render/geometry/qgeometryrenderer.h | |
| parent | 17706144e9dc6c2dfde580b7821f18c5f6924682 (diff) | |
Introduce QGeometryView
Like QGeometryRenderer but not for rendering. A renderer can now be
given a view to render. Further down the line, picking and bounding
volume will be able to be given a view (could use a simplified
non-renderered proxy to calculate the bounding volume).
Change-Id: Ibe18b6e1d7c973e572bb3f2199c0776a4fc6c0e7
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry/qgeometryrenderer.h')
| -rw-r--r-- | src/render/geometry/qgeometryrenderer.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h index 435a315ad..0eee34b86 100644 --- a/src/render/geometry/qgeometryrenderer.h +++ b/src/render/geometry/qgeometryrenderer.h @@ -42,16 +42,11 @@ #include <Qt3DCore/qcomponent.h> #include <Qt3DCore/qgeometry.h> +#include <Qt3DCore/qgeometryview.h> #include <Qt3DRender/qt3drender_global.h> QT_BEGIN_NAMESPACE -namespace Qt3DCore { -class QGeometryFactory; - -typedef QSharedPointer<QGeometryFactory> QGeometryFactoryPtr; -} - namespace Qt3DRender { class QGeometryRendererPrivate; @@ -70,7 +65,7 @@ class Q_3DRENDERSHARED_EXPORT QGeometryRenderer : public Qt3DCore::QComponent Q_PROPERTY(bool primitiveRestartEnabled READ primitiveRestartEnabled WRITE setPrimitiveRestartEnabled NOTIFY primitiveRestartEnabledChanged) Q_PROPERTY(Qt3DCore::QGeometry* geometry READ geometry WRITE setGeometry NOTIFY geometryChanged) Q_PROPERTY(PrimitiveType primitiveType READ primitiveType WRITE setPrimitiveType NOTIFY primitiveTypeChanged) - + Q_PROPERTY(Qt3DCore::QGeometryView* view READ view WRITE setView NOTIFY viewChanged) public: explicit QGeometryRenderer(Qt3DCore::QNode *parent = nullptr); ~QGeometryRenderer(); @@ -105,6 +100,7 @@ public: bool primitiveRestartEnabled() const; Qt3DCore::QGeometry *geometry() const; PrimitiveType primitiveType() const; + Qt3DCore::QGeometryView *view() const; public Q_SLOTS: void setInstanceCount(int instanceCount); @@ -118,6 +114,7 @@ public Q_SLOTS: void setPrimitiveRestartEnabled(bool enabled); void setGeometry(Qt3DCore::QGeometry *geometry); void setPrimitiveType(PrimitiveType primitiveType); + void setView(Qt3DCore::QGeometryView *view); Q_SIGNALS: void instanceCountChanged(int instanceCount); @@ -131,6 +128,7 @@ Q_SIGNALS: void primitiveRestartEnabledChanged(bool primitiveRestartEnabled); void geometryChanged(Qt3DCore::QGeometry *geometry); void primitiveTypeChanged(PrimitiveType primitiveType); + void viewChanged(Qt3DCore::QGeometryView *view); protected: explicit QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = nullptr); |