summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils/surfaceobject_p.h
diff options
context:
space:
mode:
authorMika Salmela <mika.salmela@digia.com>2013-10-02 13:21:58 +0300
committerMika Salmela <mika.salmela@digia.com>2013-10-02 13:39:22 +0300
commit6889a543a32df1b802ffc9c48609310aa72f03d3 (patch)
treedfc7e002afa96494c340e70f81eef8d7bdb872cc /src/datavisualization/utils/surfaceobject_p.h
parente85e0cbb085264d0ad4c4e65e7c72e55574f43d0 (diff)
Surface slice view back again
When constructing slice view, x&z coordinates are copied also. Point position set to vertex position, which is more robust. Task-number: QTRD-2363 Change-Id: Ifbee1bbdfa9a7575760116433204d9cea9a908aa 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.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h
index ab490960..5100bb2c 100644
--- a/src/datavisualization/utils/surfaceobject_p.h
+++ b/src/datavisualization/utils/surfaceobject_p.h
@@ -50,6 +50,7 @@ public:
GLfloat yMin, bool changeGeometry);
GLuint gridElementBuf();
GLuint gridIndexCount();
+ QVector3D vertexAt(int column, int row);
private:
QVector3D normal(const QVector3D &a, const QVector3D &b, const QVector3D &c);
@@ -58,8 +59,13 @@ private:
const GLint *gridIndices, bool changeGeometry);
private:
- int m_dataWidth;
- int m_dataDepth;
+ enum SurfaceType {
+ SurfaceSmooth,
+ SurfaceFlat
+ };
+ int m_surfaceType;
+ int m_columns;
+ int m_rows;
GLfloat m_yRange;
GLuint m_gridElementbuffer;
GLuint m_gridIndexCount;