Enable camera targeting.

Also fix custom item positioning in absolute mode as it was completely
broken in bars and z-coord was flipped in others.

Clarified Q3DObject::position property usage, namely that it is reserved
for internal use for now.

Some refactoring also done.

Task-number: QTRD-2567
Change-Id: I5da65b83a2f8ecf20f8fd054e59748278ef1a714
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 11 insertions, 9 deletions

diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 5f8eede9..09225b99 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -67,7 +67,6 @@ Scatter3DRenderer::Scatter3DRenderer(Scatter3DController *controller)
       m_selectedSeriesCache(0),
       m_oldSelectedSeriesCache(0),
       m_dotSizeScale(1.0f),
-      m_hasHeightAdjustmentChanged(true),
       m_maxItemSize(0.0f),
       m_clickedIndex(Scatter3DController::invalidSelectionIndex()),
       m_havePointSeries(false),
@@ -133,6 +132,13 @@ void Scatter3DRenderer::initializeOpenGL()
     loadBackgroundMesh();
 }
 
+void Scatter3DRenderer::fixCameraTarget(QVector3D &target)
+{
+    target.setX(target.x() * m_scaleX);
+    target.setY(target.y() * m_scaleY);
+    target.setZ(target.z() * -m_scaleZ);
+}
+
 void Scatter3DRenderer::updateData()
 {
     calculateSceneScalingFactors();
@@ -284,13 +290,6 @@ void Scatter3DRenderer::updateScene(Q3DScene *scene)
 {
     scene->activeCamera()->d_ptr->setMinYRotation(-90.0f);
 
-    if (m_hasHeightAdjustmentChanged) {
-        // Set initial camera position. Also update if height adjustment has changed.
-        scene->activeCamera()->d_ptr->setBaseOrientation(cameraDistanceVector, zeroVector,
-                                                         upVector);
-        m_hasHeightAdjustmentChanged = false;
-    }
-
     Abstract3DRenderer::updateScene(scene);
 }
 
@@ -2066,6 +2065,9 @@ void Scatter3DRenderer::calculateSceneScalingFactors()
     m_axisCacheX.setTranslate(-m_scaleX);
     m_axisCacheY.setTranslate(-m_scaleY);
     m_axisCacheZ.setTranslate(m_scaleZ);
+
+    updateCameraViewport();
+    updateCustomItemPositions();
 }
 
 void Scatter3DRenderer::initShaders(const QString &vertexShader, const QString &fragmentShader)
@@ -2252,7 +2254,7 @@ QVector3D Scatter3DRenderer::convertPositionToTranslation(const QVector3D &posit
     } else {
         xTrans = position.x() * m_scaleX;
         yTrans = position.y() * m_scaleY;
-        zTrans = position.z() * m_scaleZ;
+        zTrans = position.z() * -m_scaleZ;
     }
     return QVector3D(xTrans, yTrans, zTrans);
 }