From 3b7fb533df9212df76c7c90a067ae3a3219b003a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Wed, 14 Aug 2013 13:50:52 +0300 Subject: Enums moved to a class to be usable from QML and C++ Task-number: QTRD-2126 Change-Id: I280047cc7101292d17111babb7735c03436a40f4 Reviewed-by: Miikka Heikkinen --- src/datavis3d/engine/surface3drenderer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/datavis3d/engine/surface3drenderer.cpp') diff --git a/src/datavis3d/engine/surface3drenderer.cpp b/src/datavis3d/engine/surface3drenderer.cpp index 13f95460..781ff090 100644 --- a/src/datavis3d/engine/surface3drenderer.cpp +++ b/src/datavis3d/engine/surface3drenderer.cpp @@ -47,8 +47,8 @@ Surface3dRenderer::Surface3dRenderer(Surface3dController *controller) m_mousePos(QPoint(0, 0)), m_isGridEnabled(true), m_isBackgroundEnabled(true), - m_shadowQuality(ShadowLow), - m_labelTransparency(TransparencyFromTheme), + m_shadowQuality(QDataVis::ShadowLow), + m_labelTransparency(QDataVis::TransparencyFromTheme), m_font(QFont(QStringLiteral("Arial"))), m_hasNegativeValues(false), m_segmentYCount(0), @@ -138,7 +138,7 @@ void Surface3dRenderer::initializeOpenGL() // Initialize shaders #if !defined(QT_OPENGL_ES_2) - if (m_shadowQuality > ShadowNone) { + if (m_shadowQuality > QDataVis::ShadowNone) { initBackgroundShaders(QStringLiteral(":/shaders/vertexShadow"), QStringLiteral(":/shaders/fragmentShadowNoTex")); } else { @@ -452,7 +452,7 @@ void Surface3dRenderer::drawScene(CameraHelper *camera, const GLuint defaultFboH m_cachedTheme.m_ambientStrength * 2.0f); #if !defined(QT_OPENGL_ES_2) - if (m_shadowQuality > ShadowNone) { + if (m_shadowQuality > QDataVis::ShadowNone) { // Set shadow shader bindings m_backgroundShader->setUniformValue(m_backgroundShader->shadowQ(), m_shadowQualityToShader); @@ -806,7 +806,7 @@ void Surface3dRenderer::updateDepthBuffer() } // TODO: bars uses some m_cachedShadowQuality - if (m_shadowQuality > ShadowNone && !m_mainViewPort.size().isEmpty()) { + if (m_shadowQuality > QDataVis::ShadowNone && !m_mainViewPort.size().isEmpty()) { m_depthTexture = m_textureHelper->createDepthTexture(m_mainViewPort.size(), m_depthFrameBuffer, m_shadowQuality); -- cgit v1.2.3