diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-21 08:42:58 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-21 09:08:22 +0300 |
| commit | 298e5e4ab12d8542c42bf4ed9118ab3f579d8456 (patch) | |
| tree | d3e6a1ed3e2239c51e9233a7c73846cfd696c790 /src/datavisualization/engine/q3dcamera.cpp | |
| parent | d55ac244c5f627a0767732f56a180e832f18814c (diff) | |
Removed zComp
Task-number: QTRD-2488
Change-Id: I7d7b067a1d82a44aa349f553f0aff7c173969ea9
Change-Id: I7d7b067a1d82a44aa349f553f0aff7c173969ea9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/q3dcamera.cpp')
| -rw-r--r-- | src/datavisualization/engine/q3dcamera.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/datavisualization/engine/q3dcamera.cpp b/src/datavisualization/engine/q3dcamera.cpp index 26329eb7..86505ccb 100644 --- a/src/datavisualization/engine/q3dcamera.cpp +++ b/src/datavisualization/engine/q3dcamera.cpp @@ -518,7 +518,7 @@ QVector3D Q3DCamera::calculatePositionRelativeToCamera(const QVector3D &relative qreal distanceModifier) const { // Move the position with camera - GLfloat radiusFactor = relativePosition.z() * (1.5f + distanceModifier); + GLfloat radiusFactor = cameraDistance * (1.5f + distanceModifier); GLfloat xAngle; GLfloat yAngle; if (!fixedRotation) { @@ -532,6 +532,7 @@ QVector3D Q3DCamera::calculatePositionRelativeToCamera(const QVector3D &relative GLfloat zPos = radius * qCos(xAngle) * qCos(yAngle); GLfloat xPos = radius * qSin(xAngle) * qCos(yAngle); GLfloat yPos = (radiusFactor + relativePosition.y()) * qSin(yAngle); + // Keep in the set position in relation to camera return QVector3D(-xPos + relativePosition.x(), yPos + relativePosition.y(), |