diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-07-01 15:47:07 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-07-02 07:53:54 +0300 |
| commit | 4e9ed2481a1960a2fc4a31ecd14d1904b76cad2e (patch) | |
| tree | 5d0a04cb52161ec5370fdb15dc12e7f22a78f34f /src/datavisualization/utils/surfaceobject_p.h | |
| parent | a1293a58e0909d56e34654549ba719bacfdda1bb (diff) | |
Fix labels and grid lines changing size when aspect ratio is changed
Since shaders needed fixing anyway for surface because of this,
also implements the support for object gradients for surface,
which was missing.
Task-number: QTRD-2666
Task-number: QTRD-3211
Change-Id: I0c5da7fdfef308a96ec0bae4750fd22035da4e82
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/utils/surfaceobject_p.h')
| -rw-r--r-- | src/datavisualization/utils/surfaceobject_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/datavisualization/utils/surfaceobject_p.h b/src/datavisualization/utils/surfaceobject_p.h index 54e6dec3..b3ba80e9 100644 --- a/src/datavisualization/utils/surfaceobject_p.h +++ b/src/datavisualization/utils/surfaceobject_p.h @@ -70,6 +70,8 @@ public: GLuint gridIndexCount(); QVector3D vertexAt(int column, int row); void clear(); + float minYValue() const { return m_minY; } + float maxYValue() const { return m_maxY; } private: QVector3D normal(const QVector3D &a, const QVector3D &b, const QVector3D &c, bool flipNormal); @@ -77,6 +79,8 @@ private: const QVector<QVector3D> &normals, const GLint *indices, bool changeGeometry); bool checkFlipNormal(const QSurfaceDataArray &array); + inline void getNormalizedVertex(const QSurfaceDataItem &data, QVector3D &vertex, bool polar, + bool flipXZ); private: SurfaceType m_surfaceType; @@ -91,6 +95,8 @@ private: AxisRenderCache &m_axisCacheY; AxisRenderCache &m_axisCacheZ; Surface3DRenderer *m_renderer; + float m_minY; + float m_maxY; }; QT_END_NAMESPACE_DATAVISUALIZATION |