diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-25 18:32:01 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-02-29 11:12:57 +0000 |
commit | 8a30f6391791e468a680834d1e445102e6fe4d47 (patch) | |
tree | 2524bdb58338e0c7063fcd8172f338594946f4cd /src/input/frontend/qlogicaldevice.cpp | |
parent | 3609ef317c5b454548b25d31100fd3d2090a6e9d (diff) |
Inputs overhauled
- Remove QAxisActionHandler
- Remove AxisAxtionHandler, AxisActionPayload, UpdateHandlerJob
- Make QLogicalDevice a QComponent
- QAction sending action active update to frontend
- QAxis sending axis value update to frontend
- QFirstPersonCameraController rewritten in a more efficient manner
Change-Id: I09a83f95b97238e4393a88103f76d8ba93e1403d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/input/frontend/qlogicaldevice.cpp')
-rw-r--r-- | src/input/frontend/qlogicaldevice.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/input/frontend/qlogicaldevice.cpp b/src/input/frontend/qlogicaldevice.cpp index 0b0eff28c..0216226ef 100644 --- a/src/input/frontend/qlogicaldevice.cpp +++ b/src/input/frontend/qlogicaldevice.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qlogicaldevice.h" -#include <Qt3DCore/private/qnode_p.h> +#include <Qt3DCore/private/qcomponent_p.h> #include <Qt3DInput/qaction.h> #include <Qt3DInput/qaxis.h> #include <Qt3DCore/qscenepropertychange.h> @@ -49,11 +49,11 @@ namespace Qt3DInput { /*! \internal */ -class QLogicalDevicePrivate : public Qt3DCore::QNodePrivate +class QLogicalDevicePrivate : public Qt3DCore::QComponentPrivate { public: QLogicalDevicePrivate() - : Qt3DCore::QNodePrivate() + : Qt3DCore::QComponentPrivate() {} QVector<QAction *> m_actions; @@ -146,7 +146,7 @@ public: Constructs a new QLogicalDevice instance with parent \a parent. */ QLogicalDevice::QLogicalDevice(Qt3DCore::QNode *parent) - : Qt3DCore::QNode(*new QLogicalDevicePrivate(), parent) + : Qt3DCore::QComponent(*new QLogicalDevicePrivate(), parent) { } @@ -155,7 +155,7 @@ QLogicalDevice::QLogicalDevice(Qt3DCore::QNode *parent) */ QLogicalDevice::~QLogicalDevice() { - QNode::cleanup(); + QComponent::cleanup(); } /*! |