Diffuse and specular color for static optimization

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

3 files changed, 16 insertions, 1 deletions

diff --git a/tests/directional/main.cpp b/tests/directional/main.cpp
index 2b077b97..551ab141 100644
--- a/tests/directional/main.cpp
+++ b/tests/directional/main.cpp
@@ -80,6 +80,9 @@ int main(int argc, char **argv)
     backgroundCheckBox->setText(QStringLiteral("Show background"));
     backgroundCheckBox->setChecked(true);
 
+    QCheckBox *optimizationCheckBox = new QCheckBox(widget);
+    optimizationCheckBox->setText(QStringLiteral("Optimization static"));
+
     QCheckBox *gridCheckBox = new QCheckBox(widget);
     gridCheckBox->setText(QStringLiteral("Show grid"));
     gridCheckBox->setChecked(true);
@@ -100,6 +103,7 @@ int main(int argc, char **argv)
     vLayout->addWidget(labelButton, 0, Qt::AlignTop);
     vLayout->addWidget(cameraButton, 0, Qt::AlignTop);
     vLayout->addWidget(toggleRotationButton, 0, Qt::AlignTop);
+    vLayout->addWidget(optimizationCheckBox);
     vLayout->addWidget(backgroundCheckBox);
     vLayout->addWidget(gridCheckBox);
     vLayout->addWidget(new QLabel(QStringLiteral("Change dot style")));
@@ -127,6 +131,8 @@ int main(int argc, char **argv)
 
     QObject::connect(modifier, &ScatterDataModifier::backgroundEnabledChanged,
                      backgroundCheckBox, &QCheckBox::setChecked);
+    QObject::connect(optimizationCheckBox, &QCheckBox::stateChanged,
+                     modifier, &ScatterDataModifier::enableOptimization);
     QObject::connect(modifier, &ScatterDataModifier::gridEnabledChanged,
                      gridCheckBox, &QCheckBox::setChecked);
     QObject::connect(itemStyleList, SIGNAL(currentIndexChanged(int)), modifier,
@@ -150,6 +156,7 @@ int main(int argc, char **argv)
                      &QFontComboBox::setCurrentFont);
 
     itemStyleList->setCurrentIndex(0);
+    optimizationCheckBox->setChecked(true);
 
     widget->show();
     return app.exec();
diff --git a/tests/directional/scatterdatamodifier.cpp b/tests/directional/scatterdatamodifier.cpp
index 1422cebb..2d6672b6 100644
--- a/tests/directional/scatterdatamodifier.cpp
+++ b/tests/directional/scatterdatamodifier.cpp
@@ -119,7 +119,14 @@ void ScatterDataModifier::addData()
     m_graph->seriesList().at(0)->dataProxy()->resetArray(dataArray);
 }
 
-//! [8]
+void ScatterDataModifier::enableOptimization(int enabled)
+{
+    if (enabled)
+        m_graph->setOptimizationHints(QAbstract3DGraph::OptimizationStatic);
+    else
+        m_graph->setOptimizationHints(QAbstract3DGraph::OptimizationDefault);
+}
+
 void ScatterDataModifier::changeStyle(int style)
 {
     QComboBox *comboBox = qobject_cast<QComboBox *>(sender());
diff --git a/tests/directional/scatterdatamodifier.h b/tests/directional/scatterdatamodifier.h
index b87fa89f..20e59cdc 100644
--- a/tests/directional/scatterdatamodifier.h
+++ b/tests/directional/scatterdatamodifier.h
@@ -39,6 +39,7 @@ public:
     void changeLabelStyle();
     void changeFont(const QFont &font);
     void changeFontSize(int fontsize);
+    void enableOptimization(int enabled);
     void setBackgroundEnabled(int enabled);
     void setGridEnabled(int enabled);
     void toggleRotation();