summaryrefslogtreecommitdiffstats
path: root/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-02-03 16:26:12 +0000
committerSean Harmer <sean.harmer@kdab.com>2016-02-03 22:17:59 +0000
commit27067c0f50007ea8761f277f805042b332a3d2ff (patch)
treee5d88d9519c254f45444ea0954f4d2a64f96d548 /examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp
parentc7a82aa53b7b0d74a392f7978a29d69c9615be9b (diff)
Take notice of the controller speeds
Change-Id: I5b1150b30220ca3e1b396a8f1433a99f0b07a5a5 Reviewed-by: Robert Brock <robert.brock@kdab.com> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp')
-rw-r--r--examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp
index 434b95228..065d4bf93 100644
--- a/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp
+++ b/examples/qt3d/examples-common/qfirstpersoncameracontroller.cpp
@@ -205,8 +205,8 @@ void QFirstPersonCameraControllerPrivate::_q_onFrameUpdate(float dt)
if (m_camera != Q_NULLPTR) {
m_camera->translate(m_vxyz * dt);
if (m_leftMouseButtonPressed) {
- m_camera->pan(m_lookSpeed * m_rxyz.x() * dt, m_firstPersonUp);
- m_camera->pan(m_lookSpeed * m_rxyz.y() * dt);
+ m_camera->pan(m_rxyz.x() * dt, m_firstPersonUp);
+ m_camera->pan(m_rxyz.y() * dt);
}
}
}
@@ -214,15 +214,15 @@ void QFirstPersonCameraControllerPrivate::_q_onFrameUpdate(float dt)
void QFirstPersonCameraControllerPrivate::_q_onAxisValueChanged(QString name, float value)
{
if (name == QStringLiteral("RX"))
- m_rxyz.setX(value);
+ m_rxyz.setX(value * m_lookSpeed);
else if (name == QStringLiteral("RY"))
- m_rxyz.setY(value);
+ m_rxyz.setY(value * m_lookSpeed);
else if (name == QStringLiteral("TX"))
- m_vxyz.setX(value);
+ m_vxyz.setX(value * m_linearSpeed);
else if (name == QStringLiteral("TY"))
- m_vxyz.setY(value);
+ m_vxyz.setY(value * m_linearSpeed);
else if (name == QStringLiteral("TZ"))
- m_vxyz.setZ(value);
+ m_vxyz.setZ(value * m_linearSpeed);
}
void QFirstPersonCameraControllerPrivate::_q_onActionStarted(QString name)