Background lighting fix

Example tweaks.
Default label transparanecy changed.

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

7 files changed, 20 insertions, 25 deletions

diff --git a/examples/barchart/main.cpp b/examples/barchart/main.cpp
index 5c2e1c1c..f2862bfd 100644
--- a/examples/barchart/main.cpp
+++ b/examples/barchart/main.cpp
@@ -112,8 +112,6 @@ ChartDataGenerator::ChartDataGenerator(Q3DBars *barchart)
 #ifndef CYCLE_THROUGH_THEMES
     // Set bar colors
     m_chart->setBarColor(QColor(Qt::gray), QColor(Qt::red), QColor(Qt::darkBlue));
-    //m_chart->setTheme(ThemeSystem);
-    m_chart->setLabelTransparency(TransparencyFromTheme);
 #else
     m_chart->setLabelTransparency(TransparencyNone);
 #endif
diff --git a/examples/mapdata/mapdata.cpp b/examples/mapdata/mapdata.cpp
index 29620aa5..7ce9fb03 100644
--- a/examples/mapdata/mapdata.cpp
+++ b/examples/mapdata/mapdata.cpp
@@ -240,24 +240,14 @@ void MapsModifier::changeTheme()
         theme = ThemeSystem;
 }
 
-//void MapsModifier::changeSelectionMode()
-//{
-//    static int selectionMode = 0;
-
-//    m_chart->setSelectionMode((SelectionMode)selectionMode);
-
-//    if (++selectionMode > (int)ModeZoomColumn)
-//        selectionMode = 0;
-//}
-
 void MapsModifier::changeTransparency()
 {
-    static int transparency = TransparencyFromTheme;
+    static int transparency = TransparencyNone;
 
     m_chart->setLabelTransparency((LabelTransparency)transparency);
 
     if (++transparency > TransparencyNoBackground)
-        transparency = TransparencyNone;
+        transparency = TransparencyFromTheme;
 }
 
 void MapsModifier::changeValueDimension(int dimension)
@@ -269,7 +259,7 @@ void MapsModifier::changeFont(const QFont &font)
 {
     QFont newFont = font;
     newFont.setPointSizeF(m_fontSize);
-    qDebug() << newFont << newFont.style();
+    //qDebug() << newFont << newFont.style();
     m_chart->setFont(newFont);
 }
 
diff --git a/examples/rainfall/main.cpp b/examples/rainfall/main.cpp
index 44d9d172..47acee0b 100644
--- a/examples/rainfall/main.cpp
+++ b/examples/rainfall/main.cpp
@@ -42,8 +42,8 @@
 #include "qdataitem.h"
 
 #include <QGuiApplication>
-#include <QTimer>
-#include <QDebug>
+#include <QFont>
+//#include <QDebug>
 
 using namespace QtDataVis3D;
 
@@ -79,6 +79,12 @@ RainfallChart::RainfallChart(Q3DBars *rainfall)
     // Set bar type to cylinder
     m_chart->setBarType(Cylinders, false);
 
+    // Set shadows to medium
+    m_chart->setShadowQuality(ShadowMedium);
+
+    // Set font
+    m_chart->setFont(QFont("Century Gothic", 40));
+
     // Set selection mode to bar and column
     //m_chart->setSelectionMode(ModeBarAndColumn);
     m_chart->setSelectionMode(ModeZoomColumn);
@@ -87,7 +93,7 @@ RainfallChart::RainfallChart(Q3DBars *rainfall)
     m_chart->setTheme(ThemeBlueNcs);
 
     // Set preset camera position
-    m_chart->setCameraPreset(PresetFront);
+    m_chart->setCameraPreset(PresetIsometricRightHigh);
 
     // Disable grid
     m_chart->setGridEnabled(false);
