diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-16 08:35:09 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-05-16 08:42:21 +0300 |
| commit | 13fdd5fcdd0db713f2b8051830cdf3dda2775433 (patch) | |
| tree | 934ddf86d1364c12d560dbfcd41c64b363ba26ea | |
| parent | 322e671266d9d7303f2a10fd837d0de153cf7825 (diff) | |
Adjusted shadows and default colors
Change-Id: I1325a3ec78cc474df78ba3dde8d59c58aeff81ea
Change-Id: I1325a3ec78cc474df78ba3dde8d59c58aeff81ea
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| -rw-r--r-- | examples/mapdata/mapdata.cpp | 6 | ||||
| -rw-r--r-- | src/engine/q3dbars.cpp | 4 | ||||
| -rw-r--r-- | src/engine/q3dmaps.cpp | 10 | ||||
| -rw-r--r-- | src/engine/theme.cpp | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/examples/mapdata/mapdata.cpp b/examples/mapdata/mapdata.cpp index 60d59f45..29620aa5 100644 --- a/examples/mapdata/mapdata.cpp +++ b/examples/mapdata/mapdata.cpp @@ -50,12 +50,12 @@ MapsModifier::MapsModifier(Q3DMaps *maps) m_fontSize(20.0f), m_barSpecs(QVector3D(30.0f, 30.0f, 30.0f)) { - m_chart->setBarSpecs(m_barSpecs, Q3DMaps::AdjustHeight); + m_chart->setBarSpecs(m_barSpecs, Q3DMaps::AdjustAll); QImage image = QImage(QStringLiteral(":/images/suomi")); m_imageRect = image.rect(); m_chart->setAreaSpecs(m_imageRect, image); - m_chart->setBarType(Cones, false); - //m_chart->setMeshFileName(QStringLiteral(":/meshes/weirdthing")); + //m_chart->setBarType(Cones, false); + m_chart->setMeshFileName(QStringLiteral(":/meshes/weirdthing")); } MapsModifier::~MapsModifier() diff --git a/src/engine/q3dbars.cpp b/src/engine/q3dbars.cpp index bcb78812..f456cb00 100644 --- a/src/engine/q3dbars.cpp +++ b/src/engine/q3dbars.cpp @@ -1605,10 +1605,10 @@ void Q3DBars::setShadowQuality(ShadowQuality quality) d_ptr->m_shadowQualityToShader = 33.3f; break; case ShadowMedium: - d_ptr->m_shadowQualityToShader = 66.7f; + d_ptr->m_shadowQualityToShader = 100.0f; break; case ShadowHigh: - d_ptr->m_shadowQualityToShader = 100.0f; + d_ptr->m_shadowQualityToShader = 200.0f; break; default: d_ptr->m_shadowQualityToShader = 0.0f; diff --git a/src/engine/q3dmaps.cpp b/src/engine/q3dmaps.cpp index 4bd4043c..698548d7 100644 --- a/src/engine/q3dmaps.cpp +++ b/src/engine/q3dmaps.cpp @@ -1234,16 +1234,16 @@ void Q3DMaps::setShadowQuality(ShadowQuality quality) d_ptr->m_shadowQuality = quality; switch (quality) { case ShadowLow: - qDebug() << "ShadowLow"; + //qDebug() << "ShadowLow"; d_ptr->m_shadowQualityToShader = 33.3f; break; case ShadowMedium: - qDebug() << "ShadowMedium"; - d_ptr->m_shadowQualityToShader = 66.7f; + //qDebug() << "ShadowMedium"; + d_ptr->m_shadowQualityToShader = 100.0f; break; case ShadowHigh: - qDebug() << "ShadowHigh"; - d_ptr->m_shadowQualityToShader = 100.0f; + //qDebug() << "ShadowHigh"; + d_ptr->m_shadowQualityToShader = 200.0f; break; default: d_ptr->m_shadowQualityToShader = 0.0f; diff --git a/src/engine/theme.cpp b/src/engine/theme.cpp index 5e3d0540..15a66dfc 100644 --- a/src/engine/theme.cpp +++ b/src/engine/theme.cpp @@ -50,8 +50,8 @@ QTCOMMERCIALDATAVIS3D_BEGIN_NAMESPACE Theme::Theme() : m_baseColor(QColor(Qt::gray)), - m_heightColor(QColor(Qt::white)), - m_depthColor(QColor(Qt::darkGray)), + m_heightColor(QColor(Qt::black)), + m_depthColor(QColor(Qt::black)), m_backgroundColor(QColor(Qt::gray)), m_windowColor(QColor(Qt::gray)), m_textColor(QColor(Qt::white)), |