Mostly revert the rotations refactor

Quaternions are actually easier to use in most use cases.
Added some convenience functionality for QML to enable using
axis/angle combinations, too.

Change-Id: I61c76e0967b4808aa9adaf43dfe6f4596c9ce353
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 0c835c77..a2321546 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -210,14 +210,10 @@ void Scatter3DRenderer::updateData()
                     && (dotPos.z() >= minZ && dotPos.z() <= maxZ)) {
                 renderItem.setPosition(dotPos);
                 renderItem.setVisible(true);
-                float angle = dataArray.at(i).rotationAngle();
-                if (angle) {
-                    renderItem.setRotation(QQuaternion::fromAxisAndAngle(
-                                               dataArray.at(i).rotationAxis(),
-                                               dataArray.at(i).rotationAngle()));
-                } else {
+                if (!dataArray.at(i).rotation().isIdentity())
+                    renderItem.setRotation(dataArray.at(i).rotation().normalized());
+                else
                     renderItem.setRotation(identityQuaternion);
-                }
                 calculateTranslation(renderItem);
             } else {
                 renderItem.setVisible(false);