summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/engine/selectionpointer.cpp
diff options
context:
space:
mode:
authorTomi Korpipää <tomi.korpipaa@digia.com>2013-10-21 08:42:58 +0300
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-10-21 09:08:22 +0300
commit298e5e4ab12d8542c42bf4ed9118ab3f579d8456 (patch)
treed3e6a1ed3e2239c51e9233a7c73846cfd696c790 /src/datavisualization/engine/selectionpointer.cpp
parentd55ac244c5f627a0767732f56a180e832f18814c (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/selectionpointer.cpp')
-rw-r--r--src/datavisualization/engine/selectionpointer.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp
index 4fa9f688..b2c776f9 100644
--- a/src/datavisualization/engine/selectionpointer.cpp
+++ b/src/datavisualization/engine/selectionpointer.cpp
@@ -105,11 +105,11 @@ void SelectionPointer::render(GLuint defaultFboHandle)
QMatrix4x4 projectionMatrix;
if (m_cachedIsSlicingActivated) {
GLfloat aspect = (GLfloat)m_mainViewPort.width() / (GLfloat)m_mainViewPort.height();
- viewMatrix.lookAt(QVector3D(0.0f, 0.0f, zComp + 1.0),
- QVector3D(0.0f, 0.0f, zComp),
+ viewMatrix.lookAt(QVector3D(0.0f, 0.0f, 1.0f),
+ QVector3D(0.0f, 0.0f, 0.0f),
QVector3D(0.0f, 1.0f, 0.0f));
projectionMatrix.ortho(-sliceUnits * aspect, sliceUnits * aspect,
- -sliceUnits, sliceUnits, -1.0f, 14.0f);
+ -sliceUnits, sliceUnits, -1.0f, 4.0f);
} else {
viewMatrix = camera->viewMatrix();
projectionMatrix.perspective(45.0f, (GLfloat)m_mainViewPort.width()
@@ -124,7 +124,7 @@ void SelectionPointer::render(GLuint defaultFboHandle)
QMatrix4x4 MVPMatrix;
// Position the pointer ball
- modelMatrix.translate(m_position + QVector3D(0.0f, 0.0f, zComp));
+ modelMatrix.translate(m_position + QVector3D(0.0f, 0.0f, 0.0f));
// Scale the point with fixed values (at this point)
modelMatrix.scale(QVector3D(0.05f, 0.05f, 0.05f));
@@ -161,7 +161,7 @@ void SelectionPointer::render(GLuint defaultFboHandle)
// Position label
QVector3D labelAlign(0.0f, 1.0f * scaledFontSize + 0.05f, 0.0f);
- modelMatrixLabel.translate(m_position + labelAlign + QVector3D(0.0f, 0.0f, zComp));
+ modelMatrixLabel.translate(m_position + labelAlign + QVector3D(0.0f, 0.0f, 0.0f));
// Position the label towards the camera
qreal camRotationsX = camera->xRotation();