diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2016-08-22 12:50:58 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-08-24 19:33:12 +0000 |
commit | 89d332399fc68ac784a384e496e8ed5e910d6cd1 (patch) | |
tree | defd734c7e1617e58b66572d89568cf8973e6a08 | |
parent | d5c88855a726623440c379ac0c5cd6ebbbb2cd08 (diff) |
Add an AbstractActionInput base class
This is needed for the coming refactoring improving testability in the
input aspect. Right now we got some of the action input logic done
inside the job and some inside the class. This is in part due to the
lack of common interface between the different action input backend
node. This is a first step toward solving that.
Change-Id: I803ecd1f114f635d2b275d5dadc493733fc580e8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/input/backend/abstractactioninput.cpp | 58 | ||||
-rw-r--r-- | src/input/backend/abstractactioninput_p.h | 79 | ||||
-rw-r--r-- | src/input/backend/backend.pri | 2 |
3 files changed, 139 insertions, 0 deletions
diff --git a/src/input/backend/abstractactioninput.cpp b/src/input/backend/abstractactioninput.cpp new file mode 100644 index 000000000..1d4366554 --- /dev/null +++ b/src/input/backend/abstractactioninput.cpp @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "abstractactioninput_p.h" + +QT_BEGIN_NAMESPACE + +namespace Qt3DInput { + +namespace Input { + +AbstractActionInput::AbstractActionInput() + : Qt3DCore::QBackendNode() +{ +} + +} // namespace Input + +} // namespace Qt3DInput + +QT_END_NAMESPACE + diff --git a/src/input/backend/abstractactioninput_p.h b/src/input/backend/abstractactioninput_p.h new file mode 100644 index 000000000..d672a546e --- /dev/null +++ b/src/input/backend/abstractactioninput_p.h @@ -0,0 +1,79 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB). +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt3D module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QT3DINPUT_INPUT_ABSTRACTACTIONINPUT_H +#define QT3DINPUT_INPUT_ABSTRACTACTIONINPUT_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <Qt3DCore/qbackendnode.h> +#include <Qt3DCore/qnodeid.h> + +QT_BEGIN_NAMESPACE + +namespace Qt3DInput { + +namespace Input { + +class InputHandler; + +class Q_AUTOTEST_EXPORT AbstractActionInput : public Qt3DCore::QBackendNode +{ +public: + AbstractActionInput(); + + virtual bool process(InputHandler *inputHandler, qint64 currentTime) = 0; +}; + +} // namespace Input + +} // namespace Qt3DInput + +QT_END_NAMESPACE + +#endif // QT3DINPUT_INPUT_ABSTRACTACTIONINPUT_H diff --git a/src/input/backend/backend.pri b/src/input/backend/backend.pri index 74ee7f3b6..5c22f0e50 100644 --- a/src/input/backend/backend.pri +++ b/src/input/backend/backend.pri @@ -11,6 +11,7 @@ HEADERS += \ $$PWD/mousedevice_p.h \ $$PWD/mouseeventdispatcherjob_p.h \ $$PWD/mouseeventfilter_p.h \ + $$PWD/abstractactioninput_p.h \ $$PWD/abstractaxisinput_p.h \ $$PWD/actioninput_p.h \ $$PWD/axis_p.h \ @@ -43,6 +44,7 @@ SOURCES += \ $$PWD/mousedevice.cpp \ $$PWD/mouseeventfilter.cpp \ $$PWD/mouseeventdispatcherjob.cpp \ + $$PWD/abstractactioninput.cpp \ $$PWD/abstractaxisinput.cpp \ $$PWD/actioninput.cpp \ $$PWD/axis.cpp \ |