diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-12-09 10:49:49 +0200 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-12-10 09:01:45 +0200 |
commit | 3573055abe42ff283d011d8550bc8495156338a1 (patch) | |
tree | bb45d4f7e32a0c63329d9f52639081162b34e17e /src/datavisualization/engine/surface3drenderer_p.h | |
parent | 22557b312570cbefde584466a28f2b9bfcc570ba (diff) |
Move series specific visual elements to series, part 4
Colors to series
- Multiselection labels in bar slices still buggy
- Selection in bars doesn't work correctly if not all
series have items in that grid
Task-number: QTRD-2557
Change-Id: Icd38428e5337a26b8410476104bb1f1f784cdc7f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/surface3drenderer_p.h')
-rw-r--r-- | src/datavisualization/engine/surface3drenderer_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/engine/surface3drenderer_p.h b/src/datavisualization/engine/surface3drenderer_p.h index 37adb0b9..f1eeb088 100644 --- a/src/datavisualization/engine/surface3drenderer_p.h +++ b/src/datavisualization/engine/surface3drenderer_p.h @@ -33,7 +33,6 @@ #include <QtCore/QObject> #include <QtGui/QOpenGLFunctions> #include <QtGui/QFont> -#include <QLinearGradient> #include <QWindow> #include "datavisualizationglobal_p.h" @@ -105,7 +104,6 @@ private: GLuint m_depthFrameBuffer; GLuint m_selectionFrameBuffer; GLuint m_selectionDepthBuffer; - GLuint m_gradientTexture; GLuint m_selectionTexture; GLuint m_selectionResultTexture; GLfloat m_shadowQualityToShader; @@ -128,6 +126,8 @@ private: bool m_hasHeightAdjustmentChanged; QPoint m_selectedPoint; const QSurface3DSeries *m_selectedSeries; + GLuint m_uniformGradientTexture; + QVector3D m_uniformGradientTextureColor; public: explicit Surface3DRenderer(Surface3DController *controller); @@ -140,7 +140,6 @@ public: void updateScene(Q3DScene *scene); bool updateFlatStatus(bool enable); void updateSurfaceGridStatus(bool enable); - void updateSurfaceGradient(const QLinearGradient &gradient); void updateSlicingActive(bool isSlicing); void updateSelectedPoint(const QPoint &position, const QSurface3DSeries *series); @@ -185,6 +184,7 @@ private: void updateDepthBuffer(); #endif void emitSelectedPointChanged(QPoint position); + void generateUniformGradient(const QVector3D newColor); Q_DISABLE_COPY(Surface3DRenderer) }; |