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/quick3d/quick3dextras | |
| 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/quick3d/quick3dextras')
| -rw-r--r-- | src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp | 4 | ||||
| -rw-r--r-- | src/quick3d/quick3dextras/items/quick3dlevelofdetailloader_p.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp b/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp index f3d3f4323..c4a35328d 100644 --- a/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp +++ b/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader.cpp @@ -144,13 +144,13 @@ void Quick3DLevelOfDetailLoader::setThresholdType(Qt3DRender::QLevelOfDetail::Th d->m_lod->setThresholdType(thresholdType); } -QVector<qreal> Quick3DLevelOfDetailLoader::thresholds() const +QVector<float> Quick3DLevelOfDetailLoader::thresholds() const { Q_D(const Quick3DLevelOfDetailLoader); return d->m_lod->thresholds(); } -void Quick3DLevelOfDetailLoader::setThresholds(const QVector<qreal> &thresholds) +void Quick3DLevelOfDetailLoader::setThresholds(const QVector<float> &thresholds) { Q_D(Quick3DLevelOfDetailLoader); d->m_lod->setThresholds(thresholds); diff --git a/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader_p.h b/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader_p.h index 1ef359fe7..6eb539e56 100644 --- a/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader_p.h +++ b/src/quick3d/quick3dextras/items/quick3dlevelofdetailloader_p.h @@ -71,7 +71,7 @@ class QT3DQUICKEXTRASSHARED_PRIVATE_EXPORT Quick3DLevelOfDetailLoader : public Q Q_PROPERTY(Qt3DRender::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged) Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged) Q_PROPERTY(Qt3DRender::QLevelOfDetail::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) Q_PROPERTY(QObject *entity READ entity NOTIFY entityChanged) @@ -88,8 +88,8 @@ public: void setCurrentIndex(int currentIndex); Qt3DRender::QLevelOfDetail::ThresholdType thresholdType() const; void setThresholdType(Qt3DRender::QLevelOfDetail::ThresholdType thresholdType); - QVector<qreal> thresholds() const; - void setThresholds(const QVector<qreal> &thresholds); + QVector<float> thresholds() const; + void setThresholds(const QVector<float> &thresholds); Qt3DRender::QBoundingSphere *volumeOverride() const; void setVolumeOverride(Qt3DRender::QBoundingSphere *volumeOverride); |