fix wrong color conversions between RGB and RGBA

ed155d8a · Janis Born · baed658e · ed155d8a
Commit ed155d8a authored Oct 20, 2014 by Janis Born
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

src/ACGL/OpenGL/Data/TextureData.cc src/ACGL/OpenGL/Data/TextureData.cc +3 -3

No files found.
--- a/src/ACGL/OpenGL/Data/TextureData.cc
+++ b/src/ACGL/OpenGL/Data/TextureData.cc
@@ -324,7 +324,7 @@ glm::vec4 convertTexelNumChannels(glm::vec4 _texel, GLsizei _from, GLsizei _to)
    else if (_from == 2) {
        switch (_to) {
            case 1: return glm::vec4( _texel.r, 0.0, 0.0, 0.0 );
-            case 3: return glm::vec4( _texel.r, _texel.r, _texel.r, _texel.g );
+            case 3: return glm::vec4( _texel.r, _texel.r, _texel.r, 0.0 );
            case 4: return glm::vec4( _texel.r, _texel.r, _texel.r, _texel.g );
        }
    }
@@ -332,14 +332,14 @@ glm::vec4 convertTexelNumChannels(glm::vec4 _texel, GLsizei _from, GLsizei _to)
        switch (_to) {
            case 1: return glm::vec4( grayscaleMixdown(_texel.r, _texel.g, _texel.b), 0.0, 0.0, 0.0 );
            case 2: return glm::vec4( grayscaleMixdown(_texel.r, _texel.g, _texel.b), 1.0, 0.0, 0.0 );
-            case 4: return glm::vec4( _texel.r, _texel.r, _texel.r, 1.0 );
+            case 4: return glm::vec4( _texel.r, _texel.g, _texel.b, 1.0 );
        }
    }
    else if (_from == 4) {
        switch (_to) {
            case 1: return glm::vec4( grayscaleMixdown(_texel.r, _texel.g, _texel.b), 0.0, 0.0, 0.0 );
            case 2: return glm::vec4( grayscaleMixdown(_texel.r, _texel.g, _texel.b), 1.0, 0.0, 0.0 );
-            case 3: return glm::vec4( _texel.r, _texel.r, _texel.r, 0.0 );
+            case 3: return glm::vec4( _texel.r, _texel.g, _texel.b, 0.0 );
        }
    }
    return _texel;