diff options
author | Mika Salmela <mika.salmela@digia.com> | 2013-10-04 16:18:39 +0300 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2013-10-04 16:25:19 +0300 |
commit | 57f84a6683f6554b19a1463df1070603380f189e (patch) | |
tree | 52548da251c4eff9072c0bf537a26a8ac3ea0fdf /src/datavisualization/engine/selectionpointer.cpp | |
parent | b9b72df8bc8fd7078622661a6576c52627c1b327 (diff) |
No perspective for surface slice
Task-number: QTRD-2375
Change-Id: I6e6da54628a0b16fcfe7a9371deaff02686d1b1e
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/engine/selectionpointer.cpp')
-rw-r--r-- | src/datavisualization/engine/selectionpointer.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index 421c547e..8a68d792 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -100,13 +100,17 @@ void SelectionPointer::render(GLuint defaultFboHandle) // Get view matrix QMatrix4x4 viewMatrix; + QMatrix4x4 projectionMatrix; if (m_cachedIsSlicingActivated) { GLfloat camZPosSliced = 5.0f / m_autoScaleAdjustment + zComp; viewMatrix.lookAt(QVector3D(0.0f, 0.0f, camZPosSliced), QVector3D(0.0f, 0.0f, zComp), QVector3D(0.0f, 1.0f, 0.0f)); + projectionMatrix.ortho(-3.0f, 3.0, -3.0, 3.0, 0.1f, 100.0f); } else { viewMatrix = camera->viewMatrix(); + projectionMatrix.perspective(45.0f, (GLfloat)m_mainViewPort.width() + / (GLfloat)m_mainViewPort.height(), 0.1f, 100.0f); } // Calculate scale factor to get uniform font size @@ -114,9 +118,9 @@ void SelectionPointer::render(GLuint defaultFboHandle) GLfloat scaleFactor = scaledFontSize / (GLfloat)textureSize.height(); // Set up projection matrix - QMatrix4x4 projectionMatrix; - projectionMatrix.perspective(45.0f, (GLfloat)m_mainViewPort.width() - / (GLfloat)m_mainViewPort.height(), 0.1f, 100.0f); +// QMatrix4x4 projectionMatrix; +// projectionMatrix.perspective(45.0f, (GLfloat)m_mainViewPort.width() +// / (GLfloat)m_mainViewPort.height(), 0.1f, 100.0f); QMatrix4x4 modelMatrix; QMatrix4x4 MVPMatrix; |