diff options
Diffstat (limited to 'src/datavisualization/engine')
4 files changed, 7 insertions, 17 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 264d25d0..2c2654e6 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -258,11 +258,6 @@ void Bars3DRenderer::updateData() updateSelectedBar(m_selectedBarPos, m_selectedBarSeries); } -void Bars3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesList, bool updateVisibility) -{ - Abstract3DRenderer::updateSeries(seriesList, updateVisibility); -} - void Bars3DRenderer::updateScene(Q3DScene *scene) { if (m_hasNegativeValues) diff --git a/src/datavisualization/engine/bars3drenderer_p.h b/src/datavisualization/engine/bars3drenderer_p.h index e53f9bc5..89030b30 100644 --- a/src/datavisualization/engine/bars3drenderer_p.h +++ b/src/datavisualization/engine/bars3drenderer_p.h @@ -114,7 +114,6 @@ public: ~Bars3DRenderer(); void updateData(); - void updateSeries(const QList<QAbstract3DSeries *> &seriesList, bool updateVisibility); void updateScene(Q3DScene *scene); void render(GLuint defaultFboHandle = 0); 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); 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; } |