diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2013-07-26 13:56:45 +0300 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2013-07-26 13:59:23 +0300 |
| commit | d1eb5ceed9bb4e35a185e575f9bd9d2228f9f5e4 (patch) | |
| tree | 39b75e46322759c56c1be7588bf44541155d9771 /src/datavis3d/engine/surface3drenderer_p.h | |
| parent | 51d6d0258c8d1fe0608045986792ac5601f8613f (diff) | |
Surface gradient to theme and drawing implementation to renderer.
Change-Id: I78a3f3d0aa9bd24a05368545cf8e779dda65ef4c
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Diffstat (limited to 'src/datavis3d/engine/surface3drenderer_p.h')
| -rw-r--r-- | src/datavis3d/engine/surface3drenderer_p.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/datavis3d/engine/surface3drenderer_p.h b/src/datavis3d/engine/surface3drenderer_p.h index 1d6ffafe..7c3ca040 100644 --- a/src/datavis3d/engine/surface3drenderer_p.h +++ b/src/datavis3d/engine/surface3drenderer_p.h @@ -56,6 +56,7 @@ #include <QtCore/QObject> #include <QtGui/QOpenGLFunctions> #include <QtGui/QFont> +#include <QLinearGradient> #include <QWindow> #include "datavis3dglobal_p.h" @@ -96,7 +97,7 @@ public: // Visual parameters QRect m_boundingRect; - Theme *m_theme; + Theme m_cachedTheme; LabelTransparency m_labelTransparency; QFont m_font; bool m_isGridEnabled; @@ -134,6 +135,7 @@ private: SurfaceObject *m_surfaceObj; GLuint m_depthTexture; GLuint m_depthFrameBuffer; + GLuint m_gradientTexture; GLfloat m_shadowQualityToShader; bool m_cachedSmoothSurface; bool m_cachedSurfaceGridOn; @@ -151,8 +153,10 @@ public: Drawer *drawer() { return m_drawer; } public slots: + void updateTheme(Theme theme); void updateSmoothStatus(bool enable); void updateSurfaceGridStatus(bool enable); + void updateSurfaceGradient(); void updateTickCount(GLint tickCount, GLfloat step, GLfloat minimum = 0.0f); public: @@ -169,14 +173,6 @@ public: void setY(const int y); int y(); -#if defined(Q_OS_ANDROID) - void mouseDoubleClickEvent(QMouseEvent *event); - void touchEvent(QTouchEvent *event); -#endif - void mousePressEvent(QMouseEvent *event, const QPoint &mousePos); - void mouseReleaseEvent(QMouseEvent *event, const QPoint &mousePos); - void mouseMoveEvent(QMouseEvent *event, const QPoint &mousePos); - void wheelEvent(QWheelEvent *event); void handleResize(); #if !defined(QT_OPENGL_ES_2) |