summaryrefslogtreecommitdiffstats
path: root/src/render/backend/triangleboundingvolume_p.h
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2017-01-18 21:41:38 +0000
committerSean Harmer <sean.harmer@kdab.com>2017-01-20 15:03:41 +0000
commitf5df989ff9a0ff902784ec1fa94bf29d18e428b9 (patch)
tree38bfde4684eaad872a66061a65287e9ad614400a /src/render/backend/triangleboundingvolume_p.h
parent2499faac0856a25735e403e9b174a005d565c23e (diff)
Namespace ray casting classes
Main usage to namespace QBoundingVolume, QBoundingSphere for future use. Renamed QBoundingSphere to BoundingSphere to avoid clashes in file names. Change-Id: I0adcb3c3a5f1b8134653773a8e21490ecf61bae4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend/triangleboundingvolume_p.h')
-rw-r--r--src/render/backend/triangleboundingvolume_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/backend/triangleboundingvolume_p.h b/src/render/backend/triangleboundingvolume_p.h
index cc394041b..1163efc46 100644
--- a/src/render/backend/triangleboundingvolume_p.h
+++ b/src/render/backend/triangleboundingvolume_p.h
@@ -61,14 +61,14 @@ namespace Qt3DRender {
namespace Render {
-Q_AUTOTEST_EXPORT bool intersectsSegmentTriangle(const QRay3D &ray,
+Q_AUTOTEST_EXPORT bool intersectsSegmentTriangle(const RayCasting::QRay3D &ray,
const QVector3D &a,
const QVector3D &b,
const QVector3D &c,
QVector3D &uvw,
float &t);
-class Q_AUTOTEST_EXPORT TriangleBoundingVolume : public QBoundingVolume
+class Q_AUTOTEST_EXPORT TriangleBoundingVolume : public RayCasting::QBoundingVolume
{
public:
TriangleBoundingVolume();
@@ -78,7 +78,7 @@ public:
const QVector3D &c);
Qt3DCore::QNodeId id() const Q_DECL_FINAL;
- bool intersects(const QRay3D &ray, QVector3D *q) const Q_DECL_FINAL;
+ bool intersects(const RayCasting::QRay3D &ray, QVector3D *q) const Q_DECL_FINAL;
Type type() const Q_DECL_FINAL;
QVector3D a() const;