summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/qt3d/examples-common/FirstPersonCameraController.qml16
-rw-r--r--examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp16
-rw-r--r--examples/qt3d/simple-qml/CameraController.qml18
-rw-r--r--src/input/backend/actioninput.cpp10
-rw-r--r--src/input/backend/actioninput_p.h4
-rw-r--r--src/input/backend/axisinput.cpp10
-rw-r--r--src/input/backend/axisinput_p.h4
-rw-r--r--src/input/backend/updateaxisactionjob.cpp20
-rw-r--r--src/input/frontend/qactioninput.cpp44
-rw-r--r--src/input/frontend/qactioninput.h8
-rw-r--r--src/input/frontend/qaxisinput.cpp16
-rw-r--r--src/input/frontend/qaxisinput.h8
-rw-r--r--tests/auto/input/axisinput/tst_axisinput.cpp14
-rw-r--r--tests/auto/input/qactioninput/tst_qactioninput.cpp14
-rw-r--r--tests/auto/input/qaxisinput/tst_qaxisinput.cpp14
15 files changed, 108 insertions, 108 deletions
diff --git a/examples/qt3d/examples-common/FirstPersonCameraController.qml b/examples/qt3d/examples-common/FirstPersonCameraController.qml
index 6c805a5bf..e439030ff 100644
--- a/examples/qt3d/examples-common/FirstPersonCameraController.qml
+++ b/examples/qt3d/examples-common/FirstPersonCameraController.qml
@@ -89,14 +89,14 @@ Entity {
id: leftMouseButtonAction
ActionInput {
sourceDevice: mouseSourceDevice
- keys: [MouseController.Left]
+ buttons: [MouseController.Left]
}
},
Action {
id: fineMotionAction
ActionInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_Shift]
+ buttons: [Qt.Key_Shift]
}
}
] // actions
@@ -122,12 +122,12 @@ Entity {
id: txAxis
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_Left]
+ buttons: [Qt.Key_Left]
scale: -1.0
}
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_Right]
+ buttons: [Qt.Key_Right]
scale: 1.0
}
},
@@ -135,12 +135,12 @@ Entity {
id: tzAxis
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_Up]
+ buttons: [Qt.Key_Up]
scale: 1.0
}
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_Down]
+ buttons: [Qt.Key_Down]
scale: -1.0
}
},
@@ -148,12 +148,12 @@ Entity {
id: tyAxis
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_PageUp]
+ buttons: [Qt.Key_PageUp]
scale: 1.0
}
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_PageDown]
+ buttons: [Qt.Key_PageDown]
scale: -1.0
}
}
diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp
index dd12ec344..049c577c7 100644
--- a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp
+++ b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp
@@ -99,12 +99,12 @@ void QFirstPersonCameraControllerPrivate::init()
//// Actions
// Left Mouse Button Action
- m_leftMouseButtonInput->setKeys(QVariantList() << QMouseController::Left);
+ m_leftMouseButtonInput->setButtons(QVariantList() << QMouseController::Left);
m_leftMouseButtonInput->setSourceDevice(m_mouseController);
m_leftMouseButtonAction->addInput(m_leftMouseButtonInput);
// Fine Motion Action
- m_fineMotionKeyInput->setKeys(QVariantList() << Qt::Key_Shift);
+ m_fineMotionKeyInput->setButtons(QVariantList() << Qt::Key_Shift);
m_fineMotionKeyInput->setSourceDevice(m_keyboardController);
m_fineMotionAction->addInput(m_fineMotionKeyInput);
@@ -121,37 +121,37 @@ void QFirstPersonCameraControllerPrivate::init()
m_ryAxis->addInput(m_mouseRyInput);
// Keyboard Pos Tx
- m_keyboardTxPosInput->setKeys(QVariantList() << Qt::Key_Right);
+ m_keyboardTxPosInput->setButtons(QVariantList() << Qt::Key_Right);
m_keyboardTxPosInput->setScale(1.0f);
m_keyboardTxPosInput->setSourceDevice(m_keyboardController);
m_txAxis->addInput(m_keyboardTxPosInput);
// Keyboard Pos Ty
- m_keyboardTyPosInput->setKeys(QVariantList() << Qt::Key_PageUp);
+ m_keyboardTyPosInput->setButtons(QVariantList() << Qt::Key_PageUp);
m_keyboardTyPosInput->setScale(1.0f);
m_keyboardTyPosInput->setSourceDevice(m_keyboardController);
m_tyAxis->addInput(m_keyboardTyPosInput);
// Keyboard Pos Tz
- m_keyboardTzPosInput->setKeys(QVariantList() << Qt::Key_Up);
+ m_keyboardTzPosInput->setButtons(QVariantList() << Qt::Key_Up);
m_keyboardTzPosInput->setScale(1.0f);
m_keyboardTzPosInput->setSourceDevice(m_keyboardController);
m_tzAxis->addInput(m_keyboardTzPosInput);
// Keyboard Neg Tx
- m_keyboardTxNegInput->setKeys(QVariantList() << Qt::Key_Left);
+ m_keyboardTxNegInput->setButtons(QVariantList() << Qt::Key_Left);
m_keyboardTxNegInput->setScale(-1.0f);
m_keyboardTxNegInput->setSourceDevice(m_keyboardController);
m_txAxis->addInput(m_keyboardTxNegInput);
// Keyboard Neg Ty
- m_keyboardTyNegInput->setKeys(QVariantList() << Qt::Key_PageDown);
+ m_keyboardTyNegInput->setButtons(QVariantList() << Qt::Key_PageDown);
m_keyboardTyNegInput->setScale(-1.0f);
m_keyboardTyNegInput->setSourceDevice(m_keyboardController);
m_tyAxis->addInput(m_keyboardTyNegInput);
// Keyboard Neg Tz
- m_keyboardTzNegInput->setKeys(QVariantList() << Qt::Key_Down);
+ m_keyboardTzNegInput->setButtons(QVariantList() << Qt::Key_Down);
m_keyboardTzNegInput->setScale(-1.0f);
m_keyboardTzNegInput->setSourceDevice(m_keyboardController);
m_tzAxis->addInput(m_keyboardTzNegInput);
diff --git a/examples/qt3d/simple-qml/CameraController.qml b/examples/qt3d/simple-qml/CameraController.qml
index 086c5ed7e..c00dd5ce2 100644
--- a/examples/qt3d/simple-qml/CameraController.qml
+++ b/examples/qt3d/simple-qml/CameraController.qml
@@ -93,7 +93,7 @@ Entity {
inputs: [
ActionInput {
sourceDevice: mouseSourceDevice
- keys: [MouseController.Left]
+ buttons: [MouseController.Left]
}
]
},
@@ -102,7 +102,7 @@ Entity {
inputs: [
ActionInput {
sourceDevice: mouseSourceDevice
- keys: [MouseController.Right]
+ buttons: [MouseController.Right]
}
]
},
@@ -111,7 +111,7 @@ Entity {
inputs: [
ActionInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_Shift]
+ buttons: [Qt.Key_Shift]
}
]
}
@@ -144,12 +144,12 @@ Entity {
inputs: [
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_Left]
+ buttons: [Qt.Key_Left]
scale: -1.0
},
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_Right]
+ buttons: [Qt.Key_Right]
scale: 1.0
}
]
@@ -159,12 +159,12 @@ Entity {
inputs: [
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_Up]
+ buttons: [Qt.Key_Up]
scale: 1.0
},
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_Down]
+ buttons: [Qt.Key_Down]
scale: -1.0
}
]
@@ -174,12 +174,12 @@ Entity {
inputs: [
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_PageUp]
+ buttons: [Qt.Key_PageUp]
scale: 1.0
},
AxisInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_PageDown]
+ buttons: [Qt.Key_PageDown]
scale: -1.0
}
]
diff --git a/src/input/backend/actioninput.cpp b/src/input/backend/actioninput.cpp
index b39275352..339f9a828 100644
--- a/src/input/backend/actioninput.cpp
+++ b/src/input/backend/actioninput.cpp
@@ -63,7 +63,7 @@ QVector<int> listToIntArray(const QVariantList &l)
ActionInput::ActionInput()
: Qt3DCore::QBackendNode()
- , m_keys(0)
+ , m_buttons(0)
, m_enabled(false)
{
}
@@ -72,7 +72,7 @@ void ActionInput::updateFromPeer(Qt3DCore::QNode *peer)
{
QActionInput *input = static_cast<QActionInput *>(peer);
m_enabled = input->isEnabled();
- m_keys = listToIntArray(input->keys());
+ m_buttons = listToIntArray(input->buttons());
if (input->sourceDevice())
m_sourceDevice = input->sourceDevice()->id();
}
@@ -81,7 +81,7 @@ void ActionInput::cleanup()
{
m_enabled = false;
m_sourceDevice = Qt3DCore::QNodeId();
- m_keys.clear();
+ m_buttons.clear();
}
void ActionInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
@@ -92,8 +92,8 @@ void ActionInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
m_sourceDevice = propertyChange->value().value<Qt3DCore::QNodeId>();
} else if (propertyChange->propertyName() == QByteArrayLiteral("enabled")) {
m_enabled = propertyChange->value().toBool();
- } else if (propertyChange->propertyName() == QByteArrayLiteral("keys")) {
- m_keys = listToIntArray(propertyChange->value().toList());
+ } else if (propertyChange->propertyName() == QByteArrayLiteral("buttons")) {
+ m_buttons = listToIntArray(propertyChange->value().toList());
}
}
}
diff --git a/src/input/backend/actioninput_p.h b/src/input/backend/actioninput_p.h
index 356ae02ff..b5e0c4265 100644
--- a/src/input/backend/actioninput_p.h
+++ b/src/input/backend/actioninput_p.h
@@ -67,13 +67,13 @@ public:
void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
void cleanup();
- inline QVector<int> keys() const { return m_keys; }
+ inline QVector<int> buttons() const { return m_buttons; }
inline Qt3DCore::QNodeId sourceDevice() const { return m_sourceDevice; }
inline bool isEnabled() const { return m_enabled; }
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
private:
- QVector<int> m_keys;
+ QVector<int> m_buttons;
Qt3DCore::QNodeId m_sourceDevice;
bool m_enabled;
};
diff --git a/src/input/backend/axisinput.cpp b/src/input/backend/axisinput.cpp
index a4143c7a5..d7bc4c5c3 100644
--- a/src/input/backend/axisinput.cpp
+++ b/src/input/backend/axisinput.cpp
@@ -71,14 +71,14 @@ AxisInput::AxisInput()
// AxisInput can have two types of behavior
// Axis input with source device and axis -> will retrieve the axis value from the source device
-// Axis input with source device and scale + keys -> will be used as a multiplication factor with other AxisInput
+// Axis input with source device and scale + buttons -> will be used as a multiplication factor with other AxisInput
void AxisInput::updateFromPeer(Qt3DCore::QNode *peer)
{
QAxisInput *input = static_cast<QAxisInput *>(peer);
m_axis = input->axis();
m_scale = input->scale();
m_enabled = input->isEnabled();
- m_keys = listToIntArray(input->keys());
+ m_buttons = listToIntArray(input->buttons());
if (input->sourceDevice())
m_sourceDevice = input->sourceDevice()->id();
}
@@ -88,7 +88,7 @@ void AxisInput::cleanup()
m_axis = 0;
m_enabled = false;
m_scale = 0.0f;
- m_keys.clear();
+ m_buttons.clear();
m_sourceDevice = Qt3DCore::QNodeId();
}
@@ -104,8 +104,8 @@ void AxisInput::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
m_axis = propertyChange->value().toInt();
} else if (propertyChange->propertyName() == QByteArrayLiteral("enabled")) {
m_enabled = propertyChange->value().toBool();
- } else if (propertyChange->propertyName() == QByteArrayLiteral("keys")) {
- m_keys = listToIntArray(propertyChange->value().toList());
+ } else if (propertyChange->propertyName() == QByteArrayLiteral("buttons")) {
+ m_buttons = listToIntArray(propertyChange->value().toList());
}
}
}
diff --git a/src/input/backend/axisinput_p.h b/src/input/backend/axisinput_p.h
index 310d32140..b430d2bd2 100644
--- a/src/input/backend/axisinput_p.h
+++ b/src/input/backend/axisinput_p.h
@@ -69,14 +69,14 @@ public:
inline int axis() const { return m_axis; }
inline float scale() const { return m_scale; }
- inline QVector<int> keys() const { return m_keys; }
+ inline QVector<int> buttons() const { return m_buttons; }
inline Qt3DCore::QNodeId sourceDevice() const { return m_sourceDevice; }
inline bool isEnabled() const { return m_enabled; }
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
private:
int m_axis;
- QVector<int> m_keys;
+ QVector<int> m_buttons;
Qt3DCore::QNodeId m_sourceDevice;
float m_scale;
bool m_enabled;
diff --git a/src/input/backend/updateaxisactionjob.cpp b/src/input/backend/updateaxisactionjob.cpp
index 264d576cb..b3da7535d 100644
--- a/src/input/backend/updateaxisactionjob.cpp
+++ b/src/input/backend/updateaxisactionjob.cpp
@@ -51,16 +51,16 @@ namespace Input {
namespace {
-bool anyOfRequiredKeysPressed(const QVector<int> &keys, QAbstractPhysicalDeviceBackendNode *physicalDeviceBackend)
+bool anyOfRequiredButtonsPressed(const QVector<int> &buttons, QAbstractPhysicalDeviceBackendNode *physicalDeviceBackend)
{
- bool validKeyWasPressed = false;
- Q_FOREACH (int key, keys) {
- if (physicalDeviceBackend->isButtonPressed(key)) {
- validKeyWasPressed = true;
+ bool validButtonWasPressed = false;
+ Q_FOREACH (int button, buttons) {
+ if (physicalDeviceBackend->isButtonPressed(button)) {
+ validButtonWasPressed = true;
break;
}
}
- return validKeyWasPressed;
+ return validButtonWasPressed;
}
} // anonymous
@@ -109,7 +109,7 @@ bool UpdateAxisActionJob::processActionInput(const Qt3DCore::QNodeId actionInput
if (physicalDeviceBackend != Q_NULLPTR) {
// Update the value
- return anyOfRequiredKeysPressed(actionInput->keys(), physicalDeviceBackend);
+ return anyOfRequiredButtonsPressed(actionInput->buttons(), physicalDeviceBackend);
}
} else if (m_handler->inputSequenceManager()->lookupResource(actionInputId)) {
InputSequence *inputSequence = m_handler->inputSequenceManager()->lookupResource(actionInputId);
@@ -172,13 +172,13 @@ void UpdateAxisActionJob::updateAxis(LogicalDevice *device)
if (physicalDeviceBackend != Q_NULLPTR) {
// Update the value
- const QVector<int> keys = axisInput->keys();
+ const QVector<int> buttons = axisInput->buttons();
// Axis was specified -> we take this as the base value
if (axisInput->axis() != -1)
axisValue += physicalDeviceBackend->processedAxisValue(axisInput->axis());
- else if (!keys.isEmpty()) {
+ else if (!buttons.isEmpty()) {
// TO DO: Linear Curver for the progression of the scale value
- if (anyOfRequiredKeysPressed(keys, physicalDeviceBackend))
+ if (anyOfRequiredButtonsPressed(buttons, physicalDeviceBackend))
axisValue += axisInput->scale();
}
}
diff --git a/src/input/frontend/qactioninput.cpp b/src/input/frontend/qactioninput.cpp
index 5faa0893f..817604764 100644
--- a/src/input/frontend/qactioninput.cpp
+++ b/src/input/frontend/qactioninput.cpp
@@ -56,7 +56,7 @@ public:
, m_sourceDevice(Q_NULLPTR)
{}
- QVariantList m_keys;
+ QVariantList m_buttons;
QAbstractPhysicalDevice *m_sourceDevice;
};
@@ -64,7 +64,7 @@ public:
\class Qt3DInput::QActionInput
\inmodule Qt3DInput
\inherits QAbstractActionInput
- \brief QActionInput stores Device and Keys used to trigger an input event.
+ \brief QActionInput stores Device and Buttons used to trigger an input event.
\since 5.7
*/
@@ -76,19 +76,19 @@ public:
\instantiates Qt3DInput::QActionInput
\brief QML frontend for the Qt3DInput::QActionInput C++ class.
- Links a physical device and selected keys on it which can trigger this action.
+ Links a physical device and selected buttons on it which can trigger this action.
- Each Action input can be triggered by one or many keys on a source device
+ Each Action input can be triggered by one or many buttons on a source device
\qml
ActionInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_A]
+ buttons: [Qt.Key_A]
}
\endqml
\qml
ActionInput {
sourceDevice: keyboardSourceDevice
- keys: [Qt.Key_A,Qt.Key_B]
+ buttons: [Qt.Key_A,Qt.Key_B]
}
\endqml
\since 5.7
@@ -112,12 +112,12 @@ QActionInput::~QActionInput()
}
/*!
- Return the Keys to trigger the QActionInput instance.
+ Return the Buttons to trigger the QActionInput instance.
*/
-QVariantList QActionInput::keys() const
+QVariantList QActionInput::buttons() const
{
Q_D(const QActionInput);
- return d->m_keys;
+ return d->m_buttons;
}
/*!
@@ -168,34 +168,34 @@ QAbstractPhysicalDevice *QActionInput::sourceDevice() const
}
/*!
- \fn QAbstractPhysicalDevice::keysChanged()
+ \fn QAbstractPhysicalDevice::buttonsChanged()
- This signal is emitted when the keys ascociated with the action input is changed.
+ This signal is emitted when the buttons ascociated with the action input is changed.
*/
/*!
- \qmlproperty QVariantList Qt3D.Input::ActionInput::keys
+ \qmlproperty QVariantList Qt3D.Input::ActionInput::buttons
- The Keys that can trigger this Action
+ The Buttons that can trigger this Action
*/
/*!
- \qmlsignal Qt3D.Input::ActionInput::keysChanged()
+ \qmlsignal Qt3D.Input::ActionInput::buttonsChanged()
- This signal is emitted when the keys ascociated with the action input is changed.
+ This signal is emitted when the buttons ascociated with the action input is changed.
- The corresponding handeler is \c onkeysChanged
+ The corresponding handeler is \c onbuttonsChanged
*/
/*!
- Set the keys to trigger the QActionInput instance.
+ Set the buttons to trigger the QActionInput instance.
*/
-void QActionInput::setKeys(const QVariantList &keys)
+void QActionInput::setButtons(const QVariantList &buttons)
{
Q_D(QActionInput);
- if (d->m_keys != keys) {
- d->m_keys = keys;
- emit keysChanged(keys);
+ if (d->m_buttons != buttons) {
+ d->m_buttons = buttons;
+ emit buttonsChanged(buttons);
}
}
@@ -204,7 +204,7 @@ void QActionInput::copy(const Qt3DCore::QNode *ref)
QNode::copy(ref);
const QActionInput *input = static_cast<const QActionInput *>(ref);
d_func()->m_sourceDevice = qobject_cast<QAbstractPhysicalDevice *>(QNode::clone(input->d_func()->m_sourceDevice));
- d_func()->m_keys = input->d_func()->m_keys;
+ d_func()->m_buttons = input->d_func()->m_buttons;
}
} // Qt3DInput
diff --git a/src/input/frontend/qactioninput.h b/src/input/frontend/qactioninput.h
index b3c39dc42..904821827 100644
--- a/src/input/frontend/qactioninput.h
+++ b/src/input/frontend/qactioninput.h
@@ -55,22 +55,22 @@ class QT3DINPUTSHARED_EXPORT QActionInput : public Qt3DInput::QAbstractActionInp
{
Q_OBJECT
Q_PROPERTY(Qt3DInput::QAbstractPhysicalDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged)
- Q_PROPERTY(QVariantList keys READ keys WRITE setKeys NOTIFY keysChanged)
+ Q_PROPERTY(QVariantList buttons READ buttons WRITE setButtons NOTIFY buttonsChanged)
public:
explicit QActionInput(Qt3DCore::QNode *parent = Q_NULLPTR);
~QActionInput();
QAbstractPhysicalDevice *sourceDevice() const;
- QVariantList keys() const;
+ QVariantList buttons() const;
public Q_SLOTS:
void setSourceDevice(QAbstractPhysicalDevice *sourceDevice);
- void setKeys(const QVariantList &keys);
+ void setButtons(const QVariantList &buttons);
Q_SIGNALS:
void sourceDeviceChanged(QAbstractPhysicalDevice *sourceDevice);
- void keysChanged(const QVariantList &keys);
+ void buttonsChanged(const QVariantList &buttons);
protected:
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
diff --git a/src/input/frontend/qaxisinput.cpp b/src/input/frontend/qaxisinput.cpp
index 6a81b22b0..fccb2a36d 100644
--- a/src/input/frontend/qaxisinput.cpp
+++ b/src/input/frontend/qaxisinput.cpp
@@ -55,7 +55,7 @@ public:
, m_axis(-1)
{}
- QVariantList m_keys;
+ QVariantList m_buttons;
QAbstractPhysicalDevice *m_sourceDevice;
float m_scale;
int m_axis;
@@ -136,19 +136,19 @@ int QAxisInput::axis() const
return d->m_axis;
}
-void QAxisInput::setKeys(const QVariantList &keys)
+void QAxisInput::setButtons(const QVariantList &buttons)
{
Q_D(QAxisInput);
- if (keys != d->m_keys) {
- d->m_keys = keys;
- emit keysChanged(keys);
+ if (buttons != d->m_buttons) {
+ d->m_buttons = buttons;
+ emit buttonsChanged(buttons);
}
}
-QVariantList QAxisInput::keys() const
+QVariantList QAxisInput::buttons() const
{
Q_D(const QAxisInput);
- return d->m_keys;
+ return d->m_buttons;
}
void QAxisInput::copy(const Qt3DCore::QNode *ref)
@@ -156,7 +156,7 @@ void QAxisInput::copy(const Qt3DCore::QNode *ref)
QNode::copy(ref);
const QAxisInput *input = static_cast<const QAxisInput *>(ref);
d_func()->m_sourceDevice = qobject_cast<QAbstractPhysicalDevice *>(QNode::clone(input->d_func()->m_sourceDevice));
- d_func()->m_keys = input->d_func()->m_keys;
+ d_func()->m_buttons = input->d_func()->m_buttons;
d_func()->m_scale = input->d_func()->m_scale;
d_func()->m_axis = input->d_func()->m_axis;
}
diff --git a/src/input/frontend/qaxisinput.h b/src/input/frontend/qaxisinput.h
index fc5972f85..c97371e6b 100644
--- a/src/input/frontend/qaxisinput.h
+++ b/src/input/frontend/qaxisinput.h
@@ -57,7 +57,7 @@ class QT3DINPUTSHARED_EXPORT QAxisInput : public Qt3DCore::QNode
Q_PROPERTY(Qt3DInput::QAbstractPhysicalDevice *sourceDevice READ sourceDevice WRITE setSourceDevice NOTIFY sourceDeviceChanged)
Q_PROPERTY(float scale READ scale WRITE setScale NOTIFY scaleChanged)
Q_PROPERTY(int axis READ axis WRITE setAxis NOTIFY axisChanged)
- Q_PROPERTY(QVariantList keys READ keys WRITE setKeys NOTIFY keysChanged)
+ Q_PROPERTY(QVariantList buttons READ buttons WRITE setButtons NOTIFY buttonsChanged)
public:
explicit QAxisInput(Qt3DCore::QNode *parent = Q_NULLPTR);
@@ -66,19 +66,19 @@ public:
QAbstractPhysicalDevice *sourceDevice() const;
float scale() const;
int axis() const;
- QVariantList keys() const;
+ QVariantList buttons() const;
public Q_SLOTS:
void setSourceDevice(QAbstractPhysicalDevice *sourceDevice);
void setScale(float scale);
void setAxis(int axis);
- void setKeys(const QVariantList &keys);
+ void setButtons(const QVariantList &buttons);
Q_SIGNALS:
void sourceDeviceChanged(QAbstractPhysicalDevice *sourceDevice);
void scaleChanged(float scale);
void axisChanged(int axis);
- void keysChanged(const QVariantList &keys);
+ void buttonsChanged(const QVariantList &buttons);
protected:
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
diff --git a/tests/auto/input/axisinput/tst_axisinput.cpp b/tests/auto/input/axisinput/tst_axisinput.cpp
index cc8576786..670a29ffa 100644
--- a/tests/auto/input/axisinput/tst_axisinput.cpp
+++ b/tests/auto/input/axisinput/tst_axisinput.cpp
@@ -60,7 +60,7 @@ private Q_SLOTS:
Qt3DInput::QAxisInput axisInput;
TestDevice sourceDevice;
- axisInput.setKeys(QVariantList() << QVariant(1 << 8));
+ axisInput.setButtons(QVariantList() << QVariant(1 << 8));
axisInput.setAxis(327);
axisInput.setScale(0.5f);
axisInput.setSourceDevice(&sourceDevice);
@@ -71,7 +71,7 @@ private Q_SLOTS:
// THEN
QCOMPARE(backendAxisInput.peerUuid(), axisInput.id());
QCOMPARE(backendAxisInput.isEnabled(), axisInput.isEnabled());
- compareKeys(backendAxisInput.keys(), axisInput.keys());
+ compareKeys(backendAxisInput.buttons(), axisInput.buttons());
QCOMPARE(backendAxisInput.axis(), axisInput.axis());
QCOMPARE(backendAxisInput.scale(), axisInput.scale());
QCOMPARE(backendAxisInput.sourceDevice(), sourceDevice.id());
@@ -85,7 +85,7 @@ private Q_SLOTS:
// THEN
QVERIFY(backendAxisInput.peerUuid().isNull());
QCOMPARE(backendAxisInput.scale(), 0.0f);
- QVERIFY(backendAxisInput.keys().isEmpty());
+ QVERIFY(backendAxisInput.buttons().isEmpty());
QCOMPARE(backendAxisInput.axis(), 0);
QCOMPARE(backendAxisInput.isEnabled(), false);
QCOMPARE(backendAxisInput.sourceDevice(), Qt3DCore::QNodeId());
@@ -94,7 +94,7 @@ private Q_SLOTS:
Qt3DInput::QAxisInput axisInput;
TestDevice sourceDevice;
- axisInput.setKeys(QVariantList() << QVariant(1 << 8));
+ axisInput.setButtons(QVariantList() << QVariant(1 << 8));
axisInput.setAxis(327);
axisInput.setScale(0.5f);
axisInput.setSourceDevice(&sourceDevice);
@@ -106,7 +106,7 @@ private Q_SLOTS:
// THEN
QVERIFY(backendAxisInput.peerUuid().isNull());
QCOMPARE(backendAxisInput.scale(), 0.0f);
- QVERIFY(backendAxisInput.keys().isEmpty());
+ QVERIFY(backendAxisInput.buttons().isEmpty());
QCOMPARE(backendAxisInput.axis(), 0);
QCOMPARE(backendAxisInput.isEnabled(), false);
QCOMPARE(backendAxisInput.sourceDevice(), Qt3DCore::QNodeId());
@@ -129,11 +129,11 @@ private Q_SLOTS:
// WHEN
updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
updateChange->setValue(QVariantList() << QVariant(64));
- updateChange->setPropertyName("keys");
+ updateChange->setPropertyName("buttons");
backendAxisInput.sceneChangeEvent(updateChange);
// THEN
- compareKeys(backendAxisInput.keys(), QVariantList() << QVariant(64));
+ compareKeys(backendAxisInput.buttons(), QVariantList() << QVariant(64));
// WHEN
updateChange.reset(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
diff --git a/tests/auto/input/qactioninput/tst_qactioninput.cpp b/tests/auto/input/qactioninput/tst_qactioninput.cpp
index 880bac382..0ece3055e 100644
--- a/tests/auto/input/qactioninput/tst_qactioninput.cpp
+++ b/tests/auto/input/qactioninput/tst_qactioninput.cpp
@@ -61,12 +61,12 @@ private Q_SLOTS:
QTest::newRow("defaultConstructed") << defaultConstructed;
Qt3DInput::QActionInput *actionInputWithKeys = new Qt3DInput::QActionInput();
- actionInputWithKeys->setKeys(QVariantList() << QVariant((1 << 1) | (1 << 5)));
+ actionInputWithKeys->setButtons(QVariantList() << QVariant((1 << 1) | (1 << 5)));
QTest::newRow("actionInputWithKeys") << actionInputWithKeys;
Qt3DInput::QActionInput *actionInputWithKeysAndSourceDevice = new Qt3DInput::QActionInput();
TestDevice *device = new TestDevice();
- actionInputWithKeysAndSourceDevice->setKeys(QVariantList() << QVariant((1 << 1) | (1 << 5)));
+ actionInputWithKeysAndSourceDevice->setButtons(QVariantList() << QVariant((1 << 1) | (1 << 5)));
actionInputWithKeysAndSourceDevice->setSourceDevice(device);
QTest::newRow("actionInputWithKeysAndSourceDevice") << actionInputWithKeysAndSourceDevice;
}
@@ -83,7 +83,7 @@ private Q_SLOTS:
// THEN
QVERIFY(clone != Q_NULLPTR);
QCOMPARE(actionInput->id(), clone->id());
- QCOMPARE(actionInput->keys(), clone->keys());
+ QCOMPARE(actionInput->buttons(), clone->buttons());
if (actionInput->sourceDevice() != Q_NULLPTR) {
QVERIFY(clone->sourceDevice() != Q_NULLPTR);
@@ -98,15 +98,15 @@ private Q_SLOTS:
TestArbiter arbiter(actionInput.data());
// WHEN
- QVariantList keys = QVariantList() << QVariant(555);
- actionInput->setKeys(keys);
+ QVariantList buttons = QVariantList() << QVariant(555);
+ actionInput->setButtons(buttons);
QCoreApplication::processEvents();
// THEN
QCOMPARE(arbiter.events.size(), 1);
Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
- QCOMPARE(change->propertyName(), "keys");
- QCOMPARE(change->value().toList(), keys);
+ QCOMPARE(change->propertyName(), "buttons");
+ QCOMPARE(change->value().toList(), buttons);
QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
arbiter.events.clear();
diff --git a/tests/auto/input/qaxisinput/tst_qaxisinput.cpp b/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
index 7f530af4f..dfda083fd 100644
--- a/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
+++ b/tests/auto/input/qaxisinput/tst_qaxisinput.cpp
@@ -61,14 +61,14 @@ private Q_SLOTS:
QTest::newRow("defaultConstructed") << defaultConstructed;
Qt3DInput::QAxisInput *axisInputWithKeysAndAxis = new Qt3DInput::QAxisInput();
- axisInputWithKeysAndAxis->setKeys(QVariantList() << QVariant((1 << 1) | (1 << 5)));
+ axisInputWithKeysAndAxis->setButtons(QVariantList() << QVariant((1 << 1) | (1 << 5)));
axisInputWithKeysAndAxis->setAxis(383);
axisInputWithKeysAndAxis->setScale(327.0f);
QTest::newRow("axisInputWithKeys") << axisInputWithKeysAndAxis;
Qt3DInput::QAxisInput *axisInputWithKeysAndSourceDevice = new Qt3DInput::QAxisInput();
TestDevice *device = new TestDevice();
- axisInputWithKeysAndSourceDevice->setKeys(QVariantList() << QVariant((1 << 1) | (1 << 5)));
+ axisInputWithKeysAndSourceDevice->setButtons(QVariantList() << QVariant((1 << 1) | (1 << 5)));
axisInputWithKeysAndSourceDevice->setSourceDevice(device);
axisInputWithKeysAndSourceDevice->setAxis(427);
axisInputWithKeysAndAxis->setScale(355.0f);
@@ -87,7 +87,7 @@ private Q_SLOTS:
// THEN
QVERIFY(clone != Q_NULLPTR);
QCOMPARE(axisInput->id(), clone->id());
- QCOMPARE(axisInput->keys(), clone->keys());
+ QCOMPARE(axisInput->buttons(), clone->buttons());
QCOMPARE(axisInput->axis(), clone->axis());
QCOMPARE(axisInput->scale(), clone->scale());
@@ -104,15 +104,15 @@ private Q_SLOTS:
TestArbiter arbiter(axisInput.data());
// WHEN
- QVariantList keys = QVariantList() << QVariant(555);
- axisInput->setKeys(keys);
+ QVariantList buttons = QVariantList() << QVariant(555);
+ axisInput->setButtons(buttons);
QCoreApplication::processEvents();
// THEN
QCOMPARE(arbiter.events.size(), 1);
Qt3DCore::QScenePropertyChangePtr change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
- QCOMPARE(change->propertyName(), "keys");
- QCOMPARE(change->value().toList(), keys);
+ QCOMPARE(change->propertyName(), "buttons");
+ QCOMPARE(change->value().toList(), buttons);
QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
arbiter.events.clear();
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 00:52:31 +0000