Bugfixes and cleanups for the picking code

- Removed the pickRegistry and related code, because it is not needed
- Fixed picking when navigation is turned off
- Introduced a new autotest for picking

Change-Id: Ib43789383760902f42542b45cfe49342f4ffa090
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

5 files changed, 249 insertions, 1 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 3aac8a00f..46114c1c1 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -5,5 +5,7 @@ SUBDIRS = threed \
 qtHaveModule(qml): SUBDIRS += imports
 qtHaveModule(qmltest) {
     SUBDIRS += qml3d
-    !win32 : SUBDIRS += qml3d_visual
+
+    !win32 : SUBDIRS += qml3d_visual \
+                        qml3d_cpp
 }
diff --git a/tests/auto/qml3d_cpp/picking/data/tst_picking.qml b/tests/auto/qml3d_cpp/picking/data/tst_picking.qml
new file mode 100644
index 000000000..c158e857f
--- /dev/null
+++ b/tests/auto/qml3d_cpp/picking/data/tst_picking.qml
@@ -0,0 +1,98 @@
+/***************************************************************************
+**
+** Copyright (C) 2011 - 2013 Research In Motion
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import Qt3D 2.0
+import Qt3D.Shapes 2.0
+import QtQuick 2.0
+
+Rectangle
+{
+    id: topLevel
+    width: 480; height: 480
+
+    property string pickedObjectClicked;
+    property string pickedObjectPressed;
+    property string pickedObjectReleased;
+    property string hoveredObject;
+
+    property alias navigation: viewport.navigation
+
+    Viewport {
+        id: viewport
+        width: 480; height: 480
+        picking: true
+
+        Quad {
+            id: fullScreenQuad
+
+            transform: [
+                Rotation3D {
+                    axis: Qt.vector3d(1,0,0);
+                    angle: 90
+                }
+            ]
+            position: Qt.vector3d(0, 1, 0)
+
+            onClicked: topLevel.pickedObjectClicked = "first"
+            onPressed: topLevel.pickedObjectPressed = "first"
+            onReleased:  topLevel.pickedObjectReleased = "first"
+            onHoverEnter: hoveredObject= "first"
+            onHoverLeave: hoveredObject= ""
+        }
+
+        Quad {
+            id: smallerQuad
+
+            transform: [
+                Rotation3D {
+                    axis: Qt.vector3d(1,0,0);
+                    angle: 90
+                }
+            ]
+
+            position: Qt.vector3d(0, -1, 0)
+
+            onClicked: topLevel.pickedObjectClicked = "second"
+            onPressed: topLevel.pickedObjectPressed = "second"
+            onReleased:topLevel.pickedObjectReleased = "second"
+        }
+    }
+}
diff --git a/tests/auto/qml3d_cpp/picking/picking.pro b/tests/auto/qml3d_cpp/picking/picking.pro
new file mode 100644
index 000000000..80a81a7e5
--- /dev/null
+++ b/tests/auto/qml3d_cpp/picking/picking.pro
@@ -0,0 +1,12 @@
+TARGET = tst_qml3d_cpp
+CONFIG += testcase
+TEMPLATE=app
+QT += testlib 3d 3dquick
+QT += qml quick gui-private
+
+SOURCES += tst_picking.cpp
+DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
+
+OTHER_FILES += data/tst_picking.qml
+
+TESTDATA = $$OTHER_FILES
diff --git a/tests/auto/qml3d_cpp/picking/tst_picking.cpp b/tests/auto/qml3d_cpp/picking/tst_picking.cpp
new file mode 100644
index 000000000..f9ab2ec99
--- /dev/null
+++ b/tests/auto/qml3d_cpp/picking/tst_picking.cpp
@@ -0,0 +1,134 @@
+/***************************************************************************
+**
+** Copyright (C) 2011 - 2013 Research In Motion
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtQuick/qquickview.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcontext.h>
+#include <QQuickItem>
+#include <qpa/qwindowsysteminterface.h>
+
+class tst_Picking : public QObject
+{
+    Q_OBJECT
+public:
+    tst_Picking() {}
+    ~tst_Picking() {}
+
+private slots:
+    void initTestCase();
+    void cleanupTestCase();
+    void testWithNavigation();
+    void testWithoutNavigation();
+    void testMove();
+
+private:
+    void testMouse();
+
+private:
+    QQuickItem *rootObject;
+    QQuickView *window;
+};
+
+void tst_Picking::initTestCase()
+{
+    window = new QQuickView(0);
+    window->setSource(QUrl::fromLocalFile(QFINDTESTDATA("data/tst_picking.qml")));
+    window->setGeometry(0,0,480,480);
+    window->show();
+    QTest::qWaitForWindowExposed(window);
+    rootObject = window->rootObject();
+}
+
+void tst_Picking::cleanupTestCase()
+{
+    delete window;
+}
+
+void tst_Picking::testWithNavigation()
+{
+    rootObject->setProperty("navigation", true);
+    testMouse();
+}
+
+void tst_Picking::testWithoutNavigation()
+{
+    rootObject->setProperty("navigation", false);
+    testMouse();
+}
+
+void tst_Picking::testMouse()
+{
+    QTest::mousePress(window, Qt::LeftButton, 0, QPoint(240, 90));
+    QTest::mouseRelease(window, Qt::LeftButton, 0, QPoint(240, 90), 300);
+
+    QTRY_COMPARE(rootObject->property("pickedObjectPressed").toString(), QString("first"));
+    QTRY_COMPARE(rootObject->property("pickedObjectClicked").toString(), QString("first"));
+    QTRY_COMPARE(rootObject->property("pickedObjectReleased").toString(), QString("first"));
+
+    QTest::mousePress(window, Qt::LeftButton, 0, QPoint(240, 320));
+    QTest::mouseRelease(window, Qt::LeftButton, 0, QPoint(240, 240),300);
+
+    QTRY_COMPARE(rootObject->property("pickedObjectPressed").toString(), QString("second"));
+    QTRY_COMPARE(rootObject->property("pickedObjectClicked").toString(), QString("first"));
+    QTRY_COMPARE(rootObject->property("pickedObjectReleased").toString(), QString("second"));
+
+    QTest::mousePress(window, Qt::LeftButton, 0, QPoint(20, 100));
+    QTest::mouseRelease(window, Qt::LeftButton, 0, QPoint(20, 100), 300);
+
+    QTRY_COMPARE(rootObject->property("pickedObjectPressed").toString(), QString("second"));
+    QTRY_COMPARE(rootObject->property("pickedObjectClicked").toString(), QString("first"));
+    QTRY_COMPARE(rootObject->property("pickedObjectReleased").toString(), QString("second"));
+}
+
+void tst_Picking::testMove()
+{
+    rootObject->setProperty("hoveredObject", "");
+    QTest::mouseMove(window, QPoint(240, 90));
+    QTRY_COMPARE(rootObject->property("hoveredObject").toString(), QString("first"));
+
+    QTest::mouseMove(window, QPoint(240, 200));
+    QTRY_COMPARE(rootObject->property("hoveredObject").toString(), QString(""));
+}
+
+QTEST_MAIN(tst_Picking)
+
+#include "tst_picking.moc"
diff --git a/tests/auto/qml3d_cpp/qml3d_cpp.pro b/tests/auto/qml3d_cpp/qml3d_cpp.pro
new file mode 100644
index 000000000..baf619016
--- /dev/null
+++ b/tests/auto/qml3d_cpp/qml3d_cpp.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = picking