Gradient color style support for complex meshes on static

Change-Id: Ie9f135a2f3139a429a451c338e03dcf0ea6b4533
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

5 files changed, 55 insertions, 3 deletions

diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index 23290d69..3f199dab 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -637,7 +637,7 @@ qreal QAbstract3DGraph::aspectRatio() const
  *
  * Defines if the rendering optimization is default or static. Default mode provides the full feature set at
  * reasonable performance. Static is a beta level feature and currently supports only a subset of the
- * features on the Scatter graph. Missing features are object gradient for mesh objects, both gradients
+ * features on the Scatter graph. Missing features are both gradient color styles
  * for points, and diffuse and specular color on rotations. At this point static is intended just for
  * introducing a new feature. It optimizes graph rendering and is ideal for large non-changing data
  * sets. It is slower with dynamic data changes and item rotations. Selection is not optimized, so using it
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 13f6e02c..bc3893b9 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -190,6 +190,7 @@ void Scatter3DRenderer::updateData()
                     }
                     if (renderArraySize != cache->oldArraySize()
                             || cache->object()->objectFile() != cache->oldMeshFileName()) {
+                        object->setScaleY(m_scaleY);
                         object->fullLoad(cache, m_dotSizeScale);
                         cache->setOldArraySize(renderArraySize);
                         cache->setOldMeshFileName(cache->object()->objectFile());
@@ -207,9 +208,26 @@ void Scatter3DRenderer::updateData()
 
 void Scatter3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesList)
 {
+    int seriesCount = seriesList.size();
+
+    // Check OptimizationStatic specific issues before populate marks changeTracker done
+    if (m_cachedOptimizationHint.testFlag(QAbstract3DGraph::OptimizationStatic)) {
+        for (int i = 0; i < seriesCount; i++) {
+            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 && cache->mesh() != QAbstract3DSeries::MeshPoint)
+                        cache->setStaticObjectUVDirty(true);
+                }
+            }
+        }
+    }
+
     Abstract3DRenderer::updateSeries(seriesList);
 
-    int seriesCount = seriesList.size();
     float maxItemSize = 0.0f;
     float itemSize = 0.0f;
     bool noSelection = true;
@@ -245,6 +263,12 @@ void Scatter3DRenderer::updateSeries(const QList<QAbstract3DSeries *> &seriesLis
                 else
                     m_haveGradientMeshSeries = true;
             }
+
+            if (cache->staticObjectUVDirty()) {
+                ScatterObjectBufferHelper *object = cache->bufferObject();
+                object->updateUVs(cache);
+                cache->setStaticObjectUVDirty(false);
+            }
         }
     }
     m_maxItemSize = maxItemSize;
@@ -313,6 +337,28 @@ void Scatter3DRenderer::updateAxisTitleVisibility(QAbstract3DAxis::AxisOrientati
         calculateSceneScalingFactors();
 }
 
+void Scatter3DRenderer::updateOptimizationHint(QAbstract3DGraph::OptimizationHints hint)
+{
+    Abstract3DRenderer::updateOptimizationHint(hint);
+
+    if (m_cachedOptimizationHint.testFlag(QAbstract3DGraph::OptimizationStatic)) {
+#if !defined(QT_OPENGL_ES_2)
+        if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
+            initGradientShaders(QStringLiteral(":/shaders/vertexShadow"),
+                                QStringLiteral(":/shaders/fragmentShadow"));
+        } else {
+            initGradientShaders(QStringLiteral(":/shaders/vertexTexture"),
+                                QStringLiteral(":/shaders/fragmentTexture"));
+        }
+#else
+        initGradientShaders(QStringLiteral(":/shaders/vertexTexture"),
+                            QStringLiteral(":/shaders/fragmentTexture"));
+#endif
+    } else {
+        Abstract3DRenderer::reInitShaders();
+    }
+}
+
 void Scatter3DRenderer::resetClickedStatus()
 {
     m_clickedIndex = Scatter3DController::invalidSelectionIndex();
@@ -2088,6 +2134,7 @@ void Scatter3DRenderer::initGradientShaders(const QString &vertexShader,
 {
     if (m_dotGradientShader)
         delete m_dotGradientShader;
+
     m_dotGradientShader = new ShaderHelper(this, vertexShader, fragmentShader);
     m_dotGradientShader->initialize();
 }
diff --git a/src/datavisualization/engine/scatter3drenderer_p.h b/src/datavisualization/engine/scatter3drenderer_p.h
index 5f82bf70..353dc098 100644
--- a/src/datavisualization/engine/scatter3drenderer_p.h
+++ b/src/datavisualization/engine/scatter3drenderer_p.h
@@ -98,6 +98,7 @@ public:
                           const QStringList &labels);
     void updateAxisTitleVisibility(QAbstract3DAxis::AxisOrientation orientation,
                                    bool visible);
+    void updateOptimizationHint(QAbstract3DGraph::OptimizationHints hint);
 
     QVector3D convertPositionToTranslation(const QVector3D &position, bool isAbsolute);
 
diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp
index dc4b9db3..5fcc97f0 100644
--- a/src/datavisualization/engine/seriesrendercache.cpp
+++ b/src/datavisualization/engine/seriesrendercache.cpp
@@ -37,7 +37,8 @@ SeriesRenderCache::SeriesRenderCache(QAbstract3DSeries *series, Abstract3DRender
       m_valid(false),
       m_visible(false),
       m_renderer(renderer),
-      m_objectDirty(true)
+      m_objectDirty(true),
+      m_staticObjectUVDirty(false)
 {
 }
 
diff --git a/src/datavisualization/engine/seriesrendercache_p.h b/src/datavisualization/engine/seriesrendercache_p.h
index 96b61b87..5047d671 100644
--- a/src/datavisualization/engine/seriesrendercache_p.h
+++ b/src/datavisualization/engine/seriesrendercache_p.h
@@ -71,6 +71,8 @@ public:
     inline bool isVisible() const { return m_visible; }
     inline void setDataDirty(bool state) { m_objectDirty = state; }
     inline bool dataDirty() const { return m_objectDirty; }
+    inline void setStaticObjectUVDirty(bool state) { m_staticObjectUVDirty = state; }
+    inline bool staticObjectUVDirty() { return m_staticObjectUVDirty; }
 
 protected:
     QAbstract3DSeries *m_series;
@@ -94,6 +96,7 @@ protected:
     bool m_visible;
     Abstract3DRenderer *m_renderer;
     bool m_objectDirty;
+    bool m_staticObjectUVDirty;
 };
 
 QT_END_NAMESPACE_DATAVISUALIZATION