From 3a895576bf188e15d5ff03e704e192a87d4c16a0 Mon Sep 17 00:00:00 2001 From: Kevin Ottens Date: Wed, 25 Jan 2017 15:40:47 +0100 Subject: Add (ac|de)celeration to QFirstPersonCameraController Those two properties were added to the QML variant but not the C++ one. Let's fix this. Change-Id: Ibd0765993f42a7562bd922f2db5456c1fa6d6ad1 Reviewed-by: Sean Harmer --- src/extras/defaults/qfirstpersoncameracontroller_p.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/extras/defaults/qfirstpersoncameracontroller_p.h') diff --git a/src/extras/defaults/qfirstpersoncameracontroller_p.h b/src/extras/defaults/qfirstpersoncameracontroller_p.h index 9ea830f85..a4f4fc5f9 100644 --- a/src/extras/defaults/qfirstpersoncameracontroller_p.h +++ b/src/extras/defaults/qfirstpersoncameracontroller_p.h @@ -98,6 +98,7 @@ public: QFirstPersonCameraControllerPrivate(); void init(); + void applyAccelerations(); Qt3DRender::QCamera *m_camera; @@ -131,6 +132,8 @@ public: float m_linearSpeed; float m_lookSpeed; + float m_acceleration; + float m_deceleration; QVector3D m_firstPersonUp; void _q_onTriggered(float); -- cgit v1.2.3 From 87318ed7496c10880f9c46a1f817c66674026c97 Mon Sep 17 00:00:00 2001 From: Andy Maloney Date: Tue, 14 Mar 2017 12:13:45 -0400 Subject: Add zooming with scroll wheel to default camera controllers This adds zooming in and out with the mouse scroll wheel to the first person and orbit camera controllers. [ChangeLog][][] Added zooming with the mouse's scroll wheel to QFirstPersonCameraController and QOrbitCameraController Change-Id: I54dcb00948c94ea098de2b233107a389dd32225b Reviewed-by: Sean Harmer --- src/extras/defaults/qfirstpersoncameracontroller_p.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/extras/defaults/qfirstpersoncameracontroller_p.h') diff --git a/src/extras/defaults/qfirstpersoncameracontroller_p.h b/src/extras/defaults/qfirstpersoncameracontroller_p.h index a4f4fc5f9..d4080889b 100644 --- a/src/extras/defaults/qfirstpersoncameracontroller_p.h +++ b/src/extras/defaults/qfirstpersoncameracontroller_p.h @@ -116,6 +116,8 @@ public: Qt3DInput::QAnalogAxisInput *m_mouseRxInput; Qt3DInput::QAnalogAxisInput *m_mouseRyInput; + Qt3DInput::QAnalogAxisInput *m_mouseTzXInput; + Qt3DInput::QAnalogAxisInput *m_mouseTzYInput; Qt3DInput::QButtonAxisInput *m_keyboardTxPosInput; Qt3DInput::QButtonAxisInput *m_keyboardTyPosInput; Qt3DInput::QButtonAxisInput *m_keyboardTzPosInput; -- cgit v1.2.3 From fd7561f6983fb0f8aa46fe32cc902ab3f8b24d0d Mon Sep 17 00:00:00 2001 From: Robert Brock Date: Mon, 16 Jan 2017 18:56:07 +0000 Subject: Coding convention fix for Src/Extras Reordering the header includes to comply with Qt coding conventions Task-number: QTBUG-56185 Change-Id: I76f4eeb93b02b20f1d85d745f39253fd22327ef7 Reviewed-by: Sean Harmer --- src/extras/defaults/qfirstpersoncameracontroller_p.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/extras/defaults/qfirstpersoncameracontroller_p.h') diff --git a/src/extras/defaults/qfirstpersoncameracontroller_p.h b/src/extras/defaults/qfirstpersoncameracontroller_p.h index 9ea830f85..ed07d5e18 100644 --- a/src/extras/defaults/qfirstpersoncameracontroller_p.h +++ b/src/extras/defaults/qfirstpersoncameracontroller_p.h @@ -51,9 +51,11 @@ #ifndef QT3DEXTRAS_QFIRSTPERSONCAMERACONTROLLER_P_H #define QT3DEXTRAS_QFIRSTPERSONCAMERACONTROLLER_P_H +#include +#include + #include -#include -#include "qfirstpersoncameracontroller.h" + // // W A R N I N G -- cgit v1.2.3