diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-06 14:00:25 +0200 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-06 14:23:31 +0200 |
commit | 811be6f81b2e8c4d9d23cff5b4287c8a5dc86fc3 (patch) | |
tree | 549f2a46531c853893e31083a12d3729d07c4a86 /src/datavisualization/data/qabstract3dseries_p.h | |
parent | e91237b54c2f58eaa8a2ce36bf016e2d8e8588f2 (diff) |
Change rotations to use angle and vector in APIs
Quaternions are pain in the behind to use, especially
in QML, so change them to angle + vector combinations.
Change-Id: I25eb5ea92deaf3a079e2e193cce2e8de89f3c3c4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/data/qabstract3dseries_p.h')
-rw-r--r-- | src/datavisualization/data/qabstract3dseries_p.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/datavisualization/data/qabstract3dseries_p.h b/src/datavisualization/data/qabstract3dseries_p.h index 6fbabd3d..3c9a9582 100644 --- a/src/datavisualization/data/qabstract3dseries_p.h +++ b/src/datavisualization/data/qabstract3dseries_p.h @@ -108,7 +108,8 @@ public: void setVisible(bool visible); void setMesh(QAbstract3DSeries::Mesh mesh); void setMeshSmooth(bool enable); - void setMeshRotation(const QQuaternion &rotation); + void setMeshRotationAxis(const QVector3D &axis); + void setMeshRotationAngle(float angle); void setUserDefinedMesh(const QString &meshFile); void setColorStyle(Q3DTheme::ColorStyle style); @@ -132,7 +133,8 @@ public: Abstract3DController *m_controller; QAbstract3DSeries::Mesh m_mesh; bool m_meshSmooth; - QQuaternion m_meshRotation; + QVector3D m_meshRotationAxis; + float m_meshRotationAngle; QString m_userDefinedMesh; Q3DTheme::ColorStyle m_colorStyle; |