Add point picking

Most API was present but not the picking backend.
Also missing was QPickPoint event.

Task-number: QTBUG-58071
Change-Id: I768afaf64507ea4835772d4201be031f9f0a43b4
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

3 files changed, 204 insertions, 0 deletions

diff --git a/src/render/picking/picking.pri b/src/render/picking/picking.pri
index fa8611adf..23d65c6f2 100644
--- a/src/render/picking/picking.pri
+++ b/src/render/picking/picking.pri
@@ -5,6 +5,7 @@ HEADERS += \
     $$PWD/qpickevent.h \
     $$PWD/qpickevent_p.h \
     $$PWD/qpicklineevent.h \
+    $$PWD/qpickpointevent.h \
     $$PWD/qpicktriangleevent.h \
     $$PWD/objectpicker_p.h \
     $$PWD/pickeventfilter_p.h \
@@ -14,6 +15,7 @@ SOURCES += \
     $$PWD/qobjectpicker.cpp \
     $$PWD/qpickevent.cpp \
     $$PWD/qpicklineevent.cpp \
+    $$PWD/qpickpointevent.cpp \
     $$PWD/qpicktriangleevent.cpp \
     $$PWD/objectpicker.cpp \
     $$PWD/pickeventfilter.cpp
diff --git a/src/render/picking/qpickpointevent.cpp b/src/render/picking/qpickpointevent.cpp
new file mode 100644
index 000000000..295860e75
--- /dev/null
+++ b/src/render/picking/qpickpointevent.cpp
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2017 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/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 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qpickpointevent.h"
+#include "qpickevent_p.h"
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+
+class QPickPointEventPrivate : public QPickEventPrivate
+{
+public:
+    QPickPointEventPrivate()
+        : QPickEventPrivate()
+        , m_pointIndex(0)
+    {
+    }
+
+    uint m_pointIndex;
+};
+
+/*!
+    \class Qt3DRender::QPickPointEvent
+    \inmodule Qt3DRender
+
+    \brief The QPickPointEvent class holds information when a segment of a point cloud is picked
+
+    \sa QPickEvent
+    \since 5.10
+*/
+
+/*!
+ * \qmltype PickPointEvent
+ * \instantiates Qt3DRender::QPickPointEvent
+ * \inqmlmodule Qt3D.Render
+ * \brief PickPointEvent holds information when a segment of a point cloud is picked.
+ * \sa ObjectPicker
+ */
+
+
+/*!
+  \fn Qt3DRender::QPickPointEvent::QPickPointEvent()
+  Constructs a new QPickPointEvent.
+ */
+QPickPointEvent::QPickPointEvent()
+    : QPickEvent(*new QPickPointEventPrivate())
+{
+}
+
+QPickPointEvent::QPickPointEvent(const QPointF &position, const QVector3D &worldIntersection,
+                                 const QVector3D &localIntersection, float distance,
+                                 uint pointIndex,
+                                 QPickEvent::Buttons button, int buttons, int modifiers)
+    : QPickEvent(*new QPickPointEventPrivate())
+{
+    Q_D(QPickPointEvent);
+    d->m_position = position;
+    d->m_distance = distance;
+    d->m_worldIntersection = worldIntersection;
+    d->m_localIntersection = localIntersection;
+    d->m_pointIndex = pointIndex;
+    d->m_button = button;
+    d->m_buttons = buttons;
+    d->m_modifiers = modifiers;
+}
+
+/*! \internal */
+QPickPointEvent::~QPickPointEvent()
+{
+}
+
+/*!
+    \qmlproperty uint Qt3D.Render::PickPointEvent::pointIndex
+    Specifies the index of the point that was picked
+*/
+/*!
+  \property Qt3DRender::QPickPointEvent::pointIndex
+    Specifies the index of the point that was picked
+ */
+/*!
+ * \brief QPickPointEvent::pointIndex
+ * Returns the index of the picked point
+ */
+uint QPickPointEvent::pointIndex() const
+{
+    Q_D(const QPickPointEvent);
+    return d->m_pointIndex;
+}
+
+} // Qt3DRender
+
+QT_END_NAMESPACE
+
diff --git a/src/render/picking/qpickpointevent.h b/src/render/picking/qpickpointevent.h
new file mode 100644
index 000000000..fbfebcedd
--- /dev/null
+++ b/src/render/picking/qpickpointevent.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** 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 The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/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 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3DRENDER_QPICKPOINTEVENT_H
+#define QT3DRENDER_QPICKPOINTEVENT_H
+
+#include <Qt3DRender/qpickevent.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3DRender {
+class QPickPointEventPrivate;
+
+class QT3DRENDERSHARED_EXPORT QPickPointEvent : public QPickEvent
+{
+    Q_OBJECT
+    Q_PROPERTY(uint pointIndex READ pointIndex CONSTANT)
+public:
+    QPickPointEvent();
+    QPickPointEvent(const QPointF &position, const QVector3D& worldIntersection, const QVector3D& localIntersection, float distance,
+                    uint pointIndex, Buttons button, int buttons, int modifiers);
+    ~QPickPointEvent();
+
+public:
+    uint pointIndex() const;
+
+private:
+    Q_DECLARE_PRIVATE(QPickPointEvent)
+};
+
+} // Qt3DRender
+
+QT_END_NAMESPACE
+
+#endif // QT3DRENDER_QPICKPOINTEVENT_H