summaryrefslogtreecommitdiffstats
path: root/src/render/picking/objectpicker_p.h
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2018-12-10 10:17:25 +0100
committerPaul Lemire <paul.lemire@kdab.com>2018-12-12 05:40:40 +0000
commite3fbebe61111dfe670ffe19c96e313157df7331f (patch)
tree2b61cb59a84e4d31350cb1049bd71efc7a95941e /src/render/picking/objectpicker_p.h
parentc9ce0deeb8f2bb79c446e41584f753f1b1bfe17f (diff)
QObjectPicker and QPickingSettings NearestPriorityPick picking mode
Add a new priority property on QObjectPicker and a new QPickingSettings mode. This will select the result with the highest priority if there are several results on a given ray. If we have several results with identical properties, the result with the closest distance is selected. [ChangeLog][Qt3DRender] QObjectPicker: add a priority based result selection Change-Id: I7af12db6e163c3c2d9dad696e6d9f9bbbee064ed Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src/render/picking/objectpicker_p.h')
-rw-r--r--src/render/picking/objectpicker_p.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/render/picking/objectpicker_p.h b/src/render/picking/objectpicker_p.h
index b9c308afb..7389a4b53 100644
--- a/src/render/picking/objectpicker_p.h
+++ b/src/render/picking/objectpicker_p.h
@@ -81,10 +81,15 @@ public:
void onEntered();
void onExited();
+ // Needed for unit tests
+ void setPriority(int priority);
+ int priority() const;
+
private:
void initializeFromPeer(const Qt3DCore::QNodeCreatedChangeBasePtr &change) final;
void notifyJob();
+ int m_priority;
bool m_isPressed;
bool m_hoverEnabled;
bool m_dragEnabled;