diff --git a/examples/widget/chart.cpp b/examples/widget/chart.cpp
index 741b04c7..8eff7a04 100644
--- a/examples/widget/chart.cpp
+++ b/examples/widget/chart.cpp
@@ -215,12 +215,12 @@ void ChartModifier::changeTheme()
 
 void ChartModifier::changeTransparency()
 {
-    static int transparency = TransparencyFromTheme;
+    static int transparency = TransparencyNone;
 
     m_chart->setLabelTransparency((LabelTransparency)transparency);
 
     if (++transparency > TransparencyNoBackground)
-        transparency = TransparencyNone;
+        transparency = TransparencyFromTheme;
 }
 
 void ChartModifier::changeSelectionMode()
@@ -236,7 +236,8 @@ void ChartModifier::changeSelectionMode()
 void ChartModifier::changeFont(const QFont &font)
 {
     QFont newFont = font;
-    newFont.setPixelSize(m_fontSize);
+    newFont.setPointSize(m_fontSize);
+    //qDebug() << newFont << newFont.style();
     m_chart->setFont(newFont);
 }
 
diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp
index 16664868..a885d888 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavis3d/engine/q3dbars.cpp
@@ -958,7 +958,7 @@ void Q3DBars::drawScene()
         d_ptr->m_backgroundShader->setUniformValue(d_ptr->m_backgroundShader->color(),
                                                    backgroundColor);
         d_ptr->m_backgroundShader->setUniformValue(d_ptr->m_backgroundShader->ambientS(),
-                                                   d_ptr->m_theme->m_ambientStrength);
+                                                   d_ptr->m_theme->m_ambientStrength * 2.0f);
 
         if (d_ptr->m_shadowQuality > ShadowNone) {
             // Set shadow shader bindings
@@ -1896,7 +1896,7 @@ Q3DBarsPrivate::Q3DBarsPrivate(Q3DBars *q)
       m_zoomViewPort(0, 0, q->width(), q->height()),
       m_zoomActivated(false),
       m_textureHelper(new TextureHelper()),
-      m_labelTransparency(TransparencyNone),
+      m_labelTransparency(TransparencyFromTheme),
       m_font(QFont(QStringLiteral("Arial"))),
       m_drawer(new Drawer(*m_theme, m_font, m_labelTransparency)),
       m_xFlipped(false),
diff --git a/src/datavis3d/engine/q3dmaps.cpp b/src/datavis3d/engine/q3dmaps.cpp
index 9ac43daa..3da39526 100644
--- a/src/datavis3d/engine/q3dmaps.cpp
+++ b/src/datavis3d/engine/q3dmaps.cpp
@@ -1310,7 +1310,7 @@ Q3DMapsPrivate::Q3DMapsPrivate(Q3DMaps *q)
       m_zoomViewPort(0, 0, q->width(), q->height()),
       m_zoomActivated(false),
       m_textureHelper(new TextureHelper()),
-      m_labelTransparency(TransparencyNone),
+      m_labelTransparency(TransparencyFromTheme),
       m_font(QFont(QStringLiteral("Arial"))),
       m_drawer(new Drawer(*m_theme, m_font, m_labelTransparency)),
       m_bgrTexture(0),
diff --git a/src/datavis3d/engine/theme.cpp b/src/datavis3d/engine/theme.cpp
index a9032e25..9032497e 100644
--- a/src/datavis3d/engine/theme.cpp
+++ b/src/datavis3d/engine/theme.cpp
@@ -202,7 +202,7 @@ void Theme::useTheme(ColorTheme theme)
         m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0xffffff));
         m_textColor = QColor(QRgb(0x404044));
-        m_textBackgroundColor = QColor(0xff, 0xff, 0xff, 0xff);
+        m_textBackgroundColor = QColor(0xff, 0xff, 0xff, 0x80);
         m_gridLine = QColor(QRgb(0xe2e2e2));
         m_highlightBarColor = QColor(QRgb(0x88d41e));
         m_highlightRowColor = QColor(QRgb(0xff8e1a));