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>

15 files changed, 49 insertions, 21 deletions

diff --git a/src/render/raycasting/qboundingsphere.cpp b/src/render/raycasting/boundingsphere.cpp
index 035f7914d..9c854056a 100644
--- a/src/render/raycasting/qboundingsphere.cpp
+++ b/src/render/raycasting/boundingsphere.cpp
@@ -37,20 +37,22 @@
 **
 ****************************************************************************/
 
-#include "qboundingsphere_p.h"
+#include "boundingsphere_p.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
+namespace RayCasting {
 
-QBoundingSphere::QBoundingSphere()
+BoundingSphere::BoundingSphere()
 {
 }
 
-QBoundingSphere::~QBoundingSphere()
+BoundingSphere::~BoundingSphere()
 {
 }
 
+} // namespace RayCasting
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/raycasting/qboundingsphere_p.h b/src/render/raycasting/boundingsphere_p.h
index c560bdb8e..63bd8a562 100644
--- a/src/render/raycasting/qboundingsphere_p.h
+++ b/src/render/raycasting/boundingsphere_p.h
@@ -37,8 +37,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_QBOUNDINGSPHERE_P_H
-#define QT3DRENDER_QBOUNDINGSPHERE_P_H
+#ifndef QT3DRENDER_BOUNDINGSPHERE_P_H
+#define QT3DRENDER_BOUNDINGSPHERE_P_H
 
 //
 //  W A R N I N G
@@ -57,19 +57,21 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
+namespace RayCasting {
 
-class QT3DRENDERSHARED_EXPORT QBoundingSphere : public QBoundingVolume
+class QT3DRENDERSHARED_EXPORT BoundingSphere : public QBoundingVolume
 {
 public:
-    QBoundingSphere();
-    ~QBoundingSphere();
+    BoundingSphere();
+    ~BoundingSphere();
 
     virtual QVector3D center() const = 0;
     virtual float radius() const = 0;
 };
 
+} // namespace RayCasting
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_QBOUNDINGSPHERE_P_H
+#endif // QT3DRENDER_BOUNDINGSPHERE_P_H
diff --git a/src/render/raycasting/qabstractcollisionqueryservice.cpp b/src/render/raycasting/qabstractcollisionqueryservice.cpp
index 4c59b6aab..132af00c9 100644
--- a/src/render/raycasting/qabstractcollisionqueryservice.cpp
+++ b/src/render/raycasting/qabstractcollisionqueryservice.cpp
@@ -44,6 +44,7 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
+namespace RayCasting {
 
 QAbstractCollisionQueryService::QAbstractCollisionQueryService(const QString &description)
     : QAbstractServiceProvider(*new QAbstractCollisionQueryServicePrivate(description))
@@ -65,6 +66,7 @@ void QAbstractCollisionQueryService::addEntityHit(QCollisionQueryResult &result,
     result.d_func()->addEntityHit(entity, intersection, distance);
 }
 
+} // RayCasting
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/raycasting/qabstractcollisionqueryservice_p.h b/src/render/raycasting/qabstractcollisionqueryservice_p.h
index d26eacb98..e2f9fb65a 100644
--- a/src/render/raycasting/qabstractcollisionqueryservice_p.h
+++ b/src/render/raycasting/qabstractcollisionqueryservice_p.h
@@ -63,6 +63,7 @@ QT_BEGIN_NAMESPACE
 
 class QAbstractCollisionQueryServicePrivate;
 namespace Qt3DRender {
+namespace RayCasting {
 
 class QRay3D;
 class QBoundingVolume;
@@ -101,10 +102,11 @@ private:
     Q_DECLARE_PRIVATE(QAbstractCollisionQueryService)
 };
 
+} // RayCasting
 } // Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3DRender::QAbstractCollisionQueryService::QueryMode) // LCOV_EXCL_LINE
+Q_DECLARE_METATYPE(Qt3DRender::RayCasting::QAbstractCollisionQueryService::QueryMode) // LCOV_EXCL_LINE
 
 #endif // QT3DRENDER_QABSTRACTCOLLISIONQUERYSERVICE_P_H
diff --git a/src/render/raycasting/qboundingvolume.cpp b/src/render/raycasting/qboundingvolume.cpp
index fa732d9a8..c7077530f 100644
--- a/src/render/raycasting/qboundingvolume.cpp
+++ b/src/render/raycasting/qboundingvolume.cpp
@@ -42,6 +42,7 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
+namespace RayCasting {
 
 QBoundingVolume::QBoundingVolume()
 {
@@ -51,6 +52,7 @@ QBoundingVolume::~QBoundingVolume()
 {
 }
 
+} // namespace RayCasting
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/raycasting/qboundingvolume_p.h b/src/render/raycasting/qboundingvolume_p.h
index a69530246..f29d08d52 100644
--- a/src/render/raycasting/qboundingvolume_p.h
+++ b/src/render/raycasting/qboundingvolume_p.h
@@ -56,6 +56,8 @@
 
 QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
+namespace RayCasting {
+
 class QRay3D;
 
 class QT3DRENDERSHARED_EXPORT QBoundingVolume
@@ -75,10 +77,11 @@ public:
     virtual Type type() const = 0;
 };
 
+} // namespace RayCasting
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(Qt3DRender::QBoundingVolume*) // LCOV_EXCL_LINE
+Q_DECLARE_METATYPE(Qt3DRender::RayCasting::QBoundingVolume*) // LCOV_EXCL_LINE
 
 #endif // QT3DRENDER_QBOUNDINGVOLUME_P_H
