From 41ebe7cc1281c5d4c3535154e10edad838e49270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Tue, 18 Mar 2014 09:49:55 +0200 Subject: Use GL_LINES for ES2 grid lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTRD-2527 Change-Id: I08b9c740f6dfaf8107601cfc1e7e53db13bf8268 Note: Not to be merged until 1.0 is released Reviewed-by: Tomi Korpipää --- src/datavisualization/global/datavisualizationglobal_p.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/datavisualization/global/datavisualizationglobal_p.h') diff --git a/src/datavisualization/global/datavisualizationglobal_p.h b/src/datavisualization/global/datavisualizationglobal_p.h index e448c1cb..71dc8a93 100644 --- a/src/datavisualization/global/datavisualizationglobal_p.h +++ b/src/datavisualization/global/datavisualizationglobal_p.h @@ -43,7 +43,11 @@ static const GLfloat cameraDistance = 6.0f; // Size of font to be used in label texture rendering. Doesn't affect the actual font size. static const int textureFontSize = 50; static const GLfloat defaultRatio = 1.0f / 1.6f; // default aspect ratio 16:10 +#if !(defined QT_OPENGL_ES) static const float gridLineOffset = 0.0001f; // Offset for lifting grid lines off background +#else +static const float gridLineOffset = 0.0035f; // Offset for lifting grid lines off background +#endif // Default light position. To have shadows working correctly, light should be as far as camera, or a bit further // y position is added to the minimum height (or can be thought to be that much above or below the camera) static const QVector3D defaultLightPos = QVector3D(0.0f, 0.5f, 0.0f); -- cgit v1.2.3