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/objectpicker.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/objectpicker.cpp')
-rw-r--r-- | src/render/picking/objectpicker.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/render/picking/objectpicker.cpp b/src/render/picking/objectpicker.cpp index c2f8a354f..c6f278117 100644 --- a/src/render/picking/objectpicker.cpp +++ b/src/render/picking/objectpicker.cpp @@ -35,6 +35,7 @@ ****************************************************************************/ #include "objectpicker_p.h" +#include "qpickevent.h" #include <Qt3DRender/qobjectpicker.h> #include <Qt3DRender/qattribute.h> #include <Qt3DCore/qscenepropertychange.h> @@ -105,27 +106,30 @@ bool ObjectPicker::hoverEnabled() const return m_hoverEnabled; } -void ObjectPicker::onClicked() +void ObjectPicker::onClicked(QPickEventPtr event) { Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerUuid())); e->setPropertyName("clicked"); e->setTargetNode(peerUuid()); + e->setValue(QVariant::fromValue(event)); notifyObservers(e); } -void ObjectPicker::onPressed() +void ObjectPicker::onPressed(QPickEventPtr event) { Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerUuid())); e->setPropertyName("pressed"); e->setTargetNode(peerUuid()); + e->setValue(QVariant::fromValue(event)); notifyObservers(e); } -void ObjectPicker::onReleased() +void ObjectPicker::onReleased(QPickEventPtr event) { Qt3DCore::QBackendScenePropertyChangePtr e(new Qt3DCore::QBackendScenePropertyChange(Qt3DCore::NodeUpdated, peerUuid())); e->setPropertyName("released"); e->setTargetNode(peerUuid()); + e->setValue(QVariant::fromValue(event)); notifyObservers(e); } |