diff options
28 files changed, 195 insertions, 193 deletions
diff --git a/examples/qt3d/examples-common/FirstPersonCameraController.qml b/examples/qt3d/examples-common/FirstPersonCameraController.qml index 8d05c0840..e6950140d 100644 --- a/examples/qt3d/examples-common/FirstPersonCameraController.qml +++ b/examples/qt3d/examples-common/FirstPersonCameraController.qml @@ -72,7 +72,7 @@ Entity { readonly property bool fineMotion: fineMotionAction.active } - KeyboardController { + KeyboardDevice { id: keyboardSourceDevice } diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp index 0a2fefc30..3e0bd2c68 100644 --- a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp +++ b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp @@ -56,7 +56,7 @@ #include <Qt3DInput/QAction> #include <Qt3DInput/QActionInput> #include <Qt3DInput/QLogicalDevice> -#include <Qt3DInput/QKeyboardController> +#include <Qt3DInput/QKeyboardDevice> #include <Qt3DInput/QMouseDevice> #include <Qt3DInput/QMouseEvent> #include <Qt3DLogic/QFrameAction> @@ -86,7 +86,7 @@ QFirstPersonCameraControllerPrivate::QFirstPersonCameraControllerPrivate() , m_keyboardTxNegInput(new QAxisInput()) , m_keyboardTyNegInput(new QAxisInput()) , m_keyboardTzNegInput(new QAxisInput()) - , m_keyboardController(new QKeyboardController()) + , m_keyboardDevice(new QKeyboardDevice()) , m_mouseDevice(new QMouseDevice()) , m_logicalDevice(new QLogicalDevice()) , m_frameAction(new Qt3DLogic::QFrameAction()) @@ -106,7 +106,7 @@ void QFirstPersonCameraControllerPrivate::init() // Fine Motion Action m_fineMotionKeyInput->setButtons(QVariantList() << Qt::Key_Shift); - m_fineMotionKeyInput->setSourceDevice(m_keyboardController); + m_fineMotionKeyInput->setSourceDevice(m_keyboardDevice); m_fineMotionAction->addInput(m_fineMotionKeyInput); //// Axes @@ -124,37 +124,37 @@ void QFirstPersonCameraControllerPrivate::init() // Keyboard Pos Tx m_keyboardTxPosInput->setButtons(QVariantList() << Qt::Key_Right); m_keyboardTxPosInput->setScale(1.0f); - m_keyboardTxPosInput->setSourceDevice(m_keyboardController); + m_keyboardTxPosInput->setSourceDevice(m_keyboardDevice); m_txAxis->addInput(m_keyboardTxPosInput); // Keyboard Pos Ty m_keyboardTyPosInput->setButtons(QVariantList() << Qt::Key_PageUp); m_keyboardTyPosInput->setScale(1.0f); - m_keyboardTyPosInput->setSourceDevice(m_keyboardController); + m_keyboardTyPosInput->setSourceDevice(m_keyboardDevice); m_tyAxis->addInput(m_keyboardTyPosInput); // Keyboard Pos Tz m_keyboardTzPosInput->setButtons(QVariantList() << Qt::Key_Up); m_keyboardTzPosInput->setScale(1.0f); - m_keyboardTzPosInput->setSourceDevice(m_keyboardController); + m_keyboardTzPosInput->setSourceDevice(m_keyboardDevice); m_tzAxis->addInput(m_keyboardTzPosInput); // Keyboard Neg Tx m_keyboardTxNegInput->setButtons(QVariantList() << Qt::Key_Left); m_keyboardTxNegInput->setScale(-1.0f); - m_keyboardTxNegInput->setSourceDevice(m_keyboardController); + m_keyboardTxNegInput->setSourceDevice(m_keyboardDevice); m_txAxis->addInput(m_keyboardTxNegInput); // Keyboard Neg Ty m_keyboardTyNegInput->setButtons(QVariantList() << Qt::Key_PageDown); m_keyboardTyNegInput->setScale(-1.0f); - m_keyboardTyNegInput->setSourceDevice(m_keyboardController); + m_keyboardTyNegInput->setSourceDevice(m_keyboardDevice); m_tyAxis->addInput(m_keyboardTyNegInput); // Keyboard Neg Tz m_keyboardTzNegInput->setButtons(QVariantList() << Qt::Key_Down); m_keyboardTzNegInput->setScale(-1.0f); - m_keyboardTzNegInput->setSourceDevice(m_keyboardController); + m_keyboardTzNegInput->setSourceDevice(m_keyboardDevice); m_tzAxis->addInput(m_keyboardTzNegInput); //// Logical Device diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h b/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h index 59b03b1ea..4df7278d1 100644 --- a/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h +++ b/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h @@ -67,7 +67,7 @@ class QFrameAction; namespace Qt3DInput { -class QKeyboardController; +class QKeyboardDevice; class QMouseDevice; class QLogicalDevice; class QAction; @@ -106,7 +106,7 @@ public: QAxisInput *m_keyboardTyNegInput; QAxisInput *m_keyboardTzNegInput; - QKeyboardController *m_keyboardController; + QKeyboardDevice *m_keyboardDevice; QMouseDevice *m_mouseDevice; QLogicalDevice *m_logicalDevice; diff --git a/examples/qt3d/keyboardinput-qml/main.qml b/examples/qt3d/keyboardinput-qml/main.qml index 7806b48ce..396d75891 100644 --- a/examples/qt3d/keyboardinput-qml/main.qml +++ b/examples/qt3d/keyboardinput-qml/main.qml @@ -79,8 +79,8 @@ Entity { InputSettings { } ] - KeyboardController { - id: keyboardController + KeyboardDevice { + id: keyboardDevice } SphereEntity { @@ -89,14 +89,14 @@ Entity { color: "red" input.onTabPressed: sphere2.input.focus = true input.focus: true - input.sourceDevice: keyboardController + input.sourceDevice: keyboardDevice } SphereEntity { id: sphere2 color: "green" input.onTabPressed: sphere3.input.focus = true - input.sourceDevice: keyboardController + input.sourceDevice: keyboardDevice } SphereEntity { @@ -104,6 +104,6 @@ Entity { position: Qt.vector3d(5, 0, 0) color: "blue" input.onTabPressed: sphere1.input.focus = true - input.sourceDevice: keyboardController + input.sourceDevice: keyboardDevice } } diff --git a/examples/qt3d/playground-qml/main.qml b/examples/qt3d/playground-qml/main.qml index 1440b2f06..59bd96a93 100644 --- a/examples/qt3d/playground-qml/main.qml +++ b/examples/qt3d/playground-qml/main.qml @@ -67,11 +67,11 @@ Entity { } } - KeyboardController {id: keyboardController} + KeyboardDevice {id: keyboardDevice} KeyboardHandler { id: keyboardHandler - sourceDevice: keyboardController + sourceDevice: keyboardDevice focus: true onTabPressed: root.detailCamera = !root.detailCamera; } diff --git a/examples/qt3d/simple-qml/CameraController.qml b/examples/qt3d/simple-qml/CameraController.qml index 6b5b24307..5d166f400 100644 --- a/examples/qt3d/simple-qml/CameraController.qml +++ b/examples/qt3d/simple-qml/CameraController.qml @@ -75,7 +75,7 @@ Entity { property bool fineMotion: false } - KeyboardController { + KeyboardDevice { id: keyboardSourceDevice } diff --git a/examples/qt3d/wave/main.qml b/examples/qt3d/wave/main.qml index 44d899f2d..87d35b23c 100644 --- a/examples/qt3d/wave/main.qml +++ b/examples/qt3d/wave/main.qml @@ -56,7 +56,7 @@ import Qt3D.Input 2.0 Entity { id: root - KeyboardController { id: keyboard1 } + KeyboardDevice { id: keyboard1 } KeyboardHandler { id: input diff --git a/src/input/backend/assignkeyboardfocusjob.cpp b/src/input/backend/assignkeyboardfocusjob.cpp index 84380aca1..872a67e97 100644 --- a/src/input/backend/assignkeyboardfocusjob.cpp +++ b/src/input/backend/assignkeyboardfocusjob.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "assignkeyboardfocusjob_p.h" -#include "keyboardcontroller_p.h" +#include "keyboarddevice_p.h" #include "keyboardhandler_p.h" #include "inputhandler_p.h" #include "inputmanagers_p.h" @@ -48,10 +48,10 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { namespace Input { -AssignKeyboardFocusJob::AssignKeyboardFocusJob(Qt3DCore::QNodeId controller) +AssignKeyboardFocusJob::AssignKeyboardFocusJob(Qt3DCore::QNodeId keyboardDevice) : QAspectJob() , m_inputHandler(Q_NULLPTR) - , m_keyboardController(controller) + , m_keyboardDevice(keyboardDevice) { } @@ -62,14 +62,14 @@ void AssignKeyboardFocusJob::setInputHandler(InputHandler *handler) void AssignKeyboardFocusJob::run() { - KeyboardController *controller = m_inputHandler->keyboardControllerManager()->lookupResource(m_keyboardController); - Q_FOREACH (const HKeyboardHandler handle, controller->keyboardInputsHandles()) { + KeyboardDevice *keyboardDevice = m_inputHandler->keyboardDeviceManager()->lookupResource(m_keyboardDevice); + Q_FOREACH (const HKeyboardHandler handle, keyboardDevice->keyboardInputsHandles()) { KeyboardHandler *input = m_inputHandler->keyboardInputManager()->data(handle); if (input) { - bool hasFocus = input->peerId() == controller->lastKeyboardInputRequester(); + bool hasFocus = input->peerId() == keyboardDevice->lastKeyboardInputRequester(); input->setFocus(hasFocus); if (hasFocus) - controller->setCurrentFocusItem(input->peerId()); + keyboardDevice->setCurrentFocusItem(input->peerId()); } } } diff --git a/src/input/backend/assignkeyboardfocusjob_p.h b/src/input/backend/assignkeyboardfocusjob_p.h index d593a0bba..44966554d 100644 --- a/src/input/backend/assignkeyboardfocusjob_p.h +++ b/src/input/backend/assignkeyboardfocusjob_p.h @@ -64,13 +64,13 @@ class InputHandler; class AssignKeyboardFocusJob : public Qt3DCore::QAspectJob { public: - explicit AssignKeyboardFocusJob(Qt3DCore::QNodeId controller); + explicit AssignKeyboardFocusJob(Qt3DCore::QNodeId keyboardDevice); void setInputHandler(InputHandler *handler); void run() Q_DECL_OVERRIDE; private: InputHandler *m_inputHandler; - const Qt3DCore::QNodeId m_keyboardController; + const Qt3DCore::QNodeId m_keyboardDevice; }; } // namespace Input diff --git a/src/input/backend/backend.pri b/src/input/backend/backend.pri index c67d485e2..647652009 100644 --- a/src/input/backend/backend.pri +++ b/src/input/backend/backend.pri @@ -1,5 +1,5 @@ HEADERS += \ - $$PWD/keyboardcontroller_p.h \ + $$PWD/keyboarddevice_p.h \ $$PWD/keyboardhandler_p.h \ $$PWD/inputhandler_p.h \ $$PWD/inputmanagers_p.h \ @@ -30,7 +30,7 @@ HEADERS += \ $$PWD/eventsourcesetterhelper_p.h SOURCES += \ - $$PWD/keyboardcontroller.cpp \ + $$PWD/keyboarddevice.cpp \ $$PWD/keyboardhandler.cpp \ $$PWD/inputhandler.cpp \ $$PWD/keyboardeventfilter.cpp \ diff --git a/src/input/backend/handle_types_p.h b/src/input/backend/handle_types_p.h index a5ce8c091..f71f0324f 100644 --- a/src/input/backend/handle_types_p.h +++ b/src/input/backend/handle_types_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { namespace Input { -class KeyboardController; +class KeyboardDevice; class KeyboardHandler; class MouseHandler; class MouseDevice; @@ -73,7 +73,7 @@ class InputChord; class LogicalDevice; class GenericDeviceBackendNode; -typedef Qt3DCore::QHandle<KeyboardController, 8> HKeyboardController; +typedef Qt3DCore::QHandle<KeyboardDevice, 8> HKeyboardDevice; typedef Qt3DCore::QHandle<KeyboardHandler, 16> HKeyboardHandler; typedef Qt3DCore::QHandle<MouseHandler, 16> HMouseHandler; typedef Qt3DCore::QHandle<MouseDevice, 8> HMouseDevice; diff --git a/src/input/backend/inputhandler.cpp b/src/input/backend/inputhandler.cpp index 348ded81c..4bcb233d5 100644 --- a/src/input/backend/inputhandler.cpp +++ b/src/input/backend/inputhandler.cpp @@ -56,7 +56,7 @@ namespace Qt3DInput { namespace Input { InputHandler::InputHandler() - : m_keyboardControllerManager(new KeyboardControllerManager()) + : m_keyboardDeviceManager(new KeyboardDeviceManager()) , m_keyboardInputManager(new KeyboardInputManager()) , m_mouseDeviceManager(new MouseDeviceManager()) , m_mouseInputManager(new MouseInputManager()) @@ -138,14 +138,14 @@ void InputHandler::clearPendingMouseEvents() m_pendingMouseEvents.clear(); } -void InputHandler::appendKeyboardController(HKeyboardController controller) +void InputHandler::appendKeyboardDevice(HKeyboardDevice device) { - m_activeKeyboardControllers.append(controller); + m_activeKeyboardDevices.append(device); } -void InputHandler::removeKeyboardController(HKeyboardController controller) +void InputHandler::removeKeyboardDevice(HKeyboardDevice device) { - m_activeKeyboardControllers.removeAll(controller); + m_activeKeyboardDevices.removeAll(device); } void InputHandler::appendMouseDevice(HMouseDevice device) @@ -172,17 +172,17 @@ void Qt3DInput::Input::InputHandler::removeGenericDevice(HGenericDeviceBackendNo // Handles all dependencies between jobs QVector<Qt3DCore::QAspectJobPtr> InputHandler::keyboardJobs() { - // One job for Keyboard focus change event per Keyboard Controller + // One job for Keyboard focus change event per Keyboard device QVector<QAspectJobPtr> jobs; const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> events = pendingKeyEvents(); - Q_FOREACH (const HKeyboardController cHandle, m_activeKeyboardControllers) { - KeyboardController *controller = m_keyboardControllerManager->data(cHandle); - if (controller) { - controller->updateKeyEvents(events); + Q_FOREACH (const HKeyboardDevice cHandle, m_activeKeyboardDevices) { + KeyboardDevice *keyboardDevice = m_keyboardDeviceManager->data(cHandle); + if (keyboardDevice) { + keyboardDevice->updateKeyEvents(events); QAspectJobPtr focusChangeJob; - if (controller->lastKeyboardInputRequester() != controller->currentFocusItem()) { - AssignKeyboardFocusJob *job = new AssignKeyboardFocusJob(controller->peerId()); + if (keyboardDevice->lastKeyboardInputRequester() != keyboardDevice->currentFocusItem()) { + AssignKeyboardFocusJob *job = new AssignKeyboardFocusJob(keyboardDevice->peerId()); job->setInputHandler(this); focusChangeJob.reset(job); jobs.append(focusChangeJob); @@ -190,7 +190,7 @@ QVector<Qt3DCore::QAspectJobPtr> InputHandler::keyboardJobs() } // Event dispacthing job if (!events.isEmpty()) { - KeyEventDispatcherJob *job = new KeyEventDispatcherJob(controller->currentFocusItem(), events); + KeyEventDispatcherJob *job = new KeyEventDispatcherJob(keyboardDevice->currentFocusItem(), events); job->setInputHandler(this); if (focusChangeJob) job->addDependency(focusChangeJob); diff --git a/src/input/backend/inputhandler_p.h b/src/input/backend/inputhandler_p.h index c52c5fbd2..5011481bb 100644 --- a/src/input/backend/inputhandler_p.h +++ b/src/input/backend/inputhandler_p.h @@ -70,7 +70,7 @@ class QInputDeviceIntegration; namespace Input { class KeyboardInputManager; -class KeyboardControllerManager; +class KeyboardDeviceManager; class KeyboardEventFilter; class MouseDeviceManager; class MouseInputManager; @@ -94,7 +94,7 @@ public: InputHandler(); ~InputHandler(); - inline KeyboardControllerManager *keyboardControllerManager() const { return m_keyboardControllerManager; } + inline KeyboardDeviceManager *keyboardDeviceManager() const { return m_keyboardDeviceManager; } inline KeyboardInputManager *keyboardInputManager() const { return m_keyboardInputManager; } inline MouseDeviceManager *mouseDeviceManager() const { return m_mouseDeviceManager; } inline MouseInputManager *mouseInputManager() const { return m_mouseInputManager; } @@ -117,8 +117,8 @@ public: QList<QMouseEvent> pendingMouseEvents(); void clearPendingMouseEvents(); - void appendKeyboardController(HKeyboardController controller); - void removeKeyboardController(HKeyboardController controller); + void appendKeyboardDevice(HKeyboardDevice device); + void removeKeyboardDevice(HKeyboardDevice device); void appendMouseDevice(HMouseDevice device); void removeMouseDevice(HMouseDevice device); @@ -139,12 +139,12 @@ public: void updateEventSource(); private: - KeyboardControllerManager *m_keyboardControllerManager; + KeyboardDeviceManager *m_keyboardDeviceManager; KeyboardInputManager *m_keyboardInputManager; MouseDeviceManager *m_mouseDeviceManager; MouseInputManager *m_mouseInputManager; - QVector<HKeyboardController> m_activeKeyboardControllers; + QVector<HKeyboardDevice> m_activeKeyboardDevices; QVector<HMouseDevice> m_activeMouseDevices; QVector<HGenericDeviceBackendNode> m_activeGenericPhysicalDevices; KeyboardEventFilter *m_keyboardEventFilter; diff --git a/src/input/backend/inputmanagers_p.h b/src/input/backend/inputmanagers_p.h index b45a0a10c..4967cd71d 100644 --- a/src/input/backend/inputmanagers_p.h +++ b/src/input/backend/inputmanagers_p.h @@ -53,7 +53,7 @@ #include <QtGlobal> #include <Qt3DInput/private/handle_types_p.h> -#include <Qt3DInput/private/keyboardcontroller_p.h> +#include <Qt3DInput/private/keyboarddevice_p.h> #include <Qt3DInput/private/keyboardhandler_p.h> #include <Qt3DInput/private/mousehandler_p.h> #include <Qt3DInput/private/mousedevice_p.h> @@ -83,14 +83,14 @@ public: KeyboardInputManager() {} }; -class KeyboardControllerManager : public Qt3DCore::QResourceManager< - KeyboardController, +class KeyboardDeviceManager : public Qt3DCore::QResourceManager< + KeyboardDevice, Qt3DCore::QNodeId, 8, Qt3DCore::ArrayAllocatingPolicy> { public: - KeyboardControllerManager() {} + KeyboardDeviceManager() {} }; class MouseDeviceManager : public Qt3DCore::QResourceManager< diff --git a/src/input/backend/keyboardcontroller.cpp b/src/input/backend/keyboarddevice.cpp index 294a3d15b..00a30b415 100644 --- a/src/input/backend/keyboardcontroller.cpp +++ b/src/input/backend/keyboarddevice.cpp @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "keyboardcontroller_p.h" +#include "keyboarddevice_p.h" #include "inputhandler_p.h" #include "inputmanagers_p.h" #include <Qt3DCore/qnode.h> @@ -355,7 +355,7 @@ QPair<int, int> getKeyPosition(int key) // TO DO: Send change to frontend when activeInput changes -KeyboardController::KeyboardController() +KeyboardDevice::KeyboardDevice() : QAbstractPhysicalDeviceBackendNode(QBackendNode::ReadOnly) , m_inputHandler(Q_NULLPTR) { @@ -366,12 +366,12 @@ KeyboardController::KeyboardController() m_keyStates.keys[4] = 0; } -void KeyboardController::updateFromPeer(Qt3DCore::QNode *peer) +void KeyboardDevice::updateFromPeer(Qt3DCore::QNode *peer) { QAbstractPhysicalDeviceBackendNode::updateFromPeer(peer); } -void KeyboardController::cleanup() +void KeyboardDevice::cleanup() { QAbstractPhysicalDeviceBackendNode::cleanup(); m_keyStates.keys[0] = 0; @@ -381,7 +381,7 @@ void KeyboardController::cleanup() m_keyStates.keys[4] = 0; } -void KeyboardController::requestFocusForInput(Qt3DCore::QNodeId inputId) +void KeyboardDevice::requestFocusForInput(Qt3DCore::QNodeId inputId) { // Saves the last inputId, this will then be used in an Aspect Job to determine which // input will have the focus. This in turn will call KeyboardInput::setFocus which will @@ -389,12 +389,12 @@ void KeyboardController::requestFocusForInput(Qt3DCore::QNodeId inputId) m_lastRequester = inputId; } -void KeyboardController::setInputHandler(InputHandler *handler) +void KeyboardDevice::setInputHandler(InputHandler *handler) { m_inputHandler = handler; } -void KeyboardController::addKeyboardInput(Qt3DCore::QNodeId input) +void KeyboardDevice::addKeyboardInput(Qt3DCore::QNodeId input) { if (!m_keyboardInputs.contains(input)) { m_keyboardInputs.append(input); @@ -402,24 +402,24 @@ void KeyboardController::addKeyboardInput(Qt3DCore::QNodeId input) } } -void KeyboardController::removeKeyboardInput(Qt3DCore::QNodeId input) +void KeyboardDevice::removeKeyboardInput(Qt3DCore::QNodeId input) { m_keyboardInputs.removeAll(input); m_keyboardInputHandles.removeAll(m_inputHandler->keyboardInputManager()->lookupHandle(input)); } -void KeyboardController::setCurrentFocusItem(Qt3DCore::QNodeId input) +void KeyboardDevice::setCurrentFocusItem(Qt3DCore::QNodeId input) { m_currentFocusItem = input; } -float KeyboardController::axisValue(int axisIdentifier) const +float KeyboardDevice::axisValue(int axisIdentifier) const { Q_UNUSED(axisIdentifier); return 0.0f; } -bool KeyboardController::isButtonPressed(int buttonIdentifier) const +bool KeyboardDevice::isButtonPressed(int buttonIdentifier) const { QPair<int, int> position = getKeyPosition(buttonIdentifier); if (position.first != -1 && position.second != -1) @@ -427,7 +427,7 @@ bool KeyboardController::isButtonPressed(int buttonIdentifier) const return false; } -void KeyboardController::setButtonValue(int key, bool value) +void KeyboardDevice::setButtonValue(int key, bool value) { QPair<int, int> position = getKeyPosition(key); if (position.first != -1 && position.second != -1) { @@ -438,42 +438,42 @@ void KeyboardController::setButtonValue(int key, bool value) } } -void KeyboardController::updateKeyEvents(const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> &events) +void KeyboardDevice::updateKeyEvents(const QList<QT_PREPEND_NAMESPACE(QKeyEvent)> &events) { Q_FOREACH (const QT_PREPEND_NAMESPACE(QKeyEvent) &e, events) setButtonValue(e.key(), e.type() == QT_PREPEND_NAMESPACE(QKeyEvent)::KeyPress ? true : false); } -void KeyboardController::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +void KeyboardDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) { } -KeyboardControllerFunctor::KeyboardControllerFunctor(QInputAspect *inputaspect, InputHandler *handler) +KeyboardDeviceFunctor::KeyboardDeviceFunctor(QInputAspect *inputaspect, InputHandler *handler) : m_inputAspect(inputaspect) , m_handler(handler) { } -Qt3DCore::QBackendNode *KeyboardControllerFunctor::create(Qt3DCore::QNode *frontend) const +Qt3DCore::QBackendNode *KeyboardDeviceFunctor::create(Qt3DCore::QNode *frontend) const { - KeyboardController *controller = m_handler->keyboardControllerManager()->getOrCreateResource(frontend->id()); - controller->setInputAspect(m_inputAspect); - controller->setInputHandler(m_handler); - controller->setPeer(frontend); - m_handler->appendKeyboardController(m_handler->keyboardControllerManager()->lookupHandle(frontend->id())); - return controller; + KeyboardDevice *keyboardDevice = m_handler->keyboardDeviceManager()->getOrCreateResource(frontend->id()); + keyboardDevice->setInputAspect(m_inputAspect); + keyboardDevice->setInputHandler(m_handler); + keyboardDevice->setPeer(frontend); + m_handler->appendKeyboardDevice(m_handler->keyboardDeviceManager()->lookupHandle(frontend->id())); + return keyboardDevice; } -Qt3DCore::QBackendNode *KeyboardControllerFunctor::get(Qt3DCore::QNodeId id) const +Qt3DCore::QBackendNode *KeyboardDeviceFunctor::get(Qt3DCore::QNodeId id) const { - return m_handler->keyboardControllerManager()->lookupResource(id); + return m_handler->keyboardDeviceManager()->lookupResource(id); } -void KeyboardControllerFunctor::destroy(Qt3DCore::QNodeId id) const +void KeyboardDeviceFunctor::destroy(Qt3DCore::QNodeId id) const { - m_handler->removeKeyboardController(m_handler->keyboardControllerManager()->lookupHandle(id)); - m_handler->keyboardControllerManager()->releaseResource(id); + m_handler->removeKeyboardDevice(m_handler->keyboardDeviceManager()->lookupHandle(id)); + m_handler->keyboardDeviceManager()->releaseResource(id); } } // namespace Inputs diff --git a/src/input/backend/keyboardcontroller_p.h b/src/input/backend/keyboarddevice_p.h index 442947191..d4e0a7f3b 100644 --- a/src/input/backend/keyboardcontroller_p.h +++ b/src/input/backend/keyboarddevice_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DINPUT_INPUT_KEYBOARDCONTROLLER_P_H -#define QT3DINPUT_INPUT_KEYBOARDCONTROLLER_P_H +#ifndef QT3DINPUT_INPUT_KEYBOARDDEVICE_P_H +#define QT3DINPUT_INPUT_KEYBOARDDEVICE_P_H // // W A R N I N G @@ -66,10 +66,10 @@ namespace Input { class InputHandler; -class KeyboardController : public Qt3DInput::QAbstractPhysicalDeviceBackendNode +class KeyboardDevice : public Qt3DInput::QAbstractPhysicalDeviceBackendNode { public: - KeyboardController(); + KeyboardDevice(); void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void cleanup() Q_DECL_OVERRIDE; @@ -270,10 +270,10 @@ private: KeyStates m_keyStates; }; -class KeyboardControllerFunctor : public Qt3DCore::QBackendNodeMapper +class KeyboardDeviceFunctor : public Qt3DCore::QBackendNodeMapper { public: - explicit KeyboardControllerFunctor(QInputAspect *inputaspect, InputHandler *handler); + explicit KeyboardDeviceFunctor(QInputAspect *inputaspect, InputHandler *handler); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE; Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; @@ -289,4 +289,4 @@ private: QT_END_NAMESPACE -#endif // QT3DINPUT_INPUT_KEYBOARDCONTROLLER_P_H +#endif // QT3DINPUT_INPUT_KEYBOARDDEVICE_P_H diff --git a/src/input/backend/keyboardhandler.cpp b/src/input/backend/keyboardhandler.cpp index 3292a13fa..74b5cc94e 100644 --- a/src/input/backend/keyboardhandler.cpp +++ b/src/input/backend/keyboardhandler.cpp @@ -39,7 +39,7 @@ #include "keyboardhandler_p.h" #include "qkeyboardhandler.h" -#include "qkeyboardcontroller.h" +#include "qkeyboarddevice.h" #include "inputhandler_p.h" #include "inputmanagers_p.h" #include <QVariant> @@ -64,16 +64,16 @@ void KeyboardHandler::updateFromPeer(Qt3DCore::QNode *peer) { QKeyboardHandler *input = static_cast<QKeyboardHandler *>(peer); if (input->sourceDevice() != Q_NULLPTR) - setController(input->sourceDevice()->id()); + setSourcerDevice(input->sourceDevice()->id()); m_focus = false; m_enabled = input->isEnabled(); if (input->focus()) requestFocus(); } -Qt3DCore::QNodeId KeyboardHandler::keyboardController() const +Qt3DCore::QNodeId KeyboardHandler::keyboardDevice() const { - return m_keyboardController; + return m_keyboardDevice; } void KeyboardHandler::setInputHandler(InputHandler *handler) @@ -81,7 +81,7 @@ void KeyboardHandler::setInputHandler(InputHandler *handler) m_inputHandler = handler; } -// Called by the KeyboadController when the focus for the KeyboardHandler has changed +// Called by the KeyboadDevice when the focus for the KeyboardHandler has changed // Sends a change notification so that the frontend can update itself void KeyboardHandler::setFocus(bool focus) { @@ -109,10 +109,10 @@ void KeyboardHandler::sceneChangeEvent(const QSceneChangePtr &e) bool focusRequest = false; if (e->type() == NodeUpdated) { QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e); - if (propertyChange->propertyName() == QByteArrayLiteral("controller")) { + if (propertyChange->propertyName() == QByteArrayLiteral("device")) { const QNodeId newId = propertyChange->value().value<QNodeId>(); - if (m_keyboardController != newId) { - setController(newId); + if (m_keyboardDevice != newId) { + setSourcerDevice(newId); focusRequest = m_focus; } } else if (propertyChange->propertyName() == QByteArrayLiteral("focus")) { @@ -127,23 +127,23 @@ void KeyboardHandler::sceneChangeEvent(const QSceneChangePtr &e) void KeyboardHandler::requestFocus() { - KeyboardController *controller = m_inputHandler->keyboardControllerManager()->lookupResource(m_keyboardController); - if (controller && m_enabled) - controller->requestFocusForInput(peerId()); + KeyboardDevice *keyboardDevice = m_inputHandler->keyboardDeviceManager()->lookupResource(m_keyboardDevice); + if (keyboardDevice && m_enabled) + keyboardDevice->requestFocusForInput(peerId()); } -void KeyboardHandler::setController(QNodeId controller) +void KeyboardHandler::setSourcerDevice(QNodeId device) { - if (!m_keyboardController.isNull()) { - KeyboardController *controller = m_inputHandler->keyboardControllerManager()->lookupResource(m_keyboardController); - if (controller) - controller->removeKeyboardInput(peerId()); + if (!m_keyboardDevice.isNull()) { + KeyboardDevice *device = m_inputHandler->keyboardDeviceManager()->lookupResource(m_keyboardDevice); + if (device) + device->removeKeyboardInput(peerId()); } - m_keyboardController = controller; - if (!m_keyboardController.isNull()) { - KeyboardController *controller = m_inputHandler->keyboardControllerManager()->lookupResource(m_keyboardController); - if (controller) - controller->addKeyboardInput(peerId()); + m_keyboardDevice = device; + if (!m_keyboardDevice.isNull()) { + KeyboardDevice *device = m_inputHandler->keyboardDeviceManager()->lookupResource(m_keyboardDevice); + if (device) + device->addKeyboardInput(peerId()); } } diff --git a/src/input/backend/keyboardhandler_p.h b/src/input/backend/keyboardhandler_p.h index 204d4955e..805f5a028 100644 --- a/src/input/backend/keyboardhandler_p.h +++ b/src/input/backend/keyboardhandler_p.h @@ -68,7 +68,7 @@ class KeyboardHandler : public Qt3DCore::QBackendNode public: KeyboardHandler(); void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; - Qt3DCore::QNodeId keyboardController() const; + Qt3DCore::QNodeId keyboardDevice() const; void setInputHandler(InputHandler *handler); void setFocus(bool focus); void keyEvent(const QKeyEventPtr &event); @@ -78,11 +78,11 @@ public: protected: void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE; void requestFocus(); - void setController(Qt3DCore::QNodeId controller); + void setSourcerDevice(Qt3DCore::QNodeId device); private: InputHandler *m_inputHandler; - Qt3DCore::QNodeId m_keyboardController; + Qt3DCore::QNodeId m_keyboardDevice; bool m_focus; bool m_enabled; }; diff --git a/src/input/backend/keyboardmousegenericdeviceintegration.cpp b/src/input/backend/keyboardmousegenericdeviceintegration.cpp index 9046d89f3..6539aec89 100644 --- a/src/input/backend/keyboardmousegenericdeviceintegration.cpp +++ b/src/input/backend/keyboardmousegenericdeviceintegration.cpp @@ -75,13 +75,13 @@ QAbstractPhysicalDevice *KeyboardMouseGenericDeviceIntegration::createPhysicalDe QVector<Qt3DCore::QNodeId> KeyboardMouseGenericDeviceIntegration::physicalDevices() const { - // TO DO: could return the ids of active KeyboardController/MouseDevice + // TO DO: could return the ids of active KeyboardDevice/MouseDevice return QVector<Qt3DCore::QNodeId>(); } QAbstractPhysicalDeviceBackendNode *KeyboardMouseGenericDeviceIntegration::physicalDevice(Qt3DCore::QNodeId id) const { - QAbstractPhysicalDeviceBackendNode *device = m_handler->keyboardControllerManager()->lookupResource(id); + QAbstractPhysicalDeviceBackendNode *device = m_handler->keyboardDeviceManager()->lookupResource(id); if (!device) device = m_handler->mouseDeviceManager()->lookupResource(id); if (!device) diff --git a/src/input/frontend/frontend.pri b/src/input/frontend/frontend.pri index 86a946484..a6ae56f9d 100644 --- a/src/input/frontend/frontend.pri +++ b/src/input/frontend/frontend.pri @@ -1,7 +1,7 @@ HEADERS += \ $$PWD/qinputaspect.h \ - $$PWD/qkeyboardcontroller.h \ - $$PWD/qkeyboardcontroller_p.h \ + $$PWD/qkeyboarddevice.h \ + $$PWD/qkeyboarddevice_p.h \ $$PWD/qkeyboardhandler.h \ $$PWD/qkeyboardhandler_p.h \ $$PWD/qinputaspect_p.h \ @@ -34,7 +34,7 @@ HEADERS += \ SOURCES += \ $$PWD/qinputaspect.cpp \ - $$PWD/qkeyboardcontroller.cpp \ + $$PWD/qkeyboarddevice.cpp \ $$PWD/qkeyboardhandler.cpp \ $$PWD/qkeyevent.cpp \ $$PWD/qmousehandler.cpp \ diff --git a/src/input/frontend/qinputaspect.cpp b/src/input/frontend/qinputaspect.cpp index f3311705c..d12895491 100644 --- a/src/input/frontend/qinputaspect.cpp +++ b/src/input/frontend/qinputaspect.cpp @@ -40,11 +40,11 @@ #include "qinputaspect.h" #include "qinputaspect_p.h" #include "inputhandler_p.h" -#include "keyboardcontroller_p.h" +#include "keyboarddevice_p.h" #include "keyboardhandler_p.h" #include "mousedevice_p.h" #include "mousehandler_p.h" -#include <Qt3DInput/qkeyboardcontroller.h> +#include <Qt3DInput/qkeyboarddevice.h> #include <Qt3DInput/qkeyboardhandler.h> #include <Qt3DInput/qmousedevice.h> #include <Qt3DInput/qmousehandler.h> @@ -110,7 +110,7 @@ QInputAspectPrivate::QInputAspectPrivate() QInputAspect::QInputAspect(QObject *parent) : QAbstractAspect(*new QInputAspectPrivate, parent) { - registerBackendType<QKeyboardController>(QBackendNodeMapperPtr(new Input::KeyboardControllerFunctor(this, d_func()->m_inputHandler.data()))); + registerBackendType<QKeyboardDevice>(QBackendNodeMapperPtr(new Input::KeyboardDeviceFunctor(this, d_func()->m_inputHandler.data()))); registerBackendType<QKeyboardHandler>(QBackendNodeMapperPtr(new Input::KeyboardHandlerFunctor(d_func()->m_inputHandler.data()))); registerBackendType<QMouseDevice>(QBackendNodeMapperPtr(new Input::MouseDeviceFunctor(this, d_func()->m_inputHandler.data()))); registerBackendType<QMouseHandler>(QBackendNodeMapperPtr(new Input::MouseHandlerFunctor(d_func()->m_inputHandler.data()))); @@ -133,7 +133,7 @@ QInputAspect::QInputAspect(QObject *parent) // Plugins are QInputDeviceIntegration instances d->loadInputDevicePlugins(); - // KeyboardController and MouseDevice also provide their own QInputDeviceIntegration + // KeyboardDevice and MouseDevice also provide their own QInputDeviceIntegration d->m_inputHandler->addInputDeviceIntegration(d->m_keyboardMouseIntegration.data()); } diff --git a/src/input/frontend/qkeyboardcontroller.cpp b/src/input/frontend/qkeyboarddevice.cpp index 04f3f81ec..01ebd69f2 100644 --- a/src/input/frontend/qkeyboardcontroller.cpp +++ b/src/input/frontend/qkeyboarddevice.cpp @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#include "qkeyboardcontroller.h" -#include "qkeyboardcontroller_p.h" +#include "qkeyboarddevice.h" +#include "qkeyboarddevice_p.h" #include "qkeyboardhandler.h" #include <Qt3DCore/private/qscene_p.h> #include <Qt3DCore/qbackendscenepropertychange.h> @@ -49,7 +49,7 @@ using namespace Qt3DCore; namespace Qt3DInput { -QKeyboardControllerPrivate::QKeyboardControllerPrivate() +QKeyboardDevicePrivate::QKeyboardDevicePrivate() : QAbstractPhysicalDevicePrivate() { m_keyMap[QStringLiteral("escape")] = Qt::Key_Escape; @@ -202,82 +202,82 @@ QKeyboardControllerPrivate::QKeyboardControllerPrivate() } /*! - \class Qt3DInput::QKeyboardController + \class Qt3DInput::QKeyboardDevice \inmodule Qt3DInput \since 5.5 */ /*! - \qmltype KeyboardController + \qmltype KeyboardDevice \inqmlmodule Qt3D.Input \since 5.5 - \instantiates Qt3DInput::QKeyboardController + \instantiates Qt3DInput::QKeyboardDevice \inherits Node */ -QKeyboardController::QKeyboardController(QNode *parent) - : QAbstractPhysicalDevice(*new QKeyboardControllerPrivate, parent) +QKeyboardDevice::QKeyboardDevice(QNode *parent) + : QAbstractPhysicalDevice(*new QKeyboardDevicePrivate, parent) { } -QKeyboardController::~QKeyboardController() +QKeyboardDevice::~QKeyboardDevice() { QNode::cleanup(); } /*! - \qmlproperty KeyboardHandler Qt3D.Input::KeyboardController::activeInput + \qmlproperty KeyboardHandler Qt3D.Input::KeyboardDevice::activeInput \readonly */ -QKeyboardHandler *QKeyboardController::activeInput() const +QKeyboardHandler *QKeyboardDevice::activeInput() const { - Q_D(const QKeyboardController); + Q_D(const QKeyboardDevice); return d->m_activeInput; } -int QKeyboardController::axisCount() const +int QKeyboardDevice::axisCount() const { return 0; } -int QKeyboardController::buttonCount() const +int QKeyboardDevice::buttonCount() const { - Q_D(const QKeyboardController); + Q_D(const QKeyboardDevice); return d->m_keyNames.size(); } -QStringList QKeyboardController::axisNames() const +QStringList QKeyboardDevice::axisNames() const { return QStringList(); } -QStringList QKeyboardController::buttonNames() const +QStringList QKeyboardDevice::buttonNames() const { - Q_D(const QKeyboardController); + Q_D(const QKeyboardDevice); return d->m_keyNames; } -int QKeyboardController::axisIdentifier(const QString &name) const +int QKeyboardDevice::axisIdentifier(const QString &name) const { Q_UNUSED(name); return 0; } -int QKeyboardController::buttonIdentifier(const QString &name) const +int QKeyboardDevice::buttonIdentifier(const QString &name) const { - Q_D(const QKeyboardController); + Q_D(const QKeyboardDevice); return d->m_keyMap.value(name, 0); } /*! \internal */ -QKeyboardController::QKeyboardController(QKeyboardControllerPrivate &dd, QNode *parent) +QKeyboardDevice::QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent) : QAbstractPhysicalDevice(dd, parent) { } -void QKeyboardController::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) +void QKeyboardDevice::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) { - Q_D(QKeyboardController); + Q_D(QKeyboardDevice); QBackendScenePropertyChangePtr e = qSharedPointerCast<QBackendScenePropertyChange>(change); if (e->type() == NodeUpdated && e->propertyName() == QByteArrayLiteral("activeInput")) { QNodeId activeInputId = e->value().value<QNodeId>(); @@ -285,9 +285,9 @@ void QKeyboardController::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &chan } } -void QKeyboardController::setActiveInput(QKeyboardHandler *activeInput) +void QKeyboardDevice::setActiveInput(QKeyboardHandler *activeInput) { - Q_D(QKeyboardController); + Q_D(QKeyboardDevice); if (d->m_activeInput != activeInput) { d->m_activeInput = activeInput; emit activeInputChanged(activeInput); diff --git a/src/input/frontend/qkeyboardcontroller.h b/src/input/frontend/qkeyboarddevice.h index 3571c2058..e34461bd3 100644 --- a/src/input/frontend/qkeyboardcontroller.h +++ b/src/input/frontend/qkeyboarddevice.h @@ -37,27 +37,28 @@ ** ****************************************************************************/ -#ifndef QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_H -#define QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_H +#ifndef QT3DINPUT_INPUT_QKEYBOARDDEVICE_H +#define QT3DINPUT_INPUT_QKEYBOARDDEVICE_H #include <Qt3DInput/qt3dinput_global.h> #include <Qt3DInput/qabstractphysicaldevice.h> +#include <Qt3DInput/QKeyboardHandler> QT_BEGIN_NAMESPACE namespace Qt3DInput { -class QKeyboardControllerPrivate; +class QKeyboardDevicePrivate; class QKeyboardHandler; -class QT3DINPUTSHARED_EXPORT QKeyboardController : public Qt3DInput::QAbstractPhysicalDevice +class QT3DINPUTSHARED_EXPORT QKeyboardDevice : public Qt3DInput::QAbstractPhysicalDevice { Q_OBJECT Q_PROPERTY(Qt3DInput::QKeyboardHandler *activeInput READ activeInput NOTIFY activeInputChanged) public: - explicit QKeyboardController(QNode *parent = 0); - ~QKeyboardController(); + explicit QKeyboardDevice(QNode *parent = 0); + ~QKeyboardDevice(); QKeyboardHandler *activeInput() const; @@ -69,15 +70,15 @@ public: int buttonIdentifier(const QString &name) const Q_DECL_FINAL; protected: - QKeyboardController(QKeyboardControllerPrivate &dd, QNode *parent = 0); + QKeyboardDevice(QKeyboardDevicePrivate &dd, QNode *parent = 0); void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) Q_DECL_OVERRIDE; Q_SIGNALS: void activeInputChanged(QKeyboardHandler *activeInput); private: - Q_DECLARE_PRIVATE(QKeyboardController) - QT3D_CLONEABLE(QKeyboardController) + Q_DECLARE_PRIVATE(QKeyboardDevice) + QT3D_CLONEABLE(QKeyboardDevice) void setActiveInput(QKeyboardHandler *activeInput); }; @@ -85,4 +86,4 @@ private: QT_END_NAMESPACE -#endif // QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_H +#endif // QT3DINPUT_INPUT_QKEYBOARDDEVICE_H diff --git a/src/input/frontend/qkeyboardcontroller_p.h b/src/input/frontend/qkeyboarddevice_p.h index dd2918af6..e19c480fd 100644 --- a/src/input/frontend/qkeyboardcontroller_p.h +++ b/src/input/frontend/qkeyboarddevice_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_P_H -#define QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_P_H +#ifndef QT3DINPUT_INPUT_QKEYBOARDDEVICE_P_H +#define QT3DINPUT_INPUT_QKEYBOARDDEVICE_P_H // // W A R N I N G @@ -59,15 +59,15 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { -class QKeyboardController; +class QKeyboardDevice; class QKeyboardHandler; -class QKeyboardControllerPrivate : public Qt3DInput::QAbstractPhysicalDevicePrivate +class QKeyboardDevicePrivate : public Qt3DInput::QAbstractPhysicalDevicePrivate { public: - QKeyboardControllerPrivate(); + QKeyboardDevicePrivate(); - Q_DECLARE_PUBLIC(QKeyboardController) + Q_DECLARE_PUBLIC(QKeyboardDevice) QKeyboardHandler *m_activeInput; QHash<QString, int> m_keyMap; QStringList m_keyNames; @@ -77,4 +77,4 @@ public: QT_END_NAMESPACE -#endif // QT3DINPUT_INPUT_QKEYBOARDCONTROLLER_P_H +#endif // QT3DINPUT_INPUT_QKEYBOARDDEVICE_P_H diff --git a/src/input/frontend/qkeyboardhandler.cpp b/src/input/frontend/qkeyboardhandler.cpp index 57e75d00e..392231a2f 100644 --- a/src/input/frontend/qkeyboardhandler.cpp +++ b/src/input/frontend/qkeyboardhandler.cpp @@ -39,7 +39,7 @@ #include "qkeyboardhandler.h" #include "qkeyboardhandler_p.h" -#include "qkeyboardcontroller.h" +#include "qkeyboarddevice.h" #include <Qt3DCore/qbackendscenepropertychange.h> QT_BEGIN_NAMESPACE @@ -50,6 +50,7 @@ namespace Qt3DInput { namespace { + // SigMap and the sigMap table are taken from QQ2 QQuickKeysAttached struct SigMap { int key; @@ -107,7 +108,7 @@ const QByteArray keyToSignal(int key) QKeyboardHandlerPrivate::QKeyboardHandlerPrivate() : QComponentPrivate() - , m_sourceDevice(Q_NULLPTR) + , m_keyboardDevice(Q_NULLPTR) , m_focus(false) { m_shareable = false; @@ -167,10 +168,10 @@ void QKeyboardHandler::copy(const QNode *ref) QComponent::copy(ref); const QKeyboardHandler *input = static_cast<const QKeyboardHandler *>(ref); - // TO DO: We may want to store the controller id and only send a clone when we are the parent - // of the controller - if (input->d_func()->m_sourceDevice != Q_NULLPTR && input->d_func()->m_sourceDevice->parent() == ref) - setSourceDevice(qobject_cast<QKeyboardController *>(QNode::clone(input->d_func()->m_sourceDevice))); + // TO DO: We may want to store the keyboard device id and only send a clone when we are the parent + // of the keyboard device + if (input->d_func()->m_keyboardDevice != Q_NULLPTR && input->d_func()->m_keyboardDevice->parent() == ref) + setSourceDevice(qobject_cast<QKeyboardDevice *>(QNode::clone(input->d_func()->m_keyboardDevice))); } void QKeyboardHandler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) @@ -190,33 +191,33 @@ void QKeyboardHandler::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) } /*! - \qmlproperty KeyboardController Qt3D.Input::KeyboardHandler::controller + \qmlproperty KeyboardDevice Qt3D.Input::KeyboardHandler::device */ /*! - Sets the keyboard controller to \a controller. Without a valid controller, + Sets the keyboard device to \a keyboardDevice. Without a valid device, the QKeyboardHandler won't receive any event. */ -void QKeyboardHandler::setSourceDevice(QKeyboardController *sourceDevice) +void QKeyboardHandler::setSourceDevice(QKeyboardDevice *keyboardDevice) { Q_D(QKeyboardHandler); - if (d->m_sourceDevice != sourceDevice) { + if (d->m_keyboardDevice != keyboardDevice) { - if (sourceDevice && !sourceDevice->parent()) - sourceDevice->setParent(this); + if (keyboardDevice && !keyboardDevice->parent()) + keyboardDevice->setParent(this); - d->m_sourceDevice = sourceDevice; - emit sourceDeviceChanged(sourceDevice); + d->m_keyboardDevice = keyboardDevice; + emit sourceDeviceChanged(keyboardDevice); } } /*! - Returns the current keyboard controller. + Returns the current keyboard device. */ -QKeyboardController *QKeyboardHandler::sourceDevice() const +QKeyboardDevice *QKeyboardHandler::sourceDevice() const { Q_D(const QKeyboardHandler); - return d->m_sourceDevice; + return d->m_keyboardDevice; } /*! diff --git a/src/input/frontend/qkeyboardhandler.h b/src/input/frontend/qkeyboardhandler.h index ef2c89977..e9db17800 100644 --- a/src/input/frontend/qkeyboardhandler.h +++ b/src/input/frontend/qkeyboardhandler.h @@ -48,27 +48,27 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { -class QKeyboardController; +class QKeyboardDevice; class QKeyboardHandlerPrivate; class QT3DINPUTSHARED_EXPORT QKeyboardHandler : public Qt3DCore::QComponent { Q_OBJECT - Q_PROPERTY(Qt3DInput::QKeyboardController *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged) + Q_PROPERTY(Qt3DInput::QKeyboardDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged) Q_PROPERTY(bool focus READ focus WRITE setFocus NOTIFY focusChanged) public: explicit QKeyboardHandler(QNode *parent = 0); ~QKeyboardHandler(); - QKeyboardController *sourceDevice() const; + Qt3DInput::QKeyboardDevice *sourceDevice() const; bool focus() const; public Q_SLOTS: - void setSourceDevice(QKeyboardController *sourceDevice); + void setSourceDevice(Qt3DInput::QKeyboardDevice *keyboardDevice); void setFocus(bool focus); Q_SIGNALS: - void sourceDeviceChanged(QKeyboardController *sourceDevice); + void sourceDeviceChanged(QKeyboardDevice *keyboardDevice); void focusChanged(bool focus); void digit0Pressed(Qt3DInput::QKeyEvent *event); diff --git a/src/input/frontend/qkeyboardhandler_p.h b/src/input/frontend/qkeyboardhandler_p.h index 3613c071f..bfe3e351e 100644 --- a/src/input/frontend/qkeyboardhandler_p.h +++ b/src/input/frontend/qkeyboardhandler_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DInput { class QKeyboardHandler; -class QKeyboardController; +class QKeyboardDevice; class QKeyboardHandlerPrivate : public Qt3DCore::QComponentPrivate { @@ -68,7 +68,7 @@ public: void keyEvent(QKeyEvent *event); Q_DECLARE_PUBLIC(QKeyboardHandler) - QKeyboardController *m_sourceDevice; + QKeyboardDevice *m_keyboardDevice; bool m_focus; }; diff --git a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp index c95d15cff..d11d6b494 100644 --- a/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp +++ b/src/quick3d/imports/input/qt3dquick3dinputplugin.cpp @@ -39,7 +39,7 @@ #include <QtQml> #include <Qt3DInput/qgenericinputdevice.h> -#include <Qt3DInput/qkeyboardcontroller.h> +#include <Qt3DInput/qkeyboarddevice.h> #include <Qt3DInput/qkeyboardhandler.h> #include <Qt3DInput/qkeyevent.h> #include <Qt3DInput/qmousedevice.h> @@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE void Qt3DQuick3DInputPlugin::registerTypes(const char *uri) { qmlRegisterUncreatableType<Qt3DInput::QKeyEvent>(uri, 2, 0, "KeyEvent", QStringLiteral("Events cannot be created")); - qmlRegisterType<Qt3DInput::QKeyboardController>(uri, 2, 0, "KeyboardController"); + qmlRegisterType<Qt3DInput::QKeyboardDevice>(uri, 2, 0, "KeyboardDevice"); qmlRegisterType<Qt3DInput::QKeyboardHandler>(uri, 2, 0, "KeyboardHandler"); qmlRegisterType<Qt3DInput::QInputSettings>(uri, 2, 0, "InputSettings"); |