1 files changed, 65 insertions, 26 deletions

diff --git a/src/datavisualization/utils/scatterpointbufferhelper.cpp b/src/datavisualization/utils/scatterpointbufferhelper.cpp
index 2ddee31c..5076502f 100644
--- a/src/datavisualization/utils/scatterpointbufferhelper.cpp
+++ b/src/datavisualization/utils/scatterpointbufferhelper.cpp
@@ -25,8 +25,7 @@ const QVector3D hiddenPos(-1000.0f, -1000.0f, -1000.0f);
 
 ScatterPointBufferHelper::ScatterPointBufferHelper()
     : m_pointbuffer(0),
-      m_oldRemoveIndex(0),
-      m_oldRemove(false)
+      m_oldRemoveIndex(-1)
 {
     m_indicesType = GL_UNSIGNED_INT;
 }
@@ -48,7 +47,8 @@ void ScatterPointBufferHelper::pushPoint(uint pointIndex)
 {
     glBindBuffer(GL_ARRAY_BUFFER, m_pointbuffer);
 
-    if (m_oldRemove && m_oldRemoveIndex < pointIndex) {
+    // Pop the previous point if it is still pushed
+    if (m_oldRemoveIndex >= 0) {
         glBufferSubData(GL_ARRAY_BUFFER, m_oldRemoveIndex * sizeof(QVector3D),
                         sizeof(QVector3D), &m_bufferedPoints.at(m_oldRemoveIndex));
     }
@@ -60,20 +60,18 @@ void ScatterPointBufferHelper::pushPoint(uint pointIndex)
     glBindBuffer(GL_ARRAY_BUFFER, 0);
 
     m_oldRemoveIndex = pointIndex;
-    m_oldRemove = true;
 }
 
 void ScatterPointBufferHelper::popPoint()
 {
-    if (m_oldRemove) {
+    if (m_oldRemoveIndex >= 0) {
         glBindBuffer(GL_ARRAY_BUFFER, m_pointbuffer);
         glBufferSubData(GL_ARRAY_BUFFER, m_oldRemoveIndex * sizeof(QVector3D),
                         sizeof(QVector3D), &m_bufferedPoints.at(m_oldRemoveIndex));
         glBindBuffer(GL_ARRAY_BUFFER, 0);
     }
 
-    m_oldRemoveIndex = 0;
-    m_oldRemove = false;
+    m_oldRemoveIndex = -1;
 }
 
 void ScatterPointBufferHelper::load(ScatterSeriesRenderCache *cache)
@@ -91,14 +89,10 @@ void ScatterPointBufferHelper::load(ScatterSeriesRenderCache *cache)
         m_bufferedPoints.clear();
     }
 
-    QVector<QVector2D> buffered_uvs;
-    if (cache->colorStyle() == Q3DTheme::ColorStyleRangeGradient)
-        createRangeGradientUVs(cache, buffered_uvs);
-
     bool itemsVisible = false;
     m_bufferedPoints.resize(renderArraySize);
     for (int i = 0; i < renderArraySize; i++) {
-        ScatterRenderItem &item = renderArray[i];
+        const ScatterRenderItem &item = renderArray.at(i);
         if (!item.isVisible()) {
             m_bufferedPoints[i] = hiddenPos;
         } else {
@@ -107,10 +101,14 @@ void ScatterPointBufferHelper::load(ScatterSeriesRenderCache *cache)
         }
     }
 
+    QVector<QVector2D> buffered_uvs;
     if (itemsVisible)
         m_indexCount = renderArraySize;
 
     if (m_indexCount > 0) {
+        if (cache->colorStyle() == Q3DTheme::ColorStyleRangeGradient)
+            createRangeGradientUVs(cache, buffered_uvs);
+
         glGenBuffers(1, &m_pointbuffer);
         glBindBuffer(GL_ARRAY_BUFFER, m_pointbuffer);
         glBufferData(GL_ARRAY_BUFFER, m_bufferedPoints.size() * sizeof(QVector3D),
@@ -130,21 +128,60 @@ void ScatterPointBufferHelper::load(ScatterSeriesRenderCache *cache)
     }
 }
 
-void ScatterPointBufferHelper::updateUVs(ScatterSeriesRenderCache *cache)
+void ScatterPointBufferHelper::update(ScatterSeriesRenderCache *cache)
 {
-    QVector<QVector2D> buffered_uvs;
+    // It may be that the buffer hasn't yet been initialized, in case the entire series was
+    // hidden items. No need to update in that case.
+    if (m_indexCount > 0) {
+        const ScatterRenderItemArray &renderArray = cache->renderArray();
+        const int updateSize = cache->updateIndices().size();
 
-    createRangeGradientUVs(cache, buffered_uvs);
+        glBindBuffer(GL_ARRAY_BUFFER, m_pointbuffer);
+        for (int i = 0; i < updateSize; i++) {
+            int index = cache->updateIndices().at(i);
+            const ScatterRenderItem &item = renderArray.at(index);
+            if (!item.isVisible())
+                m_bufferedPoints[index] = hiddenPos;
+            else
+                m_bufferedPoints[index] = item.translation();
+
+            if (index != m_oldRemoveIndex) {
+                glBufferSubData(GL_ARRAY_BUFFER, index * sizeof(QVector3D),
+                                sizeof(QVector3D), &m_bufferedPoints.at(index));
+            }
+        }
+        glBindBuffer(GL_ARRAY_BUFFER, 0);
+    }
+}
 
-    if (buffered_uvs.size()) {
-        if (!m_uvbuffer)
-            glGenBuffers(1, &m_uvbuffer);
+void ScatterPointBufferHelper::updateUVs(ScatterSeriesRenderCache *cache)
+{
+    // It may be that the buffer hasn't yet been initialized, in case the entire series was
+    // hidden items. No need to update in that case.
+    if (m_indexCount > 0) {
+        QVector<QVector2D> buffered_uvs;
+        createRangeGradientUVs(cache, buffered_uvs);
 
-        glBindBuffer(GL_ARRAY_BUFFER, m_uvbuffer);
-        glBufferData(GL_ARRAY_BUFFER, buffered_uvs.size() * sizeof(QVector2D),
-                     &buffered_uvs.at(0), GL_STATIC_DRAW);
+        if (buffered_uvs.size()) {
+            if (!m_uvbuffer)
+                glGenBuffers(1, &m_uvbuffer);
 
-        glBindBuffer(GL_ARRAY_BUFFER, 0);
+            int updateSize = cache->updateIndices().size();
+            glBindBuffer(GL_ARRAY_BUFFER, m_uvbuffer);
+            if (updateSize) {
+                for (int i = 0; i < updateSize; i++) {
+                    int index = cache->updateIndices().at(i);
+                    glBufferSubData(GL_ARRAY_BUFFER, index * sizeof(QVector2D),
+                                    sizeof(QVector2D), &buffered_uvs.at(i));
+
+                }
+            } else {
+                glBufferData(GL_ARRAY_BUFFER, buffered_uvs.size() * sizeof(QVector2D),
+                             &buffered_uvs.at(0), GL_STATIC_DRAW);
+            }
+
+            glBindBuffer(GL_ARRAY_BUFFER, 0);
+        }
     }
 }
 
@@ -152,13 +189,15 @@ void ScatterPointBufferHelper::createRangeGradientUVs(ScatterSeriesRenderCache *
                                                       QVector<QVector2D> &buffered_uvs)
 {
     const ScatterRenderItemArray &renderArray = cache->renderArray();
-    const uint renderArraySize = renderArray.size();
-    buffered_uvs.resize(renderArraySize);
+    const bool updateAll = (cache->updateIndices().size() == 0);
+    const int updateSize = updateAll ? renderArray.size() : cache->updateIndices().size();
+    buffered_uvs.resize(updateSize);
 
     QVector2D uv;
     uv.setX(0.0f);
-    for (uint i = 0; i < renderArraySize; i++) {
-        const ScatterRenderItem &item = renderArray.at(i);
+    for (int i = 0; i < updateSize; i++) {
+        int index = updateAll ? i : cache->updateIndices().at(i);
+        const ScatterRenderItem &item = renderArray.at(index);
 
         float y = ((item.translation().y() + m_scaleY) * 0.5f) / m_scaleY;
         uv.setY(y);