diff options
| author | Franck Arrecot <franck.arrecot@kdab.com> | 2016-03-10 09:58:16 +0100 |
|---|---|---|
| committer | Franck Arrecot <franck.arrecot@gmail.com> | 2016-03-11 13:55:04 +0000 |
| commit | c4d7ad6b1e4672a98384724f5aa45338686f2e64 (patch) | |
| tree | 50fc2946e24b8d0c3cd849224c9924d012546d87 /examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp | |
| parent | 55e681ac6cad2a059785a08ac920748b5f60acf9 (diff) | |
Class QLogicComponent changes
Task-number: QTBUG-51448
Change-Id: I1359cbfe61dbef291859d15b16bda61639493432
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp')
| -rw-r--r-- | examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp index b671fdfc7..0a2fefc30 100644 --- a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp +++ b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp @@ -59,7 +59,7 @@ #include <Qt3DInput/QKeyboardController> #include <Qt3DInput/QMouseDevice> #include <Qt3DInput/QMouseEvent> -#include <Qt3DLogic/QLogicComponent> +#include <Qt3DLogic/QFrameAction> QT_BEGIN_NAMESPACE @@ -89,7 +89,7 @@ QFirstPersonCameraControllerPrivate::QFirstPersonCameraControllerPrivate() , m_keyboardController(new QKeyboardController()) , m_mouseDevice(new QMouseDevice()) , m_logicalDevice(new QLogicalDevice()) - , m_logicComponent(new Qt3DLogic::QLogicComponent()) + , m_frameAction(new Qt3DLogic::QFrameAction()) , m_linearSpeed(10.0f) , m_lookSpeed(180.0f) , m_firstPersonUp(QVector3D(0.0f, 1.0f, 0.0f)) @@ -168,16 +168,16 @@ void QFirstPersonCameraControllerPrivate::init() m_logicalDevice->addAxis(m_tzAxis); Q_Q(QFirstPersonCameraController); - //// LogicComponent + //// FrameAction - QObject::connect(m_logicComponent, SIGNAL(frameUpdate(float)), - q, SLOT(_q_onFrameUpdate(float))); + QObject::connect(m_frameAction, SIGNAL(triggered(float)), + q, SLOT(_q_onTriggered(float))); - q->addComponent(m_logicComponent); + q->addComponent(m_frameAction); q->addComponent(m_logicalDevice); } -void QFirstPersonCameraControllerPrivate::_q_onFrameUpdate(float dt) +void QFirstPersonCameraControllerPrivate::_q_onTriggered(float dt) { if (m_camera != Q_NULLPTR) { m_camera->translate(QVector3D(m_txAxis->value() * m_linearSpeed, |