diff --git a/src/render/raycasting/qboundingvolumeprovider.cpp b/src/render/raycasting/qboundingvolumeprovider.cpp
index 4bc1f4996..a6a0d098c 100644
--- a/src/render/raycasting/qboundingvolumeprovider.cpp
+++ b/src/render/raycasting/qboundingvolumeprovider.cpp
@@ -43,13 +43,14 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
+namespace RayCasting {
 
 QBoundingVolumeProvider::~QBoundingVolumeProvider()
 {
 
 }
 
-
+} // RayCasting
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/raycasting/qboundingvolumeprovider_p.h b/src/render/raycasting/qboundingvolumeprovider_p.h
index f73e7327c..ae9fd65e3 100644
--- a/src/render/raycasting/qboundingvolumeprovider_p.h
+++ b/src/render/raycasting/qboundingvolumeprovider_p.h
@@ -56,6 +56,7 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
+namespace RayCasting {
 
 class QBoundingVolume;
 
@@ -66,6 +67,7 @@ public:
     virtual QVector<QBoundingVolume *> boundingVolumes() const = 0;
 };
 
+} // namespace RayCasting
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/raycasting/qcollisionqueryresult.cpp b/src/render/raycasting/qcollisionqueryresult.cpp
index e4a6afa69..4d887d287 100644
--- a/src/render/raycasting/qcollisionqueryresult.cpp
+++ b/src/render/raycasting/qcollisionqueryresult.cpp
@@ -42,6 +42,7 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
+namespace RayCasting {
 
 QCollisionQueryResultPrivate::QCollisionQueryResultPrivate()
     : QSharedData()
@@ -122,6 +123,7 @@ QQueryHandle QCollisionQueryResult::handle() const
     return d->m_handle;
 }
 
+} // RayCasting
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/raycasting/qcollisionqueryresult_p.h b/src/render/raycasting/qcollisionqueryresult_p.h
index 81bca98b6..18b45370a 100644
--- a/src/render/raycasting/qcollisionqueryresult_p.h
+++ b/src/render/raycasting/qcollisionqueryresult_p.h
@@ -60,6 +60,7 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
+namespace RayCasting {
 
 typedef int QQueryHandle;
 class QCollisionQueryResultPrivate;
@@ -69,7 +70,7 @@ class QT3DRENDERSHARED_EXPORT QCollisionQueryResult
 public:
     struct Hit {
         Hit() : m_distance(-1.f), m_triangleIndex(0) { m_vertexIndex[0] = m_vertexIndex[1] = m_vertexIndex[2] = 0; }
-        Hit(Qt3DCore::QNodeId entity, const QVector3D &intersection, float distance) : m_entityId(entity), m_intersection(intersection), m_distance(distance) { }
+        Hit(const Qt3DCore::QNodeId &entity, const QVector3D &intersection, float distance) : m_entityId(entity), m_intersection(intersection), m_distance(distance) { }
         Qt3DCore::QNodeId m_entityId;
         QVector3D m_intersection;
         float m_distance;
@@ -112,8 +113,8 @@ private:
         return d_ptr.constData();
     }
 };
-QT3D_DECLARE_TYPEINFO(Qt3DRender, QCollisionQueryResult::Hit, Q_PRIMITIVE_TYPE)
-QT3D_DECLARE_SHARED(Qt3DRender, QCollisionQueryResult)
+QT3D_DECLARE_TYPEINFO_2(Qt3DRender, RayCasting, QCollisionQueryResult::Hit, Q_PRIMITIVE_TYPE)
+QT3D_DECLARE_SHARED_2(Qt3DRender, RayCasting, QCollisionQueryResult)
 
 class QCollisionQueryResultPrivate : public QSharedData
 {
@@ -133,6 +134,7 @@ inline bool operator==(const QCollisionQueryResult::Hit& left, const QCollisionQ
     return left.m_entityId == right.m_entityId;
 }
 
+} // RayCasting
 } // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/raycasting/qray3d.cpp b/src/render/raycasting/qray3d.cpp
