diff options
author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-08-26 11:26:06 +0300 |
---|---|---|
committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-08-26 11:57:58 +0300 |
commit | fcac33d0ee25115808ca43810cf6a3438e2da227 (patch) | |
tree | 476ccc9bef5aa83204144a43f86c13cadb81b62d /src/datavisualization/engine/abstract3drenderer_p.h | |
parent | 5a51d06ec8f0210f51e65abfde9f868ab7bfa8ef (diff) |
Reflection API added
Task-number: QTRD-3287
Change-Id: I6c06b8fe025e0f1f87be00be906cab0e1f18a19f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3drenderer_p.h')
-rw-r--r-- | src/datavisualization/engine/abstract3drenderer_p.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer_p.h b/src/datavisualization/engine/abstract3drenderer_p.h index 7874a1ad..1e815463 100644 --- a/src/datavisualization/engine/abstract3drenderer_p.h +++ b/src/datavisualization/engine/abstract3drenderer_p.h @@ -29,8 +29,6 @@ #ifndef ABSTRACT3DRENDERER_P_H #define ABSTRACT3DRENDERER_P_H -//#define USE_REFLECTIONS // Bars only test version (only floor reflects) - #include <QtGui/QOpenGLFunctions> #include "datavisualizationglobal_p.h" @@ -147,21 +145,13 @@ public: void setSelectionLabel(const QString &label); QString &selectionLabel(); -#ifdef USE_REFLECTIONS void drawCustomItems(RenderingState state, ShaderHelper *regularShader, ShaderHelper *volumeShader, ShaderHelper *volumeSliceShader, const QMatrix4x4 &viewMatrix, const QMatrix4x4 &projectionViewMatrix, const QMatrix4x4 &depthProjectionViewMatrix, GLuint depthTexture, GLfloat shadowQuality, GLfloat reflection = 1.0f); -#else - void drawCustomItems(RenderingState state, ShaderHelper *regularShader, - ShaderHelper *volumeShader, ShaderHelper *volumeSliceShader, - const QMatrix4x4 &viewMatrix, - const QMatrix4x4 &projectionViewMatrix, - const QMatrix4x4 &depthProjectionViewMatrix, - GLuint depthTexture, GLfloat shadowQuality); -#endif + QVector4D indexToSelectionColor(GLint index); void calculatePolarXZ(const QVector3D &dataPos, float &x, float &z) const; @@ -285,6 +275,9 @@ protected: QVector3D m_oldCameraTarget; + bool m_reflectionEnabled; + qreal m_reflectivity; + private: friend class Abstract3DController; }; |