diff options
| author | Keränen Pasi <pasi.keranen@digia.com> | 2013-09-27 09:05:53 +0300 |
|---|---|---|
| committer | Pasi Keränen <pasi.keranen@digia.com> | 2013-10-08 10:50:41 +0300 |
| commit | 66e1b09592efe77f839a0878ec6165a02408ca6f (patch) | |
| tree | 709736fc6693c014abc0467a7c1ac766c1c62c4f /src/datavisualization/input | |
| parent | 0daa4359bdaba6372bc8235550892afdef003120 (diff) | |
Added Camera QML API and Example
Change-Id: Ibc790ac6c720b6d22d68f662ff2f50e74a9abaae
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/input')
| -rw-r--r-- | src/datavisualization/input/q3dinputhandler.cpp | 8 | ||||
| -rw-r--r-- | src/datavisualization/input/qtouch3dinputhandler.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/datavisualization/input/q3dinputhandler.cpp b/src/datavisualization/input/q3dinputhandler.cpp index f6e73a7d..5267568c 100644 --- a/src/datavisualization/input/q3dinputhandler.cpp +++ b/src/datavisualization/input/q3dinputhandler.cpp @@ -142,9 +142,8 @@ void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos) #else if (QDataVis::InputStateRotating == inputState()) { // Calculate mouse movement since last frame - QPointF rotations = scene()->activeCamera()->rotations(); - float xRotation = rotations.x(); - float yRotation = rotations.y(); + qreal xRotation = scene()->activeCamera()->xRotation(); + qreal yRotation = scene()->activeCamera()->yRotation(); float mouseMoveX = float(inputPosition().x() - mousePos.x()) / (scene()->viewport().width() / rotationSpeed); float mouseMoveY = float(inputPosition().y() - mousePos.y()) @@ -152,7 +151,8 @@ void Q3DInputHandler::mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos) // Apply to rotations xRotation -= mouseMoveX; yRotation -= mouseMoveY; - scene()->activeCamera()->setRotations(QPointF(xRotation, yRotation)); + scene()->activeCamera()->setXRotation(xRotation); + scene()->activeCamera()->setYRotation(yRotation); scene()->activeCamera()->d_ptr->updateViewMatrix(1.0f); setPreviousInputPos(inputPosition()); diff --git a/src/datavisualization/input/qtouch3dinputhandler.cpp b/src/datavisualization/input/qtouch3dinputhandler.cpp index b0eabd34..fd079e88 100644 --- a/src/datavisualization/input/qtouch3dinputhandler.cpp +++ b/src/datavisualization/input/qtouch3dinputhandler.cpp @@ -188,9 +188,8 @@ void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position) if (QDataVis::InputStateRotating == q_ptr->inputState()) { Q3DScene *scene = q_ptr->scene(); Q3DCamera *camera = scene->activeCamera(); - QPointF rotations = camera->rotations(); - float xRotation = rotations.x(); - float yRotation = rotations.y(); + float xRotation = camera->xRotation(); + float yRotation = camera->yRotation(); QPointF inputPos = q_ptr->inputPosition(); float mouseMoveX = float(inputPos.x() - position.x()) / (scene->viewport().width() / rotationSpeed); @@ -198,7 +197,8 @@ void QTouch3DInputHandlerPrivate::handleRotation(const QPointF &position) / (scene->viewport().height() / rotationSpeed); xRotation -= mouseMoveX; yRotation -= mouseMoveY; - camera->setRotations(QPointF(xRotation, yRotation)); + camera->setXRotation(xRotation); + camera->setYRotation(yRotation); camera->d_ptr->updateViewMatrix(1.0f); q_ptr->setPreviousInputPos(inputPos.toPoint()); |