diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2017-02-16 18:43:53 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-02-24 11:16:02 +0000 |
commit | ddc878f2fc978a3b740b7ccf9258c824c6ba959a (patch) | |
tree | cfad9b1ded31b3cb6490fa5128742e8aff0cf1d5 /src/render/frontend/qlevelofdetail_p.h | |
parent | 42af57acc976cf3142623ac2b13dabbfcf9e643a (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/frontend/qlevelofdetail_p.h')
-rw-r--r-- | src/render/frontend/qlevelofdetail_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/frontend/qlevelofdetail_p.h b/src/render/frontend/qlevelofdetail_p.h index ab25e9ad3..1d7a05a71 100644 --- a/src/render/frontend/qlevelofdetail_p.h +++ b/src/render/frontend/qlevelofdetail_p.h @@ -53,6 +53,7 @@ #include <private/qcomponent_p.h> #include <qlevelofdetail.h> +#include <Qt3DRender/qlevelofdetailboundingsphere.h> #include <QVector3D> @@ -74,7 +75,7 @@ public: int m_currentIndex; QLevelOfDetail::ThresholdType m_thresholdType; QVector<qreal> m_thresholds; - QPointer<QBoundingSphere> m_volumeOverride; + QLevelOfDetailBoundingSphere m_volumeOverride; }; struct QLevelOfDetailData @@ -83,8 +84,7 @@ struct QLevelOfDetailData int currentIndex; QLevelOfDetail::ThresholdType thresholdType; QVector<qreal> thresholds; - float radius; - QVector3D center; + QLevelOfDetailBoundingSphere volumeOverride; }; } // namespace Qt3DRender |