diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-22 08:51:46 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-22 08:52:23 +0300 |
commit | 8cf5c6c8e171d2f5a17074cc9f892c1a763065b0 (patch) | |
tree | 7cfca53c381ece02bf6bf486f7de39008e6b78f0 /src/datavisualization | |
parent | c889c9bcd25b5a2c750c30edf3dab0bbda72c51a (diff) |
Removed obsolete additions (zComp -related)
Change-Id: If4cb4f89bdfd9dc357f8fc2d8cc1ad95e446c483
Change-Id: If4cb4f89bdfd9dc357f8fc2d8cc1ad95e446c483
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization')
-rw-r--r-- | src/datavisualization/engine/scatter3drenderer.cpp | 3 | ||||
-rw-r--r-- | src/datavisualization/engine/selectionpointer.cpp | 4 | ||||
-rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 7 |
3 files changed, 5 insertions, 9 deletions
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp index 3090433c..bd9bed55 100644 --- a/src/datavisualization/engine/scatter3drenderer.cpp +++ b/src/datavisualization/engine/scatter3drenderer.cpp @@ -182,8 +182,7 @@ void Scatter3DRenderer::updateScene(Q3DScene *scene) if (m_hasHeightAdjustmentChanged) { // Set initial m_cachedScene->activeCamera() position. Also update if height adjustment has changed. - scene->activeCamera()->setBaseOrientation(cameraDistanceVector, - zeroVector, upVector); + scene->activeCamera()->setBaseOrientation(cameraDistanceVector, zeroVector, upVector); m_hasHeightAdjustmentChanged = false; } diff --git a/src/datavisualization/engine/selectionpointer.cpp b/src/datavisualization/engine/selectionpointer.cpp index d665b948..19294ac8 100644 --- a/src/datavisualization/engine/selectionpointer.cpp +++ b/src/datavisualization/engine/selectionpointer.cpp @@ -122,7 +122,7 @@ void SelectionPointer::render(GLuint defaultFboHandle) QMatrix4x4 MVPMatrix; // Position the pointer ball - modelMatrix.translate(m_position + zeroVector); + modelMatrix.translate(m_position); // Scale the point with fixed values (at this point) modelMatrix.scale(QVector3D(0.05f, 0.05f, 0.05f)); @@ -159,7 +159,7 @@ void SelectionPointer::render(GLuint defaultFboHandle) // Position label QVector3D labelAlign(0.0f, 1.0f * scaledFontSize + 0.05f, 0.0f); - modelMatrixLabel.translate(m_position + labelAlign + zeroVector); + modelMatrixLabel.translate(m_position + labelAlign); // Position the label towards the camera qreal camRotationsX = camera->xRotation(); diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 3bb8cee0..664d97a2 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -422,8 +422,7 @@ void Surface3DRenderer::updateScene(Q3DScene *scene) // Set initial camera position // X must be 0 for rotation to work - we can use "setCameraRotation" for setting it later if (m_hasHeightAdjustmentChanged) { - scene->activeCamera()->setBaseOrientation(cameraDistanceVector, - zeroVector, upVector); + scene->activeCamera()->setBaseOrientation(cameraDistanceVector, zeroVector, upVector); // For now this is used just to make things once. Proper use will come m_hasHeightAdjustmentChanged = false; } @@ -482,9 +481,7 @@ void Surface3DRenderer::drawSlicedScene() // Set view matrix QMatrix4x4 viewMatrix; - viewMatrix.lookAt(QVector3D(0.0f, 0.0f, 1.0f), - zeroVector, - upVector); + viewMatrix.lookAt(QVector3D(0.0f, 0.0f, 1.0f), zeroVector, upVector); // Set light position lightPos = m_cachedScene->activeLight()->position(); |