Option for softer shadows added

+ fixed a shadow shader bug that caused a little bit of shadowing always

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

4 files changed, 14 insertions, 52 deletions

diff --git a/examples/scatterchart/main.cpp b/examples/scatterchart/main.cpp
index c94e1cd6..b0135ef3 100644
--- a/examples/scatterchart/main.cpp
+++ b/examples/scatterchart/main.cpp
@@ -111,6 +111,9 @@ int main(int argc, char **argv)
     shadowQuality->addItem(QStringLiteral("Low"));
     shadowQuality->addItem(QStringLiteral("Medium"));
     shadowQuality->addItem(QStringLiteral("High"));
+    shadowQuality->addItem(QStringLiteral("Low Soft"));
+    shadowQuality->addItem(QStringLiteral("Medium Soft"));
+    shadowQuality->addItem(QStringLiteral("High Soft"));
     shadowQuality->setCurrentIndex(3);
 
     QFontComboBox *fontList = new QFontComboBox(widget);
diff --git a/examples/scatterchart/scatterchart.cpp b/examples/scatterchart/scatterchart.cpp
index 92b99652..aab230f2 100644
--- a/examples/scatterchart/scatterchart.cpp
+++ b/examples/scatterchart/scatterchart.cpp
@@ -160,20 +160,8 @@ void ScatterDataModifier::changeFontSize(int fontsize)
 
 void ScatterDataModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
 {
-    int quality = 0;
-    switch (sq) {
-    case QDataVis::ShadowLow:
-        quality = 1;
-        break;
-    case QDataVis::ShadowMedium:
-        quality = 2;
-        break;
-    case QDataVis::ShadowHigh:
-        quality = 3;
-        break;
-    }
-
-    // Updates the UI component to show correct shadow quality
+    int quality = int(sq);
+     // Updates the UI component to show correct shadow quality
     emit shadowQualityChanged(quality);
 }
 
@@ -318,18 +306,7 @@ void ScatterDataModifier::handleSelectionChange(int index)
 
 void ScatterDataModifier::changeShadowQuality(int quality)
 {
-    QDataVis::ShadowQuality sq = QDataVis::ShadowNone;
-    switch (quality) {
-    case 1:
-        sq = QDataVis::ShadowLow;
-        break;
-    case 2:
-        sq = QDataVis::ShadowMedium;
-        break;
-    case 3:
-        sq = QDataVis::ShadowHigh;
-        break;
-    }
+    QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
     m_chart->setShadowQuality(sq);
     emit shadowQualityChanged(quality);
 }
diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index 7468ec0d..106fd2d6 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/chart.cpp
@@ -114,6 +114,8 @@ ChartModifier::ChartModifier(Q3DBars *barchart)
     m_chart->addAxis(m_genericRowAxis);
     m_chart->addAxis(m_genericColumnAxis);
 
+    m_chart->setShadowQuality(QDataVis::ShadowSoftMedium);
+
     m_temperatureData->setItemLabelFormat(QStringLiteral("@valueTitle for @colLabel @rowLabel: @valueLabel"));
     m_genericData->setItemLabelFormat(QStringLiteral("@valueTitle for (@rowIdx, @colIdx): @valueLabel"));
 
@@ -436,19 +438,7 @@ void ChartModifier::changeFontSize(int fontsize)
 
 void ChartModifier::shadowQualityUpdatedByVisual(QDataVis::ShadowQuality sq)
 {
-    int quality = 0;
-    switch (sq) {
-    case QDataVis::ShadowLow:
-        quality = 1;
-        break;
-    case QDataVis::ShadowMedium:
-        quality = 2;
-        break;
-    case QDataVis::ShadowHigh:
-        quality = 3;
-        break;
-    }
-
+    int quality = int(sq);
     // Updates the UI component to show correct shadow quality
     emit shadowQualityChanged(quality);
 }
@@ -461,18 +451,7 @@ void ChartModifier::handleSelectionChange(const QPoint &position)
 
 void ChartModifier::changeShadowQuality(int quality)
 {
-    QDataVis::ShadowQuality sq = QDataVis::ShadowNone;
-    switch (quality) {
-    case 1:
-        sq = QDataVis::ShadowLow;
-        break;
-    case 2:
-        sq = QDataVis::ShadowMedium;
-        break;
-    case 3:
-        sq = QDataVis::ShadowHigh;
-        break;
-    }
+    QDataVis::ShadowQuality sq = QDataVis::ShadowQuality(quality);
     m_chart->setShadowQuality(sq);
     emit shadowQualityChanged(quality);
 }
diff --git a/examples/widget/main.cpp b/examples/widget/main.cpp
index a774c0e8..98d2dbbd 100644
--- a/examples/widget/main.cpp
+++ b/examples/widget/main.cpp
@@ -181,7 +181,10 @@ int main(int argc, char **argv)
     shadowQuality->addItem(QStringLiteral("Low"));
     shadowQuality->addItem(QStringLiteral("Medium"));
     shadowQuality->addItem(QStringLiteral("High"));
-    shadowQuality->setCurrentIndex(2);
+    shadowQuality->addItem(QStringLiteral("Low Soft"));
+    shadowQuality->addItem(QStringLiteral("Medium Soft"));
+    shadowQuality->addItem(QStringLiteral("High Soft"));
+    shadowQuality->setCurrentIndex(5);
 
     vLayout->addWidget(staticCheckBox, 0, Qt::AlignTop);
     vLayout->addWidget(rotationCheckBox, 0, Qt::AlignTop);