diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-24 07:37:58 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-04-24 09:22:01 +0300 |
| commit | 2b19a3ae8b8c34ea674058c7b82de44397e29df2 (patch) | |
| tree | c910d61096b99cf2271b61ac3050644b302cf299 /src/datavisualization/utils/utils_p.h | |
| parent | 555acef736a72cdc92113a268826a6bba77fbe40 (diff) | |
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 <mika.salmela@digia.com>
Diffstat (limited to 'src/datavisualization/utils/utils_p.h')
| -rw-r--r-- | src/datavisualization/utils/utils_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/datavisualization/utils/utils_p.h b/src/datavisualization/utils/utils_p.h index c89a299c..46df980f 100644 --- a/src/datavisualization/utils/utils_p.h +++ b/src/datavisualization/utils/utils_p.h @@ -52,8 +52,9 @@ public: }; static GLuint getNearestPowerOfTwo(GLuint value, GLuint &padding); - static QVector3D vectorFromColor(const QColor &color); + static QVector4D vectorFromColor(const QColor &color); static QColor colorFromVector(const QVector3D &colorVector); + static QColor colorFromVector(const QVector4D &colorVector); static void printText(QPainter *painter, const QString &text, const QSize &position, bool absoluteCoords = true, float rotation = 0.0f, float scale = 1.0f); static QImage printTextToImage(const QFont &font, |