summaryrefslogtreecommitdiffstats
path: root/src/render/backend/levelofdetail_p.h
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2017-02-16 18:43:53 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-02-24 11:16:02 +0000
commitddc878f2fc978a3b740b7ccf9258c824c6ba959a (patch)
treecfad9b1ded31b3cb6490fa5128742e8aff0cf1d5 /src/render/backend/levelofdetail_p.h
parent42af57acc976cf3142623ac2b13dabbfcf9e643a (diff)
QBoundingSphere cleanup
Is now a Q_GADGET value type Added QBoundingSphere creator functions on QLevelOfDetails and Quick3DLevelOfDetailsLoader Note: cannot be a nested type on QLevelOfDetails as moc doesn't support it Task-number: QTBUG-58892 Change-Id: Ic7b6d68c6e1119c1f61a858f49379efc1e9c2104 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend/levelofdetail_p.h')
-rw-r--r--src/render/backend/levelofdetail_p.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/backend/levelofdetail_p.h b/src/render/backend/levelofdetail_p.h
index 83809a631..05f5686bb 100644
--- a/src/render/backend/levelofdetail_p.h
+++ b/src/render/backend/levelofdetail_p.h
@@ -79,8 +79,9 @@ public:
int currentIndex() const { return m_currentIndex; }
QLevelOfDetail::ThresholdType thresholdType() const { return m_thresholdType; }
QVector<qreal> thresholds() const { return m_thresholds; }
- float radius() const { return m_radius; }
- QVector3D center() const { return m_center; }
+ float radius() const { return m_volumeOverride.radius(); }
+ QVector3D center() const { return m_volumeOverride.center(); }
+ bool hasBoundingVolumeOverride() const { return !m_volumeOverride.isEmpty(); }
void setCurrentIndex(int currentIndex);
@@ -90,8 +91,7 @@ private:
int m_currentIndex;
QLevelOfDetail::ThresholdType m_thresholdType;
QVector<qreal> m_thresholds;
- float m_radius;
- QVector3D m_center;
+ QLevelOfDetailBoundingSphere m_volumeOverride;
};
} // namespace Render