Diffuse and specular color for static optimization

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

4 files changed, 33 insertions, 31 deletions

diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index 9f0e2d8f..090a833a 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -25,6 +25,7 @@
 #include "qcustom3ditem_p.h"
 #include "qcustom3dlabel_p.h"
 #include "qcustom3dvolume_p.h"
+#include "scatter3drenderer_p.h"
 
 #include <QtCore/qmath.h>
 
@@ -282,19 +283,35 @@ void Abstract3DRenderer::reInitShaders()
 {
 #if !defined(QT_OPENGL_ES_2)
     if (m_cachedShadowQuality > QAbstract3DGraph::ShadowQualityNone) {
-        initGradientShaders(QStringLiteral(":/shaders/vertexShadow"),
-                            QStringLiteral(":/shaders/fragmentShadowNoTexColorOnY"));
-        initShaders(QStringLiteral(":/shaders/vertexShadow"),
-                    QStringLiteral(":/shaders/fragmentShadowNoTex"));
+        if (m_cachedOptimizationHint.testFlag(QAbstract3DGraph::OptimizationStatic)
+                && qobject_cast<Scatter3DRenderer *>(this)) {
+            initGradientShaders(QStringLiteral(":/shaders/vertexShadow"),
+                                QStringLiteral(":/shaders/fragmentShadow"));
+            initShaders(QStringLiteral(":/shaders/vertexShadowNoMatrices"),
+                        QStringLiteral(":/shaders/fragmentShadowNoTex"));
+        } else {
+            initGradientShaders(QStringLiteral(":/shaders/vertexShadow"),
+                                QStringLiteral(":/shaders/fragmentShadowNoTexColorOnY"));
+            initShaders(QStringLiteral(":/shaders/vertexShadow"),
+                        QStringLiteral(":/shaders/fragmentShadowNoTex"));
+        }
         initBackgroundShaders(QStringLiteral(":/shaders/vertexShadow"),
                               QStringLiteral(":/shaders/fragmentShadowNoTex"));
         initCustomItemShaders(QStringLiteral(":/shaders/vertexShadow"),
                               QStringLiteral(":/shaders/fragmentShadow"));
     } else {
-        initGradientShaders(QStringLiteral(":/shaders/vertex"),
-                            QStringLiteral(":/shaders/fragmentColorOnY"));
-        initShaders(QStringLiteral(":/shaders/vertex"),
-                    QStringLiteral(":/shaders/fragment"));
+        if (m_cachedOptimizationHint.testFlag(QAbstract3DGraph::OptimizationStatic)
+                && qobject_cast<Scatter3DRenderer *>(this)) {
+            initGradientShaders(QStringLiteral(":/shaders/vertexTexture"),
+                                QStringLiteral(":/shaders/fragmentTexture"));
+            initShaders(QStringLiteral(":/shaders/vertexNoMatrices"),
+                        QStringLiteral(":/shaders/fragment"));
+        } else {
+            initGradientShaders(QStringLiteral(":/shaders/vertex"),
+                                QStringLiteral(":/shaders/fragmentColorOnY"));
+            initShaders(QStringLiteral(":/shaders/vertex"),
+                        QStringLiteral(":/shaders/fragment"));
+        }
         initBackgroundShaders(QStringLiteral(":/shaders/vertex"),
                               QStringLiteral(":/shaders/fragment"));
         initCustomItemShaders(QStringLiteral(":/shaders/vertexTexture"),
diff --git a/src/datavisualization/engine/engine.qrc b/src/datavisualization/engine/engine.qrc
index 936ed53f..88440bec 100644
--- a/src/datavisualization/engine/engine.qrc
+++ b/src/datavisualization/engine/engine.qrc
@@ -62,5 +62,7 @@
         <file alias="fragmentTexture3D">shaders/texture3d.frag</file>
         <file alias="vertexTexture3D">shaders/texture3d.vert</file>
         <file alias="fragmentTexture3DSlice">shaders/texture3dslice.frag</file>
+        <file alias="vertexShadowNoMatrices">shaders/shadowNoMatrices.vert</file>
+        <file alias="vertexNoMatrices">shaders/defaultNoMatrices.vert</file>
     </qresource>
 </RCC>
diff --git a/src/datavisualization/engine/qabstract3dgraph.cpp b/src/datavisualization/engine/qabstract3dgraph.cpp
index 2b9fc92a..c797f554 100644
--- a/src/datavisualization/engine/qabstract3dgraph.cpp
+++ b/src/datavisualization/engine/qabstract3dgraph.cpp
@@ -148,7 +148,7 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION
     \value OptimizationDefault
            Provides the full feature set at a reasonable performance.
     \value OptimizationStatic
-           Beta level feature. Optimizes the rendering of static data sets at the expense of some features.
+           Optimizes the rendering of static data sets at the expense of some features.
 */
 
 /*!
@@ -636,12 +636,10 @@ qreal QAbstract3DGraph::aspectRatio() const
  * \property QAbstract3DGraph::optimizationHints
  *
  * 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 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
- * with massive data sets is not advisable.
+ * reasonable performance. Static 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 with
+ * massive data sets is not advisable. Static works only on the Scatter graph and lacks the range gradient
+ * color style for points.
  * Defaults to \c{OptimizationDefault}.
  */
 void QAbstract3DGraph::setOptimizationHints(OptimizationHints hints)
diff --git a/src/datavisualization/engine/scatter3drenderer.cpp b/src/datavisualization/engine/scatter3drenderer.cpp
index 94d49e3c..4b6a258e 100644
--- a/src/datavisualization/engine/scatter3drenderer.cpp
+++ b/src/datavisualization/engine/scatter3drenderer.cpp
@@ -341,22 +341,7 @@ void Scatter3DRenderer::updateOptimizationHint(QAbstract3DGraph::OptimizationHin
 {
     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();
-    }
+    Abstract3DRenderer::reInitShaders();
 }
 
 void Scatter3DRenderer::resetClickedStatus()