diff options
author | Mike Krus <mike.krus@kdab.com> | 2015-12-08 12:06:12 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2016-01-25 09:03:41 +0000 |
commit | 4ad00b344bc79e34f2ba2f8355e65c7948791389 (patch) | |
tree | 277ff0f997b962ccb6034728e780cbf77f60c643 /src/render/picking/qobjectpicker.cpp | |
parent | d798eb52ae1b22fa38d398cdae0012a34cb51922 (diff) |
Expose picking details to front end
Intersection (world and local) and distance added to pick event
Modified test so that it includes the event
Change-Id: I8631d626e5108d2e044374ee3425625f5588c38c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/picking/qobjectpicker.cpp')
-rw-r--r-- | src/render/picking/qobjectpicker.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/picking/qobjectpicker.cpp b/src/render/picking/qobjectpicker.cpp index 96b3bb9f6..2db315dd6 100644 --- a/src/render/picking/qobjectpicker.cpp +++ b/src/render/picking/qobjectpicker.cpp @@ -175,14 +175,14 @@ void QObjectPicker::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) // to emit the correct signals const QByteArray propertyName = e->propertyName(); if (propertyName == QByteArrayLiteral("pressed")) { - QPickEvent e; - d->pressedEvent(&e); + QPickEventPtr ev = e->value().value<QPickEventPtr>(); + d->pressedEvent(ev.data()); } else if (propertyName == QByteArrayLiteral("released")) { - QPickEvent e; - d->releasedEvent(&e); + QPickEventPtr ev = e->value().value<QPickEventPtr>(); + d->releasedEvent(ev.data()); } else if (propertyName == QByteArrayLiteral("clicked")) { - QPickEvent e; - d->clickedEvent(&e); + QPickEventPtr ev = e->value().value<QPickEventPtr>(); + d->clickedEvent(ev.data()); } else if (propertyName == QByteArrayLiteral("entered")) { emit entered(); setContainsMouse(true); |