diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-08-26 13:59:20 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-08-27 06:18:07 +0300 |
| commit | 0d822bc5de5735b40fc0c76e366365ce1b6cab87 (patch) | |
| tree | ad37c9713899e74cf219161aba569068372df132 /src | |
| parent | c11538865bf8879cf2fb8aa4b0d057e1804eca37 (diff) | |
Mac reflection bug fixed
+ some mingw & clang compilation fixes
Change-Id: Ib4cd5534d9d4e630c021f3d9901114983cdc26eb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualization/engine/bars3drenderer.cpp | 10 | ||||
| -rw-r--r-- | src/datavisualization/utils/qutils.h | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/datavisualization/engine/bars3drenderer.cpp b/src/datavisualization/engine/bars3drenderer.cpp index 7e49c0b3..22bf6b87 100644 --- a/src/datavisualization/engine/bars3drenderer.cpp +++ b/src/datavisualization/engine/bars3drenderer.cpp @@ -908,8 +908,6 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) GLfloat colPos = 0; GLfloat rowPos = 0; - QVector4D lightColor = Utils::vectorFromColor(m_cachedTheme->lightColor()); - const Q3DCamera *activeCamera = m_cachedScene->activeCamera(); glViewport(m_primarySubViewport.x(), @@ -1043,8 +1041,8 @@ void Bars3DRenderer::drawScene(GLuint defaultFboHandle) shadowOffset = -0.015f; } - if (m_reflectionEnabled && (m_yFlipped && item.height() > 0.0 - || !m_yFlipped && item.height() < 0.0)) { + if (m_reflectionEnabled && ((m_yFlipped && item.height() > 0.0) + || (!m_yFlipped && item.height() < 0.0))) { continue; } @@ -1569,8 +1567,8 @@ bool Bars3DRenderer::drawBars(BarRenderItem **selectedBar, } else if ((m_reflectionEnabled && (reflection == 1.0f || (reflection != 1.0f - && (m_yFlipped && item.height() < 0.0) - || (!m_yFlipped && item.height() > 0.0)))) + && ((m_yFlipped && item.height() < 0.0) + || (!m_yFlipped && item.height() > 0.0))))) || !m_reflectionEnabled) { // Skip drawing of 0-height bars and reflections of bars on the "wrong side" // Set shader bindings diff --git a/src/datavisualization/utils/qutils.h b/src/datavisualization/utils/qutils.h index 43375a9c..b4ac17b4 100644 --- a/src/datavisualization/utils/qutils.h +++ b/src/datavisualization/utils/qutils.h @@ -28,6 +28,7 @@ inline static QSurfaceFormat qDefaultSurfaceFormat(bool antialias = true) QSurfaceFormat surfaceFormat; surfaceFormat.setDepthBufferSize(24); + surfaceFormat.setStencilBufferSize(8); surfaceFormat.setSwapBehavior(QSurfaceFormat::DoubleBuffer); #if !defined(QT_OPENGL_ES_2) surfaceFormat.setRenderableType(QSurfaceFormat::OpenGL); |