diff options
Diffstat (limited to 'src/render/frontend/sphere.h')
| -rw-r--r-- | src/render/frontend/sphere.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/render/frontend/sphere.h b/src/render/frontend/sphere.h index 8d01b4771..e14ecc38b 100644 --- a/src/render/frontend/sphere.h +++ b/src/render/frontend/sphere.h @@ -46,18 +46,18 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DRender { -class QT3DRENDERERSHARED_EXPORT Sphere : public QBoundingSphere +class QT3DRENDERERSHARED_EXPORT Sphere : public Qt3D::QBoundingSphere { public: - inline Sphere(const QNodeId &i = QNodeId()) + inline Sphere(const Qt3D::QNodeId &i = Qt3D::QNodeId()) : m_center() , m_radius(0.0f) , m_id(i) {} - inline Sphere(const QVector3D &c, float r, const QNodeId &i = QNodeId()) + inline Sphere(const QVector3D &c, float r, const Qt3D::QNodeId &i = Qt3D::QNodeId()) : m_center(c) , m_radius(r) , m_id(i) @@ -89,8 +89,8 @@ public: return *this; } - QNodeId id() const Q_DECL_FINAL; - bool intersects(const QRay3D &ray, QVector3D *q) const Q_DECL_FINAL; + Qt3D::QNodeId id() const Q_DECL_FINAL; + bool intersects(const Qt3D::QRay3D &ray, QVector3D *q) const Q_DECL_FINAL; Type type() const Q_DECL_FINAL; static Sphere fromPoints(const QVector<QVector3D> &points); @@ -98,7 +98,7 @@ public: private: QVector3D m_center; float m_radius; - QNodeId m_id; + Qt3D::QNodeId m_id; static const float ms_epsilon; }; @@ -145,6 +145,6 @@ inline bool intersects(const Sphere &a, const Sphere &b) QT_END_NAMESPACE -Q_DECLARE_METATYPE(Qt3D::Sphere) +Q_DECLARE_METATYPE(Qt3DRender::Sphere) #endif // SPHERE_H |