diff options
| author | Mike Krus <mike.krus@kdab.com> | 2020-02-17 22:06:33 +0000 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2020-02-17 22:06:44 +0000 |
| commit | 67c9d9e9e665bb5754ffcdd5963189d73672f5a7 (patch) | |
| tree | 2168cae3806c937ce1f1ce8faacdf83fe6c35df1 /src/animation | |
| parent | 8f9a0e499243915aca0e719fef0a5bb075542ea4 (diff) | |
| parent | aa7c8a5cb1111d46289e6b370dcd5b1d3f66c80d (diff) | |
Merge remote-tracking branch 5.15 into dev
Change-Id: I2777f6a40b9029ef5569a84e04f9e18a914504e7
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/backend/animationutils.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/animation/backend/animationutils.cpp b/src/animation/backend/animationutils.cpp index 80c296a89..3f386d92a 100644 --- a/src/animation/backend/animationutils.cpp +++ b/src/animation/backend/animationutils.cpp @@ -158,11 +158,13 @@ ComponentIndices channelComponentsToIndices(const Channel &channel, #if defined Q_COMPILER_UNIFORM_INIT static const QVector<char> standardSuffixes = { 'X', 'Y', 'Z', 'W' }; static const QVector<char> quaternionSuffixes = { 'W', 'X', 'Y', 'Z' }; - static const QVector<char> colorSuffixes = { 'R', 'G', 'B' }; + static const QVector<char> colorSuffixesRGB = { 'R', 'G', 'B' }; + static const QVector<char> colorSuffixesRGBA = { 'R', 'G', 'B', 'A' }; #else static const QVector<char> standardSuffixes = (QVector<char>() << 'X' << 'Y' << 'Z' << 'W'); static const QVector<char> quaternionSuffixes = (QVector<char>() << 'W' << 'X' << 'Y' << 'Z'); - static const QVector<char> colorSuffixes = (QVector<char>() << 'R' << 'G' << 'B'); + static const QVector<char> colorSuffixesRGB = (QVector<char>() << 'R' << 'G' << 'B'); + static const QVector<char> colorSuffixesRGBA = (QVector<char>() << 'R' << 'G' << 'B' << 'A'); #endif switch (dataType) { @@ -170,8 +172,12 @@ ComponentIndices channelComponentsToIndices(const Channel &channel, return channelComponentsToIndicesHelper(channel, expectedComponentCount, offset, quaternionSuffixes); case QVariant::Color: + if (expectedComponentCount == 3) + return channelComponentsToIndicesHelper(channel, expectedComponentCount, + offset, colorSuffixesRGB); + Q_ASSERT(expectedComponentCount == 4); return channelComponentsToIndicesHelper(channel, expectedComponentCount, - offset, colorSuffixes); + offset, colorSuffixesRGBA); default: return channelComponentsToIndicesHelper(channel, expectedComponentCount, offset, standardSuffixes); @@ -385,10 +391,12 @@ QVariant buildPropertyValue(const MappingData &mappingData, const QVector<float> } case QVariant::Color: { + // A color can either be a vec3 or a vec4 const QColor color = QColor::fromRgbF(channelResults[mappingData.channelIndices[0]], channelResults[mappingData.channelIndices[1]], - channelResults[mappingData.channelIndices[2]]); + channelResults[mappingData.channelIndices[2]], + mappingData.channelIndices.size() > 3 ? channelResults[mappingData.channelIndices[3]] : 1.0f); return QVariant::fromValue(color); } |