From fdc983fb3c4ad79cdba282d84a7d8c51ae740965 Mon Sep 17 00:00:00 2001 From: Mika Salmela Date: Tue, 5 Sep 2017 09:55:07 +0300 Subject: Set clamp to edge wrap modes for surface textures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit By default surface textures had wrong wrap modes making the color bleed on edges. This patch changes the texture wrap modes to clamp to edge. Task-number: QTBUG-62996 Change-Id: Iebee66b01a78db6036cb0c833f39237f8e98b6b7 Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/surface3drenderer.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index 9cfa0edc..9fa1eeb8 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -317,8 +317,12 @@ void Surface3DRenderer::updateSurfaceTextures(QVector series const QSurfaceDataArray &array = *dataProxy->array(); if (!series->texture().isNull()) { - cache->setSurfaceTexture(m_textureHelper->create2DTexture( - series->texture(), true, true, true)); + GLuint texId = m_textureHelper->create2DTexture(series->texture(), + true, true, true, true); + glBindTexture(GL_TEXTURE_2D, texId); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glBindTexture(GL_TEXTURE_2D, 0); + cache->setSurfaceTexture(texId); if (cache->isFlatShadingEnabled()) cache->surfaceObject()->coarseUVs(array, cache->dataArray()); -- cgit v1.2.3 From 82f9c8a5a246845c746f0a8b3497dceba19ff05b Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 28 Aug 2017 15:15:46 +0300 Subject: Add change file for Qt 5.6.3 (qtdatavis3d 1.2.3) Change-Id: Ic5e9448f5050f3ea42a4fddbc1f9ff2407144a4c Reviewed-by: Jani Heikkinen --- dist/changes-1.2.3 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 dist/changes-1.2.3 diff --git a/dist/changes-1.2.3 b/dist/changes-1.2.3 new file mode 100644 index 00000000..218ff0d2 --- /dev/null +++ b/dist/changes-1.2.3 @@ -0,0 +1,3 @@ +Qt Data Visualization 1.2.3 + +No changes -- cgit v1.2.3 From 8329a8fb287094012989b965604ff9c9426f022a Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Fri, 22 Sep 2017 11:51:52 +0300 Subject: Add changes file for Qt 5.9.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I408eb3e0f9dc997dec0dc0c9a780857435def96d Reviewed-by: Tomi Korpipää --- dist/changes-5.9.2 | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 dist/changes-5.9.2 diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2 new file mode 100644 index 00000000..23df4e6d --- /dev/null +++ b/dist/changes-5.9.2 @@ -0,0 +1,26 @@ +Qt 5.9.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.9.2 Changes * +**************************************************************************** + +Fixed issues +------------ +- [QTBUG-62996] Surface texture bleeds color on edges -- cgit v1.2.3 From 32fc1c7d360fe2eff44666fb1a8c4fb7d538ddc7 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 6 Oct 2017 18:01:33 +0200 Subject: Bump version Change-Id: I86340fbce9be0da41b0de395892222420bb107d3 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 4ac2f275..8eb403f7 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,5 @@ load(qt_build_config) -MODULE_VERSION = 5.9.2 +MODULE_VERSION = 5.9.3 CONFIG += warning_clean CMAKE_MODULE_TESTS=- -- cgit v1.2.3