index f48ce903d..3f136deb8 100644
--- a/src/render/raycasting/qray3d.cpp
+++ b/src/render/raycasting/qray3d.cpp
@@ -44,6 +44,7 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
+namespace RayCasting {
 
 /*!
     \class Qt3DRender::QRay3D
@@ -371,6 +372,7 @@ QDataStream &operator>>(QDataStream &stream, QRay3D &ray)
 
 #endif // QT_NO_DATASTREAM
 
+}  // namespace RayCasting
 }  // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/raycasting/qray3d_p.h b/src/render/raycasting/qray3d_p.h
index d1fce726d..7c1156b76 100644
--- a/src/render/raycasting/qray3d_p.h
+++ b/src/render/raycasting/qray3d_p.h
@@ -59,6 +59,7 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
+namespace RayCasting {
 
 class QT3DRENDERSHARED_EXPORT QRay3D
 {
@@ -97,7 +98,7 @@ private:
     QVector3D m_direction;
     float m_distance;
 };
-QT3D_DECLARE_TYPEINFO(Qt3DRender, QRay3D, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_2(Qt3DRender, RayCasting, QRay3D, Q_MOVABLE_TYPE)
 
 
 #ifndef QT_NO_DEBUG_STREAM
@@ -109,15 +110,16 @@ QT3DRENDERSHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const QRay3
 QT3DRENDERSHARED_EXPORT QDataStream &operator>>(QDataStream &stream, QRay3D &ray);
 #endif
 
+} // namespace RayCasting
 } // namespace Qt3DRender
 QT_END_NAMESPACE
 
-inline bool qFuzzyCompare(const Qt3DRender::QRay3D &ray1, const Qt3DRender::QRay3D &ray2)
+inline bool qFuzzyCompare(const Qt3DRender::RayCasting::QRay3D &ray1, const Qt3DRender::RayCasting::QRay3D &ray2)
 {
     return qFuzzyCompare(ray1.origin(), ray2.origin()) &&
            qFuzzyCompare(ray1.direction(), ray2.direction());
 }
 
-Q_DECLARE_METATYPE(Qt3DRender::QRay3D) // LCOV_EXCL_LINE
+Q_DECLARE_METATYPE(Qt3DRender::RayCasting::QRay3D) // LCOV_EXCL_LINE
 
 #endif // QT3DRENDER_QRAY3D_H
diff --git a/src/render/raycasting/qraycastingservice.cpp b/src/render/raycasting/qraycastingservice.cpp
index 6dfb1c57a..e92234836 100644
--- a/src/render/raycasting/qraycastingservice.cpp
+++ b/src/render/raycasting/qraycastingservice.cpp
@@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE
 using namespace Qt3DCore;
 
 namespace Qt3DRender {
+namespace RayCasting {
 
 namespace {
 
@@ -144,7 +145,7 @@ QCollisionQueryResult QRayCastingServicePrivate::collides(const QRay3D &ray, QBo
     return result;
 }
 
-QCollisionQueryResult::Hit QRayCastingServicePrivate::collides(const QRay3D &ray, const Qt3DRender::QBoundingVolume *volume)
+QCollisionQueryResult::Hit QRayCastingServicePrivate::collides(const QRay3D &ray, const QBoundingVolume *volume)
 {
     QCollisionQueryResult::Hit result;
     Hit hit = volumeRayIntersection(volume, ray);
@@ -213,6 +214,7 @@ QVector<QCollisionQueryResult> QRayCastingService::fetchAllResults() const
     return results;
 }
 
+} // namespace RayCasting
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/raycasting/qraycastingservice_p.h b/src/render/raycasting/qraycastingservice_p.h
index c02104d7c..926f896f0 100644
--- a/src/render/raycasting/qraycastingservice_p.h
+++ b/src/render/raycasting/qraycastingservice_p.h
@@ -62,6 +62,7 @@
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
+namespace RayCasting {
 
 class QBoundingVolumeProvider;
 class QRayCastingServicePrivate;
@@ -112,6 +113,7 @@ public:
     QAtomicInt m_handlesCount;
 };
 
+} // namespace RayCasting
 } // namespace Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/render/raycasting/raycasting.pri b/src/render/raycasting/raycasting.pri
index 2aeb2a461..6add99d24 100644
--- a/src/render/raycasting/raycasting.pri
+++ b/src/render/raycasting/raycasting.pri
@@ -2,7 +2,7 @@ INCLUDEPATH += $$PWD
 
 HEADERS += \
     $$PWD/qabstractcollisionqueryservice_p.h \
-    $$PWD/qboundingsphere_p.h \
+    $$PWD/boundingsphere_p.h \
     $$PWD/qboundingvolume_p.h \
     $$PWD/qboundingvolumeprovider_p.h \
     $$PWD/qcollisionqueryresult_p.h \
@@ -11,7 +11,7 @@ HEADERS += \
 
 SOURCES += \
     $$PWD/qabstractcollisionqueryservice.cpp \
-    $$PWD/qboundingsphere.cpp \
+    $$PWD/boundingsphere.cpp \
     $$PWD/qboundingvolume.cpp \
     $$PWD/qboundingvolumeprovider.cpp \
     $$PWD/qcollisionqueryresult.cpp \