From 2b19a3ae8b8c34ea674058c7b82de44397e29df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Korpip=C3=A4=C3=A4?= Date: Thu, 24 Apr 2014 07:37:58 +0300 Subject: Color problem fixed Task-number: QTRD-3001 Changed all colors to QVector4Ds to avoid mixups with vec4 and vec3 colors in shaders. Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Change-Id: I8b44b4d711befca900dd35b3386881f7c31d7dd5 Reviewed-by: Mika Salmela --- src/datavisualization/engine/seriesrendercache_p.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/datavisualization/engine/seriesrendercache_p.h') diff --git a/src/datavisualization/engine/seriesrendercache_p.h b/src/datavisualization/engine/seriesrendercache_p.h index 8536d501..3cd94487 100644 --- a/src/datavisualization/engine/seriesrendercache_p.h +++ b/src/datavisualization/engine/seriesrendercache_p.h @@ -56,13 +56,13 @@ public: inline void setMeshRotation(const QQuaternion &rotation) { m_meshRotation = rotation; } inline ObjectHelper *object() const { return m_object; } inline const Q3DTheme::ColorStyle &colorStyle() const { return m_colorStyle; } - inline const QVector3D &baseColor() const { return m_baseColor; } + inline const QVector4D &baseColor() const { return m_baseColor; } inline const GLuint &baseUniformTexture() const { return m_baseUniformTexture; } inline const GLuint &baseGradientTexture() const { return m_baseGradientTexture; } inline const QImage &gradientImage() const { return m_gradientImage; } - inline const QVector3D &singleHighlightColor() const { return m_singleHighlightColor; } + inline const QVector4D &singleHighlightColor() const { return m_singleHighlightColor; } inline const GLuint &singleHighlightGradientTexture() const { return m_singleHighlightGradientTexture; } - inline const QVector3D &multiHighlightColor() const { return m_multiHighlightColor; } + inline const QVector4D &multiHighlightColor() const { return m_multiHighlightColor; } inline const GLuint &multiHighlightGradientTexture() const { return m_multiHighlightGradientTexture; } inline const QString &name() const { return m_name; } inline const QString &itemLabel() const { return m_itemLabel; } @@ -79,13 +79,13 @@ protected: QQuaternion m_meshRotation; Q3DTheme::ColorStyle m_colorStyle; - QVector3D m_baseColor; + QVector4D m_baseColor; GLuint m_baseUniformTexture; GLuint m_baseGradientTexture; QImage m_gradientImage; - QVector3D m_singleHighlightColor; + QVector4D m_singleHighlightColor; GLuint m_singleHighlightGradientTexture; - QVector3D m_multiHighlightColor; + QVector4D m_multiHighlightColor; GLuint m_multiHighlightGradientTexture; QString m_name; -- cgit v1.2.3