Release Movit 1.3.2. (From a branch, since I do not want to break ABI compatibility...

[movit] / luma_mix_effect.cpp

diff --git a/luma_mix_effect.cpp b/luma_mix_effect.cpp
index e34d87f167376cfae61f43f854845995ab3da000..e8c70a75df9f0556bd86af3c6b340f9e4aeb048a 100644 (file)
--- a/luma_mix_effect.cpp
+++ b/luma_mix_effect.cpp
@@ -7,10 +7,13 @@ using namespace std;
 namespace movit {
 
 LumaMixEffect::LumaMixEffect()
-       : transition_width(1.0f), progress(0.5f)
+       : transition_width(1.0f), progress(0.5f), inverse(0)
 {
        register_float("transition_width", &transition_width);
        register_float("progress", &progress);
+       register_int("inverse", &inverse);
+       register_uniform_bool("bool_inverse", &uniform_inverse);
+       register_uniform_float("progress_mul_w_plus_one", &uniform_progress_mul_w_plus_one);
 }
 
 string LumaMixEffect::output_fragment_shader()
@@ -21,7 +24,8 @@ string LumaMixEffect::output_fragment_shader()
 void LumaMixEffect::set_gl_state(GLuint glsl_program_num, const string &prefix, unsigned *sampler_num)
 {
        Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
-       set_uniform_float(glsl_program_num, prefix, "progress_mul_w_plus_one", progress * (transition_width + 1.0));
+       uniform_progress_mul_w_plus_one = progress * (transition_width + 1.0);
+       uniform_inverse = inverse;
 }
 
 }  // namespace movit