diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-11-30 16:10:30 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-11-30 21:34:38 +0000 |
| commit | b048a71652dfd0d63658a33f7b6c75e5a7c5453c (patch) | |
| tree | a2973ddc3d34e9105bca5756ed2aa0c816a5867b /src/input/frontend | |
| parent | c80eed85ee8250f1dbbf1565f2f8ff01b6fa6d0b (diff) | |
LogicalDeviceManager: store vector of active LogicalDevice instances
Will make it easier to find all the logical devices and update
the axis/actions for them.
Change-Id: I839da4a87f650a429957c0fcecf196e02bad2f13
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/input/frontend')
| -rw-r--r-- | src/input/frontend/qinputaspect.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index 4c2b0e4de..b9277774d 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -109,7 +109,7 @@ QInputAspect::QInputAspect(QObject *parent) registerBackendType<QAxisSetting>(QBackendNodeFunctorPtr(new Input::InputNodeFunctor<Input::AxisSetting, Input::AxisSettingManager>(d_func()->m_inputHandler->axisSettingManager()))); registerBackendType<Qt3DInput::QAction>(QBackendNodeFunctorPtr(new Input::InputNodeFunctor<Input::Action, Input::ActionManager>(d_func()->m_inputHandler->actionManager()))); registerBackendType<QActionInput>(QBackendNodeFunctorPtr(new Input::InputNodeFunctor<Input::ActionInput, Input::ActionInputManager>(d_func()->m_inputHandler->actionInputManager()))); - registerBackendType<QLogicalDevice>(QBackendNodeFunctorPtr(new Input::InputNodeFunctor<Input::LogicalDevice, Input::LogicalDeviceManager>(d_func()->m_inputHandler->logicalDeviceManager()))); + registerBackendType<QLogicalDevice>(QBackendNodeFunctorPtr(new Input::LogicalDeviceNodeFunctor(d_func()->m_inputHandler->logicalDeviceManager()))); loadInputDevicePlugins(); } @@ -167,6 +167,11 @@ QVector<QAspectJobPtr> QInputAspect::jobsToExecute(qint64 time) Q_FOREACH (QInputDeviceIntegration *integration, d->m_inputDeviceIntegrations) jobs += integration->jobsToExecute(time); + // TO DO: + // Have Jobs that update Axis/Action (store combined axis/action value) + // Have Jobs that update the LogicalDevice + // Have Jobs that update the AxisHandlers/ActionHandlers + return jobs; } |