From aab6b4f77d408c523bd9335ffa48bcc552c00c62 Mon Sep 17 00:00:00 2001 From: Mika Salmela Date: Tue, 7 Oct 2014 00:04:03 +0300 Subject: Texture UVs for surface to follow data dimension MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change texture UVs to be generated according to data dimension. Also utilise this change on texturesurface example. Change-Id: Ideacfba409dc2e7cf579fb38d897e08c9f9a1b71 Reviewed-by: Tomi Korpipää Reviewed-by: Miikka Heikkinen --- src/datavisualization/utils/surfaceobject.cpp | 12 ++++++++++++ src/datavisualization/utils/surfaceobject_p.h | 7 ++++--- 2 files changed, 16 insertions(+), 3 deletions(-) (limited to 'src/datavisualization/utils') diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index 8f75d666..86cd2789 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -307,15 +307,21 @@ void SurfaceObject::smoothUVs(const QSurfaceDataArray &dataArray, float zRangeNormalizer = dataArray.at(rows - 1)->at(0).z() - dataArray.at(0)->at(0).z(); float xMin = dataArray.at(0)->at(0).x(); float zMin = dataArray.at(0)->at(0).z(); + const bool zDescending = m_dataDimension.testFlag(SurfaceObject::ZDescending); + const bool xDescending = m_dataDimension.testFlag(SurfaceObject::XDescending); QVector uvs; uvs.resize(m_rows * m_columns); int index = 0; for (int i = 0; i < m_rows; i++) { float y = (modelArray.at(i)->at(0).z() - zMin) / zRangeNormalizer; + if (zDescending) + y = 1.0f - y; const QSurfaceDataRow &p = *modelArray.at(i); for (int j = 0; j < m_columns; j++) { float x = (p.at(j).x() - xMin) / xRangeNormalizer; + if (xDescending) + x = 1.0f - x; uvs[index] = QVector2D(x, y); index++; } @@ -601,6 +607,8 @@ void SurfaceObject::coarseUVs(const QSurfaceDataArray &dataArray, float zRangeNormalizer = dataArray.at(rows - 1)->at(0).z() - dataArray.at(0)->at(0).z(); float xMin = dataArray.at(0)->at(0).x(); float zMin = dataArray.at(0)->at(0).z(); + const bool zDescending = m_dataDimension.testFlag(SurfaceObject::ZDescending); + const bool xDescending = m_dataDimension.testFlag(SurfaceObject::XDescending); QVector uvs; uvs.resize(m_rows * m_columns * 2); @@ -608,9 +616,13 @@ void SurfaceObject::coarseUVs(const QSurfaceDataArray &dataArray, int colLimit = m_columns - 1; for (int i = 0; i < m_rows; i++) { float y = (modelArray.at(i)->at(0).z() - zMin) / zRangeNormalizer; + if (zDescending) + y = 1.0f - y; const QSurfaceDataRow &p = *modelArray.at(i); for (int j = 0; j < m_columns; j++) { float x = (p.at(j).x() - xMin) / xRangeNormalizer; + if (xDescending) + x = 1.0f - x; uvs[index] = QVector2D(x, y); index++; if (j > 0 && j < colLimit) { diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h index 39d10445..e7b61310 100644 --- a/src/datavisualization/utils/surfaceobject_p.h +++ b/src/datavisualization/utils/surfaceobject_p.h @@ -49,12 +49,13 @@ public: Undefined }; - enum DataDimensions { + enum DataDimension { BothAscending = 0, XDescending = 1, ZDescending = 2, BothDescending = XDescending | ZDescending }; + Q_DECLARE_FLAGS(DataDimensions, DataDimension) public: SurfaceObject(Surface3DRenderer *renderer); @@ -115,8 +116,8 @@ private: float m_maxY; GLuint m_uvTextureBuffer; bool m_returnTextureBuffer; - int m_dataDimension; - int m_oldDataDimension; + SurfaceObject::DataDimensions m_dataDimension; + SurfaceObject::DataDimensions m_oldDataDimension; }; QT_END_NAMESPACE_DATAVISUALIZATION -- cgit v1.2.3