diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-02-15 10:33:28 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-16 10:29:27 +0000 |
| commit | 5bceaee38908934078bbdb62b564daa68f7e182b (patch) | |
| tree | 6b36e4c2d530b65676b241504210c195aa95ac44 /src/render/frontend/qlevelofdetail.h | |
| parent | 9dd10069ad84a7d51bb890d78f7f5e1e79b94906 (diff) | |
Use QVector<float> in level of detail APIs
For consistency with rest of API and to avoid ambiguity inherent with
qreal.
Task-number: QTBUG-58888
Task-number: QTBUG-58889
Change-Id: Ib8729a11152165caf05ecea63f9e10c4d90689db
Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/render/frontend/qlevelofdetail.h')
| -rw-r--r-- | src/render/frontend/qlevelofdetail.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/frontend/qlevelofdetail.h b/src/render/frontend/qlevelofdetail.h index f3325aea0..39cc8448b 100644 --- a/src/render/frontend/qlevelofdetail.h +++ b/src/render/frontend/qlevelofdetail.h @@ -59,7 +59,7 @@ class QT3DRENDERSHARED_EXPORT QLevelOfDetail : public Qt3DCore::QComponent Q_PROPERTY(Qt3DRender::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) Q_PROPERTY(ThresholdType thresholdType READ thresholdType WRITE setThresholdType NOTIFY thresholdTypeChanged) - Q_PROPERTY(QVector<qreal> thresholds READ thresholds WRITE setThresholds NOTIFY thresholdsChanged) + Q_PROPERTY(QVector<float> thresholds READ thresholds WRITE setThresholds NOTIFY thresholdsChanged) Q_PROPERTY(Qt3DRender::QBoundingSphere *volumeOverride READ volumeOverride WRITE setVolumeOverride NOTIFY volumeOverrideChanged) public: @@ -75,21 +75,21 @@ public: QCamera *camera() const; int currentIndex() const; ThresholdType thresholdType() const; - QVector<qreal> thresholds() const; + QVector<float> thresholds() const; QBoundingSphere *volumeOverride() const; public Q_SLOTS: void setCamera(QCamera *camera); void setCurrentIndex(int currentIndex); void setThresholdType(ThresholdType thresholdType); - void setThresholds(QVector<qreal> thresholds); + void setThresholds(QVector<float> thresholds); void setVolumeOverride(QBoundingSphere *volumeOverride); Q_SIGNALS: void cameraChanged(QCamera *camera); void currentIndexChanged(int currentIndex); void thresholdTypeChanged(ThresholdType thresholdType); - void thresholdsChanged(QVector<qreal> thresholds); + void thresholdsChanged(QVector<float> thresholds); void volumeOverrideChanged(QBoundingSphere *volumeOverride); protected: |