Fix changing items in static optimization mode

Task-number: QTRD-3344
Change-Id: I8c1d2e2ae4afd6f9058c59adfc3d784b5f724358
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

4 files changed, 77 insertions, 22 deletions

diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 277ef03e..0cbf2e26 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -495,6 +495,8 @@ void Abstract3DRenderer::updateMargin(float margin)
 void Abstract3DRenderer::updateOptimizationHint(QAbstract3DGraph::OptimizationHints hint)
 {
     m_cachedOptimizationHint = hint;
+    foreach (SeriesRenderCache *cache, m_renderCacheList)
+        cache->setDataDirty(true);
 }
 
 void Abstract3DRenderer::handleResize()
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 5fe69472..b2e0e6e4 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -260,11 +260,13 @@ void Scatter3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesLis
             QScatter3DSeries *scatterSeries = static_cast<QScatter3DSeries *>(seriesList[i]);
             if (scatterSeries->isVisible()) {
                 QAbstract3DSeriesChangeBitField &changeTracker = scatterSeries->d_ptr->m_changeTracker;
-                if (changeTracker.baseGradientChanged || changeTracker.colorStyleChanged) {
-                    ScatterSeriesRenderCache *cache =
-                            static_cast<ScatterSeriesRenderCache *>(m_renderCacheList.value(scatterSeries));
-                    if (cache)
+                ScatterSeriesRenderCache *cache =
+                        static_cast<ScatterSeriesRenderCache *>(m_renderCacheList.value(scatterSeries));
+                if (cache) {
+                    if (changeTracker.baseGradientChanged || changeTracker.colorStyleChanged)
                         cache->setStaticObjectUVDirty(true);
+                    if (cache->itemSize() != scatterSeries->itemSize())
+                        cache->setStaticBufferDirty(true);
                 }
             }
         }
@@ -308,6 +310,13 @@ void Scatter3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesLis
                     m_haveGradientMeshSeries = true;
             }
 
+            if (cache->staticBufferDirty()) {
+                if (cache->mesh() != QAbstract3DSeries::MeshPoint) {
+                    ScatterObjectBufferHelper *object = cache->bufferObject();
+                    object->update(cache, m_dotSizeScale);
+                }
+                cache->setStaticBufferDirty(false);
+            }
             if (cache->staticObjectUVDirty()) {
                 if (cache->mesh() == QAbstract3DSeries::MeshPoint) {
                     ScatterPointBufferHelper *object = cache->bufferPoints();
@@ -340,6 +349,8 @@ void Scatter3DRenderer::updateItems(const QVector<Scatter3DController::ChangeIte
     ScatterSeriesRenderCache *cache = 0;
     const QScatter3DSeries *prevSeries = 0;
     const QScatterDataArray *dataArray = 0;
+    const bool optimizationStatic = m_cachedOptimizationHint.testFlag(
+                QAbstract3DGraph::OptimizationStatic);
 
     foreach (Scatter3DController::ChangeItem item, items) {
         QScatter3DSeries *currentSeries = item.series;
@@ -354,7 +365,41 @@ void Scatter3DRenderer::updateItems(const QVector<Scatter3DController::ChangeIte
         }
         if (cache->isVisible()) {
             const int index = item.index;
-            updateRenderItem(dataArray->at(index), cache->renderArray()[index]);
+            bool oldVisibility;
+            ScatterRenderItem &item = cache->renderArray()[index];
+            if (optimizationStatic)
+                oldVisibility = item.isVisible();
+            updateRenderItem(dataArray->at(index), item);
+            if (optimizationStatic) {
+                if (!cache->visibilityChanged() && oldVisibility != item.isVisible())
+                    cache->setVisibilityChanged(true);
+                cache->updateIndices().append(index);
+            }
+        }
+    }
+    if (optimizationStatic) {
+        foreach (SeriesRenderCache *baseCache, m_renderCacheList) {
+            ScatterSeriesRenderCache *cache = static_cast<ScatterSeriesRenderCache *>(baseCache);
+            if (cache->isVisible() && cache->updateIndices().size()) {
+                if (cache->mesh() == QAbstract3DSeries::MeshPoint) {
+                    cache->bufferPoints()->update(cache);
+                    if (cache->colorStyle() == Q3DTheme::ColorStyleRangeGradient)
+                        cache->bufferPoints()->updateUVs(cache);
+                } else {
+                    if (cache->visibilityChanged()) {
+                        // If any change changes item visibility, full load is needed to
+                        // resize the buffers.
+                        cache->updateIndices().clear();
+                        cache->bufferObject()->fullLoad(cache, m_dotSizeScale);
+                    } else {
+                        cache->bufferObject()->update(cache, m_dotSizeScale);
+                        if (cache->colorStyle() == Q3DTheme::ColorStyleRangeGradient)
+                            cache->bufferObject()->updateUVs(cache);
+                    }
+                }
+                cache->updateIndices().clear();
+            }
+            cache->setVisibilityChanged(false);
         }
     }
 }
@@ -801,8 +846,6 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
         }
     } else {
         dotShader = pointSelectionShader;
-        previousDrawingPoints = true;
-        dotShader->bind();
     }
 
     float rangeGradientYScaler = 0.5f / m_scaleY;
