2.0. Fixed mix transition.

[casparcg] / core / producer / transition / transition_producer.cpp

diff --git a/core/producer/transition/transition_producer.cpp b/core/producer/transition/transition_producer.cpp
index ccbfa757c99e0a6b3678c12c9b45a212b43f44fb..24cf9287533810a4854657b8f5cab816ac344fb8 100644 (file)
--- a/core/producer/transition/transition_producer.cpp
+++ b/core/producer/transition/transition_producer.cpp
@@ -132,14 +132,18 @@ struct transition_producer : public frame_producer
                d_frame1->get_frame_transform().volume = 0.0;\r
                d_frame2->get_frame_transform().volume = delta2;\r
 \r
-               //if(info_.type == transition::mix)\r
-               //{\r
-               //      d_frame1->get_frame_transform().set_opacity(delta1);    \r
-               //      d_frame2->get_frame_transform().set_opacity(delta2);\r
-\r
-               //      s_frame1->get_frame_transform().set_opacity(1.0-delta1);        \r
-               //      s_frame2->get_frame_transform().set_opacity(1.0-delta2);                \r
-               //}\r
+               if(info_.type == transition::mix)\r
+               {\r
+                       d_frame1->get_frame_transform().opacity = delta1;       \r
+                       d_frame1->get_frame_transform().is_mix = true;\r
+                       d_frame2->get_frame_transform().opacity = delta2;\r
+                       d_frame2->get_frame_transform().is_mix = true;\r
+\r
+                       s_frame1->get_frame_transform().opacity = 1.0-delta1;   \r
+                       s_frame1->get_frame_transform().is_mix = true;\r
+                       s_frame2->get_frame_transform().opacity = 1.0-delta2;   \r
+                       s_frame2->get_frame_transform().is_mix = true;\r
+               }\r
                if(info_.type == transition::slide)\r
                {\r
                        d_frame1->get_frame_transform().fill_translation[0] = (-1.0+delta1)*dir;        \r