diff options
Diffstat (limited to 'src/datavisualization/engine/surfaceseriesrendercache.cpp')
-rw-r--r-- | src/datavisualization/engine/surfaceseriesrendercache.cpp | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/src/datavisualization/engine/surfaceseriesrendercache.cpp b/src/datavisualization/engine/surfaceseriesrendercache.cpp index ba25d71d..1cce5288 100644 --- a/src/datavisualization/engine/surfaceseriesrendercache.cpp +++ b/src/datavisualization/engine/surfaceseriesrendercache.cpp @@ -16,35 +16,30 @@ ** ****************************************************************************/ -#include "seriesrendercache_p.h" #include "surfaceseriesrendercache_p.h" -#include "objecthelper_p.h" -#include "abstract3drenderer_p.h" +#include "surface3drenderer_p.h" #include "texturehelper_p.h" -#include "utils_p.h" QT_BEGIN_NAMESPACE_DATAVISUALIZATION -SurfaceSeriesRenderCache::SurfaceSeriesRenderCache() - : m_surfaceVisible(false), +SurfaceSeriesRenderCache::SurfaceSeriesRenderCache(QAbstract3DSeries *series, + Surface3DRenderer *renderer) + : SeriesRenderCache(series, renderer), + m_surfaceVisible(false), m_surfaceGridVisible(false), - m_surfaceFlatShading(true), - m_surfaceObj(new SurfaceObject), - m_sliceSurfaceObj(new SurfaceObject), - m_sampleSpace(QRect(0, 0, 0 , 0)), + m_surfaceFlatShading(false), + m_surfaceObj(new SurfaceObject(renderer)), + m_sliceSurfaceObj(new SurfaceObject(renderer)), + m_sampleSpace(QRect(0, 0, 0, 0)), m_selectionTexture(0), m_selectionIdStart(0), m_selectionIdEnd(0), m_flatChangeAllowed(true), - m_flatStatusDirty(false), - m_scale(QVector3D(1.0f, 1.0f, 1.0f)), - m_offset(QVector3D(0.0f, 0.0f, 0.0f)), + m_flatStatusDirty(true), m_sliceSelectionPointer(0), m_mainSelectionPointer(0), m_slicePointerActive(false), - m_mainPointerActive(false), - m_valid(false), - m_objectDirty(true) + m_mainPointerActive(false) { } @@ -52,17 +47,15 @@ SurfaceSeriesRenderCache::~SurfaceSeriesRenderCache() { } -void SurfaceSeriesRenderCache::populate(QSurface3DSeries *series, Abstract3DRenderer *renderer) +void SurfaceSeriesRenderCache::populate(bool newSeries) { - Q_ASSERT(series); + SeriesRenderCache::populate(newSeries); - SeriesRenderCache::populate(series, renderer); - - QSurface3DSeries::DrawFlags drawMode = series->drawMode(); + QSurface3DSeries::DrawFlags drawMode = series()->drawMode(); m_surfaceVisible = drawMode.testFlag(QSurface3DSeries::DrawSurface); m_surfaceGridVisible = drawMode.testFlag(QSurface3DSeries::DrawWireframe); - if (m_flatChangeAllowed && m_surfaceFlatShading != series->isFlatShadingEnabled()) { - m_surfaceFlatShading = series->isFlatShadingEnabled(); + if (m_flatChangeAllowed && m_surfaceFlatShading != series()->isFlatShadingEnabled()) { + m_surfaceFlatShading = series()->isFlatShadingEnabled(); m_flatStatusDirty = true; } } |