Move QRay3D to Qt3DRender and make private

Change-Id: I30f328e1d71d1c27b6647b63cbf480ea0937dd68
Task-Id: QTBUG-51500
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

6 files changed, 49 insertions, 49 deletions

diff --git a/tests/auto/core/core.pro b/tests/auto/core/core.pro
index e76a7d856..9d5b1a1b4 100644
--- a/tests/auto/core/core.pro
+++ b/tests/auto/core/core.pro
@@ -14,7 +14,6 @@ SUBDIRS = \
     qchangearbiter \
     qscene \
     qservicelocator \
-    qray3d \
     qtransform
 
 contains(QT_CONFIG, private_tests) {
diff --git a/tests/auto/core/qray3d/qray3d.pro b/tests/auto/render/qray3d/qray3d.pro
index f86496142..6714b066e 100644
--- a/tests/auto/core/qray3d/qray3d.pro
+++ b/tests/auto/render/qray3d/qray3d.pro
@@ -5,4 +5,4 @@ TEMPLATE = app
 SOURCES += \
     tst_qray3d.cpp
 
-QT += testlib core-private 3dcore 3dcore-private
+QT += testlib core-private 3dcore 3dcore-private 3drender 3drender-private
diff --git a/tests/auto/core/qray3d/tst_qray3d.cpp b/tests/auto/render/qray3d/tst_qray3d.cpp
index 8625bb95b..6297f1c73 100644
--- a/tests/auto/core/qray3d/tst_qray3d.cpp
+++ b/tests/auto/render/qray3d/tst_qray3d.cpp
@@ -28,7 +28,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <Qt3DCore/qray3d.h>
+#include <Qt3DRender/private/qray3d_p.h>
 
 class tst_QRay3D : public QObject
 {
@@ -131,11 +131,11 @@ void tst_QRay3D::create()
 {
     QFETCH(QVector3D, point);
     QFETCH(QVector3D, direction);
-    Qt3DCore::QRay3D ray(point, direction);
+    Qt3DRender::QRay3D ray(point, direction);
     QVERIFY(fuzzyCompare(ray.direction(), direction));
     QVERIFY(fuzzyCompare(ray.origin(), point));
 
-    Qt3DCore::QRay3D ray2;
+    Qt3DRender::QRay3D ray2;
     QCOMPARE(ray2.origin(), QVector3D(0, 0, 0));
     QCOMPARE(ray2.direction(), QVector3D(0, 0, 1));
     ray2.setOrigin(point);
@@ -188,7 +188,7 @@ void tst_QRay3D::projection()
     QFETCH(QVector3D, direction);
     QFETCH(QVector3D, vector);
     QFETCH(QVector3D, expected);
-    Qt3DCore::QRay3D line(point, direction);
+    Qt3DRender::QRay3D line(point, direction);
     QVector3D result = line.project(vector);
     QVERIFY(fuzzyCompare(result, expected));
 }
@@ -237,7 +237,7 @@ void tst_QRay3D::point()
     QFETCH(QVector3D, direction);
     QFETCH(QVector3D, point_on_line_pos_0_6);
     QFETCH(QVector3D, point_on_line_neg_7_2);
-    Qt3DCore::QRay3D line(point, direction);
+    Qt3DRender::QRay3D line(point, direction);
     QVERIFY(fuzzyCompare(line.point(0.6), point_on_line_pos_0_6));
     QVERIFY(fuzzyCompare(line.point(-7.2), point_on_line_neg_7_2));
     QVERIFY(fuzzyCompare(line.projectedDistance(point_on_line_pos_0_6), 0.6));
@@ -327,7 +327,7 @@ void tst_QRay3D::contains_point()
     QFETCH(QVector3D, point);
     QFETCH(bool, contains);
 
-    Qt3DCore::QRay3D line(origin, direction);
+    Qt3DRender::QRay3D line(origin, direction);
     QCOMPARE(line.contains(point), contains);
 }
 
@@ -343,23 +343,23 @@ void tst_QRay3D::contains_ray()
     QFETCH(QVector3D, point);
     QFETCH(bool, contains);
 
-    Qt3DCore::QRay3D line(origin, direction);
+    Qt3DRender::QRay3D line(origin, direction);
     if (contains) {
-        Qt3DCore::QRay3D line2(point, direction);
+        Qt3DRender::QRay3D line2(point, direction);
         QVERIFY(line.contains(line2));
         QVERIFY(line2.contains(line));
 
         // Reversed direction is also contained.
-        Qt3DCore::QRay3D line3(point, -direction);
+        Qt3DRender::QRay3D line3(point, -direction);
         QVERIFY(line.contains(line2));
         QVERIFY(line2.contains(line));
 
         // Different direction.
-        Qt3DCore::QRay3D line4(point, QVector3D(direction.y(), direction.x(), direction.z()));
+        Qt3DRender::QRay3D line4(point, QVector3D(direction.y(), direction.x(), direction.z()));
         QVERIFY(!line.contains(line4));
         QVERIFY(!line4.contains(line));
     } else {
-        Qt3DCore::QRay3D line2(point, direction);
+        Qt3DRender::QRay3D line2(point, direction);
         QVERIFY(!line.contains(line2));
         QVERIFY(!line2.contains(line));
     }
@@ -404,15 +404,15 @@ void tst_QRay3D::distance()
     QFETCH(QVector3D, point);
     QFETCH(float, distance);
 
-    Qt3DCore::QRay3D line(origin, direction);
+    Qt3DRender::QRay3D line(origin, direction);
     QCOMPARE(line.distance(point), distance);
 }
 
 void tst_QRay3D::compare()
 {
-    Qt3DCore::QRay3D ray1(QVector3D(10, 20, 30), QVector3D(-3, -4, -5));
-    Qt3DCore::QRay3D ray2(QVector3D(10, 20, 30), QVector3D(1.5f, 2.0f, 2.5f));
-    Qt3DCore::QRay3D ray3(QVector3D(0, 20, 30), QVector3D(-3, -4, -5));
+    Qt3DRender::QRay3D ray1(QVector3D(10, 20, 30), QVector3D(-3, -4, -5));
+    Qt3DRender::QRay3D ray2(QVector3D(10, 20, 30), QVector3D(1.5f, 2.0f, 2.5f));
+    Qt3DRender::QRay3D ray3(QVector3D(0, 20, 30), QVector3D(-3, -4, -5));
     QVERIFY(ray1 == ray1);
     QVERIFY(!(ray1 != ray1));
     QVERIFY(qFuzzyCompare(ray1, ray1));
@@ -427,7 +427,7 @@ void tst_QRay3D::compare()
 void tst_QRay3D::dataStream()
 {
 #ifndef QT_NO_DATASTREAM
-    Qt3DCore::QRay3D ray(QVector3D(1.0f, 2.0f, 3.0f), QVector3D(4.0f, 5.0f, 6.0f));
+    Qt3DRender::QRay3D ray(QVector3D(1.0f, 2.0f, 3.0f), QVector3D(4.0f, 5.0f, 6.0f));
 
     QByteArray data;
     {
@@ -435,7 +435,7 @@ void tst_QRay3D::dataStream()
         stream << ray;
     }
 
-    Qt3DCore::QRay3D ray2;
+    Qt3DRender::QRay3D ray2;
     {
         QDataStream stream2(data);
         stream2 >> ray2;
@@ -460,9 +460,9 @@ void tst_QRay3D::transform()
     m.rotate(45.0f, 1.0f, 1.0f, 1.0f);
     m.scale(23.5f);
 
-    Qt3DCore::QRay3D ray1(point, direction);
-    Qt3DCore::QRay3D ray2(ray1);
-    Qt3DCore::QRay3D ray3;
+    Qt3DRender::QRay3D ray1(point, direction);
+    Qt3DRender::QRay3D ray2(ray1);
+    Qt3DRender::QRay3D ray3;
 
     ray1.transform(m);
     ray3 = ray2.transformed(m);
@@ -477,15 +477,15 @@ void tst_QRay3D::transform()
 class tst_QRay3DProperties : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3DCore::QRay3D ray READ ray WRITE setRay)
+    Q_PROPERTY(Qt3DRender::QRay3D ray READ ray WRITE setRay)
 public:
     tst_QRay3DProperties(QObject *parent = 0) : QObject(parent) {}
 
-    Qt3DCore::QRay3D ray() const { return r; }
-    void setRay(const Qt3DCore::QRay3D& value) { r = value; }
+    Qt3DRender::QRay3D ray() const { return r; }
+    void setRay(const Qt3DRender::QRay3D& value) { r = value; }
 
 private:
-    Qt3DCore::QRay3D r;
+    Qt3DRender::QRay3D r;
 };
 
 // Test getting and setting properties via the metaobject system.
@@ -493,35 +493,35 @@ void tst_QRay3D::properties()
 {
     tst_QRay3DProperties obj;
 
-    qRegisterMetaType<Qt3DCore::QRay3D>();
+    qRegisterMetaType<Qt3DRender::QRay3D>();
 
-    obj.setRay(Qt3DCore::QRay3D(QVector3D(1, 2, 3), QVector3D(4, 5, 6)));
+    obj.setRay(Qt3DRender::QRay3D(QVector3D(1, 2, 3), QVector3D(4, 5, 6)));
 
-    Qt3DCore::QRay3D r = qvariant_cast<Qt3DCore::QRay3D>(obj.property("ray"));
+    Qt3DRender::QRay3D r = qvariant_cast<Qt3DRender::QRay3D>(obj.property("ray"));
     QCOMPARE(r.origin(), QVector3D(1, 2, 3));
     QCOMPARE(r.direction(), QVector3D(4, 5, 6));
 
     obj.setProperty("ray",
                     qVariantFromValue
-                        (Qt3DCore::QRay3D(QVector3D(-1, -2, -3), QVector3D(-4, -5, -6))));
+                        (Qt3DRender::QRay3D(QVector3D(-1, -2, -3), QVector3D(-4, -5, -6))));
 
-    r = qvariant_cast<Qt3DCore::QRay3D>(obj.property("ray"));
+    r = qvariant_cast<Qt3DRender::QRay3D>(obj.property("ray"));
     QCOMPARE(r.origin(), QVector3D(-1, -2, -3));
     QCOMPARE(r.direction(), QVector3D(-4, -5, -6));
 }
 
 void tst_QRay3D::metaTypes()
 {
-    int id = qMetaTypeId<Qt3DCore::QRay3D>();
-    QVERIFY(QMetaType::type("Qt3DCore::QRay3D") == id);
-    QCOMPARE(QByteArray(QMetaType::typeName(id)), QByteArray("Qt3DCore::QRay3D"));
+    int id = qMetaTypeId<Qt3DRender::QRay3D>();
+    QVERIFY(QMetaType::type("Qt3DRender::QRay3D") == id);
+    QCOMPARE(QByteArray(QMetaType::typeName(id)), QByteArray("Qt3DRender::QRay3D"));
     QVERIFY(QMetaType::isRegistered(id));
 }
 
 void tst_QRay3D::shouldNotAllowNullDirection()
 {
     // GIVEN
-    Qt3DCore::QRay3D ray;
+    Qt3DRender::QRay3D ray;
 
     QCOMPARE(ray.origin(), QVector3D(0, 0, 0));
     QCOMPARE(ray.direction(), QVector3D(0, 0, 1));
diff --git a/tests/auto/render/raycasting/tst_raycasting.cpp b/tests/auto/render/raycasting/tst_raycasting.cpp
index 9a10127dd..7216f7036 100644
--- a/tests/auto/render/raycasting/tst_raycasting.cpp
+++ b/tests/auto/render/raycasting/tst_raycasting.cpp
@@ -33,7 +33,7 @@
 #include <Qt3DRender/private/entity_p.h>
 #include <Qt3DRender/private/pickboundingvolumejob_p.h>
 #include <Qt3DRender/private/qboundingvolumeprovider_p.h>
-#include <Qt3DCore/qray3d.h>
+#include <Qt3DRender/private/qray3d_p.h>
 #include <Qt3DRender/qcamera.h>
 
 using namespace Qt3DCore;
@@ -323,10 +323,10 @@ void tst_RayCasting::mousePicking()
     const QRectF viewport(0.0f, 0.0f, 800.0f, 600.0f);
 
     // Window center on near plane
-    Qt3DCore::QRay3D ray = Qt3DRender::Render::PickBoundingVolumeJob::intersectionRay(viewport.center().toPoint(),
-                                                                                      camera.viewMatrix(),
-                                                                                      camera.projectionMatrix(),
-                                                                                      viewport.toRect());
+    QRay3D ray = Qt3DRender::Render::PickBoundingVolumeJob::intersectionRay(viewport.center().toPoint(),
+                                                                            camera.viewMatrix(),
+                                                                            camera.projectionMatrix(),
+                                                                            viewport.toRect());
     Qt3DRender::Render::Sphere s(QVector3D(0.0f, 0.5f, 0.0f), 1.0f);
 
     // WHEN
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index 3ff200f96..9df90bde5 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -28,6 +28,7 @@ contains(QT_CONFIG, private_tests) {
         qframegraph \
         qlayerfilter \
         qlight \
+        qray3d \
         qrenderpassfilter \
         qrendertargetselector \
         qsortcriterion \
diff --git a/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp b/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp
index a97f0076b..ea9ccc2f5 100644
--- a/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp
+++ b/tests/auto/render/triangleboundingvolume/tst_triangleboundingvolume.cpp
@@ -30,7 +30,7 @@
 #include <Qt3DRender/private/entity_p.h>
 #include <Qt3DRender/private/triangleboundingvolume_p.h>
 #include <Qt3DRender/private/qraycastingservice_p.h>
-#include <Qt3DCore/qray3d.h>
+#include <Qt3DRender/private/qray3d_p.h>
 #include <Qt3DRender/qcameralens.h>
 #include <Qt3DRender/qcamera.h>
 #include <Qt3DRender/private/qboundingvolume_p.h>
@@ -124,7 +124,7 @@ private Q_SLOTS:
 
     void intersects_data()
     {
-        QTest::addColumn<Qt3DCore::QRay3D>("ray");
+        QTest::addColumn<Qt3DRender::QRay3D>("ray");
         QTest::addColumn<QVector3D>("a");
         QTest::addColumn<QVector3D>("b");
         QTest::addColumn<QVector3D>("c");
@@ -135,7 +135,7 @@ private Q_SLOTS:
         const float farPlaneDistance = 40.0;
 
         QTest::newRow("halfway_center")
-                << Qt3DCore::QRay3D(QVector3D(), QVector3D(0.0, 0.0, 1.0), farPlaneDistance)
+                << Qt3DRender::QRay3D(QVector3D(), QVector3D(0.0, 0.0, 1.0), farPlaneDistance)
                 << QVector3D(3.0, 1.5, 20.0)
                 << QVector3D(0.0, -1.5, 20.0)
                 << QVector3D(-3, 1.5, 20.0)
@@ -143,7 +143,7 @@ private Q_SLOTS:
                 << 0.5f
                 << true;
         QTest::newRow("miss_halfway_center_too_short")
-                << Qt3DCore::QRay3D(QVector3D(), QVector3D(0.0, 0.0, 1.0), farPlaneDistance * 0.25f)
+                << Qt3DRender::QRay3D(QVector3D(), QVector3D(0.0, 0.0, 1.0), farPlaneDistance * 0.25f)
                 << QVector3D(3.0, 1.5, 20.0)
                 << QVector3D(0.0, -1.5, 20.0)
                 << QVector3D(-3, 1.5, 20.0)
@@ -151,7 +151,7 @@ private Q_SLOTS:
                 << 0.0f
                 << false;
         QTest::newRow("far_center")
-                << Qt3DCore::QRay3D(QVector3D(), QVector3D(0.0, 0.0, 1.0), farPlaneDistance)
+                << Qt3DRender::QRay3D(QVector3D(), QVector3D(0.0, 0.0, 1.0), farPlaneDistance)
                 << QVector3D(3.0, 1.5, 40.0)
                 << QVector3D(0.0, -1.5, 40.0)
                 << QVector3D(-3, 1.5, 40.0)
@@ -159,7 +159,7 @@ private Q_SLOTS:
                 << 1.0f
                 << true;
         QTest::newRow("near_center")
-                << Qt3DCore::QRay3D(QVector3D(), QVector3D(0.0, 0.0, 1.0), 1.0f)
+                << Qt3DRender::QRay3D(QVector3D(), QVector3D(0.0, 0.0, 1.0), 1.0f)
                 << QVector3D(3.0, 1.5, 0.0)
                 << QVector3D(0.0, -1.5, 0.0)
                 << QVector3D(-3, 1.5, 0.0)
@@ -167,7 +167,7 @@ private Q_SLOTS:
                 << 0.0f
                 << true;
         QTest::newRow("above_miss_center")
-                << Qt3DCore::QRay3D(QVector3D(0.0, 2.0, 0.0), QVector3D(0.0, 2.0, 1.0), 1.0f)
+                << Qt3DRender::QRay3D(QVector3D(0.0, 2.0, 0.0), QVector3D(0.0, 2.0, 1.0), 1.0f)
                 << QVector3D(3.0, 1.5, 0.0)
                 << QVector3D(0.0, -1.5, 0.0)
                 << QVector3D(-3, 1.5, 0.0)
@@ -175,7 +175,7 @@ private Q_SLOTS:
                 << 0.0f
                 << false;
         QTest::newRow("below_miss_center")
-                << Qt3DCore::QRay3D(QVector3D(0.0, -2.0, 0.0), QVector3D(0.0, -2.0, 1.0), 1.0f)
+                << Qt3DRender::QRay3D(QVector3D(0.0, -2.0, 0.0), QVector3D(0.0, -2.0, 1.0), 1.0f)
                 << QVector3D(3.0, 1.5, 0.0)
                 << QVector3D(0.0, -1.5, 0.0)
                 << QVector3D(-3, 1.5, 0.0)
@@ -187,7 +187,7 @@ private Q_SLOTS:
     void intersects()
     {
         // GIVEN
-        QFETCH(Qt3DCore::QRay3D, ray);
+        QFETCH(Qt3DRender::QRay3D, ray);
         QFETCH(QVector3D, a);
         QFETCH(QVector3D, b);
         QFETCH(QVector3D, c);