summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/qt3d/examples-common/FirstPersonCameraController.qml2
-rw-r--r--examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp18
-rw-r--r--examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h4
-rw-r--r--examples/qt3d/keyboardinput-qml/main.qml10
-rw-r--r--examples/qt3d/playground-qml/main.qml4
-rw-r--r--examples/qt3d/simple-qml/CameraController.qml2
-rw-r--r--examples/qt3d/wave/main.qml2
7 files changed, 21 insertions, 21 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 01:13:15 +0000