diff options
author | Kevin Ottens <kevin.ottens@kdab.com> | 2017-01-25 15:40:47 +0100 |
---|---|---|
committer | Kevin Ottens <kevin.ottens@kdab.com> | 2017-01-27 14:59:09 +0000 |
commit | 3a895576bf188e15d5ff03e704e192a87d4c16a0 (patch) | |
tree | f5eaa75dfb2fe523cc0b472385566e6f5f3d4bc2 /src/extras/defaults/qfirstpersoncameracontroller.h | |
parent | 633c2efcc5b7d6d4943985e9ea0a9b6ff90becbf (diff) |
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 <sean.harmer@kdab.com>
Diffstat (limited to 'src/extras/defaults/qfirstpersoncameracontroller.h')
-rw-r--r-- | src/extras/defaults/qfirstpersoncameracontroller.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/extras/defaults/qfirstpersoncameracontroller.h b/src/extras/defaults/qfirstpersoncameracontroller.h index e50d4db5a..0c72d5513 100644 --- a/src/extras/defaults/qfirstpersoncameracontroller.h +++ b/src/extras/defaults/qfirstpersoncameracontroller.h @@ -70,7 +70,8 @@ class QT3DEXTRASSHARED_EXPORT QFirstPersonCameraController : public Qt3DCore::QE Q_PROPERTY(Qt3DRender::QCamera *camera READ camera WRITE setCamera NOTIFY cameraChanged) Q_PROPERTY(float linearSpeed READ linearSpeed WRITE setLinearSpeed NOTIFY linearSpeedChanged) Q_PROPERTY(float lookSpeed READ lookSpeed WRITE setLookSpeed NOTIFY lookSpeedChanged) - + Q_PROPERTY(float acceleration READ acceleration WRITE setAcceleration NOTIFY accelerationChanged) + Q_PROPERTY(float deceleration READ deceleration WRITE setDeceleration NOTIFY decelerationChanged) public: explicit QFirstPersonCameraController(Qt3DCore::QNode *parent = nullptr); ~QFirstPersonCameraController(); @@ -78,15 +79,21 @@ public: Qt3DRender::QCamera *camera() const; float linearSpeed() const; float lookSpeed() const; + float acceleration() const; + float deceleration() const; void setCamera(Qt3DRender::QCamera *camera); void setLinearSpeed(float linearSpeed); void setLookSpeed(float lookSpeed); + void setAcceleration(float acceleration); + void setDeceleration(float deceleration); Q_SIGNALS: void cameraChanged(); void linearSpeedChanged(); void lookSpeedChanged(); + void accelerationChanged(); + void decelerationChanged(); private: Q_DECLARE_PRIVATE(QFirstPersonCameraController) |