2.0.2: image_mixer: Fixed blending modes. Use straight alpha in calculations.

[casparcg] / core / mixer / image / image_shader.cpp

diff --git a/core/mixer/image/image_shader.cpp b/core/mixer/image/image_shader.cpp
index d9b83877f74da3c52da6e0e34b8d98fa86d42d2e..f6a81cb8318b2052723c3161691504501a3313de 100644 (file)
--- a/core/mixer/image/image_shader.cpp
+++ b/core/mixer/image/image_shader.cpp
@@ -70,8 +70,13 @@ std::string get_blend_color_func()
        "vec4 blend(vec4 fore)                                                                                                                          \n"\r
        "{                                                                                                                                                                      \n"\r
        "   vec4 back = texture2D(background, gl_TexCoord[1].st).bgra;                                          \n"\r
-       "       fore.rgb = get_blend_color(back.rgb, fore.rgb);                                                                 \n"\r
-       "       return fore + (1.0-fore.a)*back;                                                                                                \n"\r
+       "   if(blend_mode != 0)                                                                                                                         \n"\r
+       "               fore.rgb = get_blend_color(back.rgb/(back.a+0.0000001), fore.rgb/(fore.a+0.0000001))*fore.a;\n"\r
+       "       switch(keyer)                                                                                                                                   \n"     \r
+       "       {                                                                                                                                                               \n"     \r
+       "               case 1:  return fore + back; // additive                                                                        \n"\r
+       "               default: return fore + (1.0-fore.a)*back; // linear                                                     \n"\r
+       "       }                                                                                                                                                               \n"\r
        "}                                                                                                                                                                      \n";                    \r
 }\r
                \r
@@ -115,6 +120,7 @@ std::string get_fragment(bool blend_modes)
        "uniform bool           has_local_key;                                                                                                  \n"\r
        "uniform bool           has_layer_key;                                                                                                  \n"\r
        "uniform int            blend_mode;                                                                                                             \n"\r
+       "uniform int            keyer;                                                                                                                  \n"\r
        "uniform int            pixel_format;                                                                                                   \n"\r
        "                                                                                                                                                                       \n"\r
        "uniform float          opacity;                                                                                                                \n"\r