2.0. mixer: Composite local_key with internal_key instead of overriding.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@922 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/casparcg.sln b/casparcg.sln
index 8415d3f1f030fe835e2617fdd4625aad5a7449b5..bd760c768c807cf78fd1efd8d5698fdb8d228597 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -11,7 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "protocol", "protocol\protoc
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "documentation", "documentation", "{32079541-68ED-4319-91FB-0FF041642679}"\r
        ProjectSection(SolutionItems) = preProject\r
-               Casparcg 2.0 Documentation.txt = Casparcg 2.0 Documentation.txt\r
                COPYING.txt = COPYING.txt\r
                README.txt = README.txt\r
        EndProjectSection\r

diff --git a/core/mixer/image/image_kernel.cpp b/core/mixer/image/image_kernel.cpp
index 35d17e9269f355d661866066b976d6c87b8d6edf..7e6704e440c8244398ad651f912edf678016f850 100644 (file)
--- a/core/mixer/image/image_kernel.cpp
+++ b/core/mixer/image/image_kernel.cpp
@@ -220,7 +220,7 @@ public:
                        "{                                                                                                                                              "\r
                        "       vec4 rgba = vec4(texture2D(plane[0], gl_TexCoord[0].st).rrr, 1.0);      "\r
                        "       if(local_key)                                                                                                           "\r
-                       "               rgba.a = texture2D(plane[3], gl_TexCoord[1].st).r;                              "\r
+                       "               rgba.a *= texture2D(plane[3], gl_TexCoord[1].st).r;                             "\r
                        "       if(layer_key)                                                                                                           "\r
                        "               rgba.a *= texture2D(plane[4], gl_TexCoord[1].st).r;                             "\r
                        "       gl_FragColor = rgba * gain;                                                                                     "\r
@@ -232,7 +232,7 @@ public:
                        "{                                                                                                                                              "\r
                        "       vec4 abgr = texture2D(plane[0], gl_TexCoord[0].st);                                     "\r
                        "       if(local_key)                                                                                                           "\r
-                       "               abgr.b = texture2D(plane[3], gl_TexCoord[1].st).r;                              "\r
+                       "               abgr.b *= texture2D(plane[3], gl_TexCoord[1].st).r;                             "\r
                        "       if(layer_key)                                                                                                           "\r
                        "               abgr.b *= texture2D(plane[4], gl_TexCoord[1].st).r;                             "\r
                        "       gl_FragColor = abgr.argb * gain;                                                                        "\r
@@ -244,7 +244,7 @@ public:
                        "{                                                                                                                                              "\r
                        "       vec4 argb = texture2D(plane[0], gl_TexCoord[0].st);                                     "\r
                        "       if(local_key)                                                                                                           "\r
-                       "               argb.b = texture2D(plane[3], gl_TexCoord[1].st).r;                              "\r
+                       "               argb.b *= texture2D(plane[3], gl_TexCoord[1].st).r;                             "\r
                        "       if(layer_key)                                                                                                           "\r
                        "               argb.b *= texture2D(plane[4], gl_TexCoord[1].st).r;                             "\r
                        "       gl_FragColor = argb.grab * gl_Color * gain;                                                     "\r
@@ -256,7 +256,7 @@ public:
                        "{                                                                                                                                              "\r
                        "       vec4 bgra = texture2D(plane[0], gl_TexCoord[0].st);                                     "\r
                        "       if(local_key)                                                                                                           "\r
-                       "               bgra.a = texture2D(plane[3], gl_TexCoord[1].st).r;                              "\r
+                       "               bgra.a *= texture2D(plane[3], gl_TexCoord[1].st).r;                             "\r
                        "       if(layer_key)                                                                                                           "\r
                        "               bgra.a *= texture2D(plane[4], gl_TexCoord[1].st).r;                             "\r
                        "       gl_FragColor = bgra.rgba * gl_Color * gain;                                                     "\r
@@ -268,7 +268,7 @@ public:
                        "{                                                                                                                                              "\r
                        "       vec4 rgba = texture2D(plane[0], gl_TexCoord[0].st);                                     "\r
                        "       if(local_key)                                                                                                           "\r
-                       "               rgba.a = texture2D(plane[3], gl_TexCoord[1].st).r;                              "\r
+                       "               rgba.a *= texture2D(plane[3], gl_TexCoord[1].st).r;                             "\r
                        "       if(layer_key)                                                                                                           "\r
                        "               rgba.a *= texture2D(plane[4], gl_TexCoord[1].st).r;                             "\r
                        "       gl_FragColor = rgba.bgra * gl_Color * gain;                                                     "\r
@@ -283,7 +283,7 @@ public:
                        "       float cr = texture2D(plane[2], gl_TexCoord[0].st).r;                            "\r
                        "       float a = 1.0;                                                                                                          "       \r
                        "       if(local_key)                                                                                                           "\r
-                       "               a = texture2D(plane[3], gl_TexCoord[1].st).r;                                   "\r
+                       "               a *= texture2D(plane[3], gl_TexCoord[1].st).r;                                  "\r
                        "       if(layer_key)                                                                                                           "\r
                        "               a *= texture2D(plane[4], gl_TexCoord[1].st).r;                                  "\r
                        "       if(HD)                                                                                                                          "\r
@@ -299,11 +299,9 @@ public:
                        "       float y  = texture2D(plane[0], gl_TexCoord[0].st).r;                            "\r
                        "       float cb = texture2D(plane[1], gl_TexCoord[0].st).r;                            "\r
                        "       float cr = texture2D(plane[2], gl_TexCoord[0].st).r;                            "\r
-                       "       float a  = 1.0;                                                                                                         "\r
+                       "       float a  = texture2D(plane[3], gl_TexCoord[0].st).r;                            "\r
                        "       if(local_key)                                                                                                           "\r
-                       "               a = texture2D(plane[3], gl_TexCoord[1].st).r;                                   "\r
-                       "       else                                                                                                                            "\r
-                       "               a  = texture2D(plane[3], gl_TexCoord[0].st).r;                                  "\r
+                       "               a *= texture2D(plane[3], gl_TexCoord[1].st).r;                                  "\r
                        "       if(layer_key)                                                                                                           "\r
                        "               a *= texture2D(plane[4], gl_TexCoord[1].st).r;                                  "\r
                        "       if(HD)                                                                                                                          "\r