diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-07 15:30:53 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-10 08:25:28 +0200 |
| commit | 61c84e2d9c46de40d22f6fafbdd23d4015025516 (patch) | |
| tree | 13c04fa5a90e75d5730babd6ab1cefef54b54417 /src/datavisualization/engine/seriesrendercache.cpp | |
| parent | ffc2e2039f58de256a98da395b5d0e87d5a176fc (diff) | |
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>
Diffstat (limited to 'src/datavisualization/engine/seriesrendercache.cpp')
| -rw-r--r-- | src/datavisualization/engine/seriesrendercache.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp index 9ce0fe99..1c7e5e80 100644 --- a/src/datavisualization/engine/seriesrendercache.cpp +++ b/src/datavisualization/engine/seriesrendercache.cpp @@ -128,11 +128,11 @@ void SeriesRenderCache::populate(QAbstract3DSeries *series, Abstract3DRenderer * } if (seriesChanged || changeTracker.meshRotationChanged) { - float angle = series->meshRotationAngle(); - if (angle) - m_meshRotation = QQuaternion::fromAxisAndAngle(series->meshRotationAxis(), series->meshRotationAngle()); - else + m_meshRotation = series->meshRotation().normalized(); + if (m_series->type() == QAbstract3DSeries::SeriesTypeBar + && (m_meshRotation.x() || m_meshRotation.z())) { m_meshRotation = identityQuaternion; + } changeTracker.meshRotationChanged = false; } |