diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2014-02-06 12:56:54 +0200 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2014-02-06 13:00:59 +0200 |
| commit | e91237b54c2f58eaa8a2ce36bf016e2d8e8588f2 (patch) | |
| tree | ec99b80a217b2e316a280c299fe5bc84edd7eb1b /src/datavisualization/utils/surfaceobject.cpp | |
| parent | 427e7f5f5c62f728e159462dd28ae1ef76761d75 (diff) | |
Multiseries support for surface
Task-number: QTRD-2767
Change-Id: Ifa7ca07f2afdb27974ad20819f0a4646293764b0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/utils/surfaceobject.cpp')
| -rw-r--r-- | src/datavisualization/utils/surfaceobject.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp index b0cd6c82..cfaab09c 100644 --- a/src/datavisualization/utils/surfaceobject.cpp +++ b/src/datavisualization/utils/surfaceobject.cpp @@ -25,6 +25,10 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION SurfaceObject::SurfaceObject() + : m_surfaceType(Undefined), + m_columns(0), + m_rows(0), + m_gridIndexCount(0) { m_indicesType = GL_UNSIGNED_INT; initializeOpenGLFunctions(); @@ -668,6 +672,9 @@ GLuint SurfaceObject::gridIndexCount() QVector3D SurfaceObject::vertexAt(int column, int row) { int pos = 0; + if (m_surfaceType == Undefined || !m_vertices.size()) + return zeroVector; + if (m_surfaceType == SurfaceFlat) pos = row * (m_columns * 2 - 2) + column * 2 - (column > 0); else |