diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-25 18:32:01 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2016-02-29 11:12:57 +0000 |
commit | 8a30f6391791e468a680834d1e445102e6fe4d47 (patch) | |
tree | 2524bdb58338e0c7063fcd8172f338594946f4cd /examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h | |
parent | 3609ef317c5b454548b25d31100fd3d2090a6e9d (diff) |
Inputs overhauled
- Remove QAxisActionHandler
- Remove AxisAxtionHandler, AxisActionPayload, UpdateHandlerJob
- Make QLogicalDevice a QComponent
- QAction sending action active update to frontend
- QAxis sending axis value update to frontend
- QFirstPersonCameraController rewritten in a more efficient manner
Change-Id: I09a83f95b97238e4393a88103f76d8ba93e1403d
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h')
-rw-r--r-- | examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h b/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h index 29120e431..e1d53fa95 100644 --- a/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h +++ b/examples/qt3d/examples-common/qfirstpersoncameracontroller_p.h @@ -84,15 +84,19 @@ public: void init(); Qt3DRender::QCamera *m_camera; + QAction *m_leftMouseButtonAction; QAction *m_fineMotionAction; + QAxis *m_rxAxis; QAxis *m_ryAxis; QAxis *m_txAxis; QAxis *m_tyAxis; QAxis *m_tzAxis; + QActionInput *m_leftMouseButtonInput; QActionInput *m_fineMotionKeyInput; + QAxisInput *m_mouseRxInput; QAxisInput *m_mouseRyInput; QAxisInput *m_keyboardTxPosInput; @@ -101,23 +105,19 @@ public: QAxisInput *m_keyboardTxNegInput; QAxisInput *m_keyboardTyNegInput; QAxisInput *m_keyboardTzNegInput; + QKeyboardController *m_keyboardController; QMouseController *m_mouseController; + QLogicalDevice *m_logicalDevice; - QAxisActionHandler *m_axisActionHandler; + Qt3DLogic::QLogicComponent *m_logicComponent; + float m_linearSpeed; float m_lookSpeed; - QVector3D m_vxyz; - bool m_fineMotion; - QVector3D m_rxyz; - bool m_leftMouseButtonPressed; QVector3D m_firstPersonUp; void _q_onFrameUpdate(float); - void _q_onAxisValueChanged(QString, float); - void _q_onActionStarted(QString); - void _q_onActionFinished(QString); Q_DECLARE_PUBLIC(QFirstPersonCameraController) }; |