diff options
author | Mika Salmela <mika.salmela@digia.com> | 2014-10-07 00:04:03 +0300 |
---|---|---|
committer | Mika Salmela <mika.salmela@digia.com> | 2014-10-07 12:09:29 +0300 |
commit | aab6b4f77d408c523bd9335ffa48bcc552c00c62 (patch) | |
tree | 940d1e136f2344ace8a2de058c1548f8e27f6e78 /src/datavisualization/utils/surfaceobject_p.h | |
parent | 0e5b7fba379fe4e751bb2c609bb03d0c9bb01eaa (diff) |
Texture UVs for surface to follow data dimension
Change texture UVs to be generated according to data dimension. Also
utilise this change on texturesurface example.
Change-Id: Ideacfba409dc2e7cf579fb38d897e08c9f9a1b71
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/utils/surfaceobject_p.h')
-rw-r--r-- | src/datavisualization/utils/surfaceobject_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
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 |