@@ -847,7 +890,15 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                                                  == Q3DTheme::ColorStyleUniform)))) {
                 previousDrawingPoints = drawingPoints;
                 if (drawingPoints) {
-                    dotShader = pointSelectionShader;
+                    if (!optimizationDefault && rangeGradientPoints) {
+#if !defined(QT_OPENGL_ES_2)
+                        dotShader = m_labelShader;
+#else
+                        dotShader = m_staticGradientPointShader;
+#endif
+                    } else {
+                        dotShader = pointSelectionShader;
+                    }
                 } else {
                     if (colorStyleIsUniform)
                         dotShader = m_dotShader;
@@ -859,13 +910,13 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
 
             if (!drawingPoints && !colorStyleIsUniform && previousMeshColorStyle != colorStyle) {
                 if (colorStyle == Q3DTheme::ColorStyleObjectGradient) {
-                    m_dotGradientShader->setUniformValue(m_dotGradientShader->gradientMin(), 0.0f);
-                    m_dotGradientShader->setUniformValue(m_dotGradientShader->gradientHeight(),
-                                                         0.5f);
+                    dotShader->setUniformValue(dotShader->gradientMin(), 0.0f);
+                    dotShader->setUniformValue(dotShader->gradientHeight(),
+                                               0.5f);
                 } else {
                     // Each dot is of uniform color according to its Y-coordinate
-                    m_dotGradientShader->setUniformValue(m_dotGradientShader->gradientHeight(),
-                                                         0.0f);
+                    dotShader->setUniformValue(dotShader->gradientHeight(),
+                                               0.0f);
                 }
             }
 
@@ -921,15 +972,8 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                     gradientTexture = cache->baseGradientTexture();
                 }
 
-                if (!optimizationDefault && rangeGradientPoints) {
-#if !defined(QT_OPENGL_ES_2)
-                    dotShader = m_labelShader;
-#else
-                    dotShader = m_staticGradientPointShader;
-#endif
-                    dotShader->bind();
+                if (!optimizationDefault && rangeGradientPoints)
                     gradientTexture = cache->baseGradientTexture();
-                }
 
                 GLfloat lightStrength = m_cachedTheme->lightStrength();
                 if (optimizationDefault && selectedSeries && (m_selectedItemIndex == i)) {
@@ -1134,6 +1178,7 @@ void Scatter3DRenderer::drawScene(const GLuint defaultFboHandle)
                     if (!drawingPoints)
                         glDisable(GL_POLYGON_OFFSET_FILL);
                 }
+                dotShader->bind();
             }
         }
     }
diff --git a/src/datavisualization/engine/scatterseriesrendercache.cpp b/src/datavisualization/engine/scatterseriesrendercache.cpp
index 4bc733ac..4930dde1 100644
--- a/src/datavisualization/engine/scatterseriesrendercache.cpp
+++ b/src/datavisualization/engine/scatterseriesrendercache.cpp
@@ -31,7 +31,8 @@ ScatterSeriesRenderCache::ScatterSeriesRenderCache(QAbstract3DSeries *series,
       m_oldRenderArraySize(0),
       m_oldMeshFileName(QString()),
       m_scatterBufferObj(0),
-      m_scatterBufferPoints(0)
+      m_scatterBufferPoints(0),
+      m_visibilityChanged(false)
 {
 }
 
diff --git a/src/datavisualization/engine/scatterseriesrendercache_p.h b/src/datavisualization/engine/scatterseriesrendercache_p.h
index e7643748..9c6e8e8f 100644
--- a/src/datavisualization/engine/scatterseriesrendercache_p.h
+++ b/src/datavisualization/engine/scatterseriesrendercache_p.h
@@ -63,6 +63,10 @@ public:
     inline ScatterObjectBufferHelper *bufferObject() const { return m_scatterBufferObj; }
     inline void setBufferPoints(ScatterPointBufferHelper *object) { m_scatterBufferPoints = object; }
     inline ScatterPointBufferHelper *bufferPoints() const { return m_scatterBufferPoints; }
+    inline QVector<int> &updateIndices() { return m_updateIndices; }
+    inline QVector<int> &bufferIndices() { return m_bufferIndices; }
+    inline void setVisibilityChanged(bool changed) { m_visibilityChanged = changed; }
+    inline bool visibilityChanged() const { return m_visibilityChanged; }
 
 protected:
     ScatterRenderItemArray m_renderArray;
@@ -73,6 +77,9 @@ protected:
     QString m_oldMeshFileName; // Used to detect if full buffer change needed
     ScatterObjectBufferHelper *m_scatterBufferObj;
     ScatterPointBufferHelper *m_scatterBufferPoints;
+    QVector<int> m_updateIndices; // Used as temporary cache during item updates
+    QVector<int> m_bufferIndices; // Cache for mapping renderarray to mesh buffer
+    bool m_visibilityChanged; // Used to detect if full buffer change needed
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION