Fixed issues from Improve examples task

Task-number: QTRD-2239

+ Barchart example improved
+ Themes tweaked
+ Background lighting tweaked

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

3 files changed, 12 insertions, 7 deletions

diff --git a/src/datavis3d/engine/bars3drenderer.cpp b/src/datavis3d/engine/bars3drenderer.cpp
index 03c304d5..6520dc8a 100644
--- a/src/datavis3d/engine/bars3drenderer.cpp
+++ b/src/datavis3d/engine/bars3drenderer.cpp
@@ -905,7 +905,7 @@ void Bars3DRenderer::drawScene(CameraHelper *camera,
         m_backgroundShader->setUniformValue(m_backgroundShader->MVP(), MVPMatrix);
         m_backgroundShader->setUniformValue(m_backgroundShader->color(), backgroundColor);
         m_backgroundShader->setUniformValue(m_backgroundShader->ambientS(),
-                                            m_cachedTheme.m_ambientStrength * 2.0f);
+                                            m_cachedTheme.m_ambientStrength * 4.0f);
 
 #if !defined(QT_OPENGL_ES_2)
         if (m_cachedShadowQuality > QDataVis::ShadowNone) {
diff --git a/src/datavis3d/engine/scatter3drenderer.cpp b/src/datavis3d/engine/scatter3drenderer.cpp
index 03e61043..9759d658 100644
--- a/src/datavis3d/engine/scatter3drenderer.cpp
+++ b/src/datavis3d/engine/scatter3drenderer.cpp
@@ -648,7 +648,7 @@ void Scatter3DRenderer::drawScene(CameraHelper *camera,
         m_backgroundShader->setUniformValue(m_backgroundShader->MVP(), MVPMatrix);
         m_backgroundShader->setUniformValue(m_backgroundShader->color(), backgroundColor);
         m_backgroundShader->setUniformValue(m_backgroundShader->ambientS(),
-                                            m_cachedTheme.m_ambientStrength * 2.0f);
+                                            m_cachedTheme.m_ambientStrength * 4.0f);
 
 #if !defined(QT_OPENGL_ES_2)
         if (m_cachedShadowQuality > QDataVis::ShadowNone) {
diff --git a/src/datavis3d/engine/theme.cpp b/src/datavis3d/engine/theme.cpp
index 0ed39e65..0de78c03 100644
--- a/src/datavis3d/engine/theme.cpp
+++ b/src/datavis3d/engine/theme.cpp
@@ -168,7 +168,8 @@ void Theme::useColorTheme(QDataVis::ColorTheme colorTheme)
         m_baseColor = QRgb(0x3daeda);
         m_heightColor = QRgb(0x2fa3b4);
         m_depthColor = QColor(QRgb(0x2685bf));
-        m_backgroundColor = QColor(QRgb(0xffffff));
+        m_backgroundColor = QColor(QRgb(0x2fa3b4));
+        //m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0xffffff));
         m_textColor = QColor(QRgb(0x404044));
         m_textBackgroundColor = QColor(0xff, 0xff, 0xff, 0x80);
@@ -187,7 +188,8 @@ void Theme::useColorTheme(QDataVis::ColorTheme colorTheme)
         m_baseColor = QColor(QRgb(0x1db0da));
         m_heightColor = QColor(QRgb(0x398ca3));
         m_depthColor = QColor(QRgb(0x1341a6));
-        m_backgroundColor = QColor(QRgb(0xffffff));
+        m_backgroundColor = QColor(QRgb(0x398ca3));
+        //m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0xffffff));
         m_textColor = QColor(QRgb(0x404044));
         m_textBackgroundColor = QColor(0xff, 0xff, 0xff, 0x80);
@@ -206,7 +208,8 @@ void Theme::useColorTheme(QDataVis::ColorTheme colorTheme)
         m_baseColor = QColor(QRgb(0xb39b72));
         m_heightColor = QColor(QRgb(0x494345));
         m_depthColor = QColor(QRgb(0xb3b376));
-        m_backgroundColor = QColor(QRgb(0xf3ece0));
+        m_backgroundColor = QColor(QRgb(0x494345));
+        //m_backgroundColor = QColor(QRgb(0xf3ece0));
         m_windowColor = QColor(QRgb(0xf3ece0));
         m_textColor = QColor(QRgb(0x404044));
         m_textBackgroundColor = QColor(0xb5, 0xb0, 0xa7, 0xC0);
@@ -244,7 +247,8 @@ void Theme::useColorTheme(QDataVis::ColorTheme colorTheme)
         m_baseColor = QColor(QRgb(0xff4a41));
         m_heightColor = QColor(QRgb(0x202020));
         m_depthColor = QColor(QRgb(0x596a74));
-        m_backgroundColor = QColor(QRgb(0xffffff));
+        m_backgroundColor = QColor(QRgb(0x596a74));
+        //m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0x000000));
         m_textColor = QColor(QRgb(0x181818));
         m_textBackgroundColor = QColor(0xff, 0xff, 0xff, 0x80);
@@ -263,7 +267,8 @@ void Theme::useColorTheme(QDataVis::ColorTheme colorTheme)
         m_baseColor = QColor(QRgb(0x209fdf));
         m_heightColor = QColor(QRgb(0xbf593e));
         m_depthColor = QColor(QRgb(0x99ca53));
-        m_backgroundColor = QColor(QRgb(0xffffff));
+        m_backgroundColor = QColor(QRgb(0x99ca53));
+        //m_backgroundColor = QColor(QRgb(0xffffff));
         m_windowColor = QColor(QRgb(0xffffff));
         m_textColor = QColor(QRgb(0x404044));
         m_textBackgroundColor = QColor(0xd6, 0xd6, 0xd6, 0x80);