summaryrefslogtreecommitdiffstats
path: root/src/render/geometry/qgeometryrenderer.h
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@theqtcompany.com>2015-12-08 11:50:37 +0200
committerTomi Korpipää <tomi.korpipaa@theqtcompany.com>2015-12-09 05:18:19 +0000
commit0e15154c9f0d982096a551efc53fd363d2b2f68d (patch)
tree4917ca73c44a92297db7cc3dbd72d2716481ccc7 /src/render/geometry/qgeometryrenderer.h
parent036ea9fcfdd343c805e1a900528e7a2367d6c373 (diff)
Added parameters to signals and made setters Q_SLOTS
Change-Id: Icec2f9f207221e35ffdeeb594bb9b4dc6ef890f1 Task-number: QTBUG-49797 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/geometry/qgeometryrenderer.h')
-rw-r--r--src/render/geometry/qgeometryrenderer.h20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/render/geometry/qgeometryrenderer.h b/src/render/geometry/qgeometryrenderer.h
index 4898b15bc..e58b648b3 100644
--- a/src/render/geometry/qgeometryrenderer.h
+++ b/src/render/geometry/qgeometryrenderer.h
@@ -93,8 +93,11 @@ public:
bool primitiveRestart() const;
QGeometry *geometry() const;
PrimitiveType primitiveType() const;
+
QGeometryFunctorPtr geometryFunctor() const;
+ void setGeometryFunctor(const QGeometryFunctorPtr &functor);
+public Q_SLOTS:
void setInstanceCount(int instanceCount);
void setPrimitiveCount(int primitiveCount);
void setBaseVertex(int baseVertex);
@@ -103,17 +106,16 @@ public:
void setPrimitiveRestart(bool enabled);
void setGeometry(QGeometry *geometry);
void setPrimitiveType(PrimitiveType primitiveType);
- void setGeometryFunctor(const QGeometryFunctorPtr &functor);
Q_SIGNALS:
- void instanceCountChanged();
- void primitiveCountChanged();
- void baseVertexChanged();
- void baseInstanceChanged();
- void restartIndexChanged();
- void primitiveRestartChanged();
- void geometryChanged();
- void primitiveTypeChanged();
+ void instanceCountChanged(int instanceCount);
+ void primitiveCountChanged(int primitiveCount);
+ void baseVertexChanged(int baseVertex);
+ void baseInstanceChanged(int baseInstance);
+ void restartIndexChanged(int restartIndex);
+ void primitiveRestartChanged(bool primitiveRestart);
+ void geometryChanged(QGeometry *geometry);
+ void primitiveTypeChanged(PrimitiveType primitiveType);
protected:
QGeometryRenderer(QGeometryRendererPrivate &dd, Qt3DCore::QNode *parent = 0);