diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/render/jobs/pickboundingvolumejob_p.h | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/render/jobs/pickboundingvolumejob_p.h')
-rw-r--r-- | src/render/jobs/pickboundingvolumejob_p.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/render/jobs/pickboundingvolumejob_p.h b/src/render/jobs/pickboundingvolumejob_p.h index 9f52943d1..5239c5c6c 100644 --- a/src/render/jobs/pickboundingvolumejob_p.h +++ b/src/render/jobs/pickboundingvolumejob_p.h @@ -59,6 +59,7 @@ #include <Qt3DRender/private/pickboundingvolumeutils_p.h> #include <Qt3DRender/qpickevent.h> #include <QMouseEvent> +#include <QKeyEvent> #include <QSharedPointer> QT_BEGIN_NAMESPACE @@ -82,6 +83,7 @@ public: void setRoot(Entity *root); void setMouseEvents(const QList<QMouseEvent> &pendingEvents); + void setKeyEvents(const QList<QKeyEvent> &pendingEvents); void setFrameGraphRoot(FrameGraphNode *frameGraphRoot); void setRenderSettings(RenderSettings *settings); void setManagers(NodeManagers *manager); @@ -102,8 +104,10 @@ protected: void run() Q_DECL_FINAL; void dispatchPickEvents(const QMouseEvent &event, const PickingUtils::CollisionVisitor::HitList &sphereHits, QPickEvent::Buttons eventButton, - int eventButtons, int eventModifiers, - bool trianglePickingRequested, bool allHitsRequested); + int eventButtons, + int eventModifiers, + bool trianglePickingRequested, + bool allHitsRequested); private: NodeManagers *m_manager; @@ -115,6 +119,8 @@ private: bool m_oneEnabledAtLeast; bool m_oneHoverAtLeast; + QList<QKeyEvent> m_pendingKeyEvents; + void viewMatrixForCamera(Qt3DCore::QNodeId cameraId, QMatrix4x4 &viewMatrix, QMatrix4x4 &projectionMatrix) const; |