diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-20 08:30:53 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-20 09:02:39 +0300 |
| commit | 97e3308019b560e062e291f1f53034b4ab4bf85d (patch) | |
| tree | 8280197dd6658e4ac25fd618d4d20cb044ca70ad /src/datavis3d | |
| parent | b449ccd00f147aae2487d06d5c4e728d3a9b85db (diff) | |
Background lighting fix
Example tweaks.
Default label transparanecy changed.
Change-Id: Icfe198152a0c0ad74638651e486018be06dbbf0b
Change-Id: Icfe198152a0c0ad74638651e486018be06dbbf0b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavis3d')
| -rw-r--r-- | src/datavis3d/engine/q3dbars.cpp | 4 | ||||
| -rw-r--r-- | src/datavis3d/engine/q3dmaps.cpp | 2 | ||||
| -rw-r--r-- | src/datavis3d/engine/theme.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
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)); |