Unbreak some effects that were broken by 0c821b2e.

diff --git a/luma_mix_effect.cpp b/luma_mix_effect.cpp
index 6d5af7321f34025780c755d4f8a677d0b84a8ad8..e8c70a75df9f0556bd86af3c6b340f9e4aeb048a 100644 (file)
--- a/luma_mix_effect.cpp
+++ b/luma_mix_effect.cpp
@@ -12,7 +12,7 @@ LumaMixEffect::LumaMixEffect()
        register_float("transition_width", &transition_width);
        register_float("progress", &progress);
        register_int("inverse", &inverse);
        register_float("transition_width", &transition_width);
        register_float("progress", &progress);
        register_int("inverse", &inverse);

-       register_uniform_bool("inverse", &uniform_inverse);
+       register_uniform_bool("bool_inverse", &uniform_inverse);

        register_uniform_float("progress_mul_w_plus_one", &uniform_progress_mul_w_plus_one);
 }
 
        register_uniform_float("progress_mul_w_plus_one", &uniform_progress_mul_w_plus_one);
 }
 

diff --git a/luma_mix_effect.frag b/luma_mix_effect.frag
index e721a885892a17ea9ff303570169292d978aa830..84af47cab83d68b51044f1dfd2c3bf4cb98568bf 100644 (file)
--- a/luma_mix_effect.frag
+++ b/luma_mix_effect.frag
@@ -1,6 +1,6 @@
 // Implicit uniforms:
 // uniform float PREFIX(progress_mul_w_plus_one);
 // Implicit uniforms:
 // uniform float PREFIX(progress_mul_w_plus_one);

-// uniform bool PREFIX(inverse);
+// uniform bool PREFIX(bool_inverse);

 
 vec4 FUNCNAME(vec2 tc) {
        vec4 first = INPUT1(tc);
 
 vec4 FUNCNAME(vec2 tc) {
        vec4 first = INPUT1(tc);


@@ -39,7 +39,7 @@ vec4 FUNCNAME(vec2 tc) {
        // just stay a simple mapping.
        float w = PREFIX(transition_width);
        float luma = INPUT3(tc).x;
        // just stay a simple mapping.
        float w = PREFIX(transition_width);
        float luma = INPUT3(tc).x;

-       if (PREFIX(inverse)) {
+       if (PREFIX(bool_inverse)) {

                luma = 1.0 - luma;
        }
        float m = clamp((luma * w - w) + PREFIX(progress_mul_w_plus_one), 0.0, 1.0);
                luma = 1.0 - luma;
        }
        float m = clamp((luma * w - w) + PREFIX(progress_mul_w_plus_one), 0.0, 1.0);

diff --git a/slice_effect.cpp b/slice_effect.cpp
index 66fed5167f8578561bd1688b10b280105bde575f..1634605df649563fcc7aadda83e1ff605b14174a 100644 (file)
--- a/slice_effect.cpp
+++ b/slice_effect.cpp
@@ -22,7 +22,7 @@ SliceEffect::SliceEffect()
        register_uniform_float("output_coord_to_slice_num", &uniform_output_coord_to_slice_num);
        register_uniform_float("slice_num_to_input_coord", &uniform_slice_num_to_input_coord);
        register_uniform_float("slice_offset_to_input_coord", &uniform_slice_offset_to_input_coord);
        register_uniform_float("output_coord_to_slice_num", &uniform_output_coord_to_slice_num);
        register_uniform_float("slice_num_to_input_coord", &uniform_slice_num_to_input_coord);
        register_uniform_float("slice_offset_to_input_coord", &uniform_slice_offset_to_input_coord);

-       register_uniform_float("offset", &uniform_offset);
+       register_uniform_float("normalized_offset", &uniform_offset);

 }
 
 string SliceEffect::output_fragment_shader()
 }
 
 string SliceEffect::output_fragment_shader()

diff --git a/slice_effect.frag b/slice_effect.frag
index e9c2c373aea8cf3af28dc25852c67bfd2e94fa48..c6b36190b333dbefa81bc9705eec29318ff8ad13 100644 (file)
--- a/slice_effect.frag
+++ b/slice_effect.frag
@@ -2,7 +2,7 @@
 // uniform float PREFIX(output_coord_to_slice_num);
 // uniform float PREFIX(slice_num_to_input_coord);
 // uniform float PREFIX(slice_offset_to_input_coord);
 // uniform float PREFIX(output_coord_to_slice_num);
 // uniform float PREFIX(slice_num_to_input_coord);
 // uniform float PREFIX(slice_offset_to_input_coord);

-// uniform float PREFIX(offset);
+// uniform float PREFIX(normalized_offset);

  
 vec4 FUNCNAME(vec2 tc) {
        // DIRECTION_VERTICAL will be #defined to 1 if we are expanding vertically,
  
 vec4 FUNCNAME(vec2 tc) {
        // DIRECTION_VERTICAL will be #defined to 1 if we are expanding vertically,


@@ -18,7 +18,7 @@ vec4 FUNCNAME(vec2 tc) {
        float slice_offset = fract(sliced_coord * PREFIX(output_coord_to_slice_num));
 
        // Find out where this slice begins in the input data, and then offset from that.
        float slice_offset = fract(sliced_coord * PREFIX(output_coord_to_slice_num));
 
        // Find out where this slice begins in the input data, and then offset from that.

-       float input_coord = slice_num * PREFIX(slice_num_to_input_coord) + slice_offset * PREFIX(slice_offset_to_input_coord) + PREFIX(offset);
+       float input_coord = slice_num * PREFIX(slice_num_to_input_coord) + slice_offset * PREFIX(slice_offset_to_input_coord) + PREFIX(normalized_offset);

 
 #if DIRECTION_VERTICAL
        return INPUT(vec2(tc.x, 1.0 - input_coord));
 
 #if DIRECTION_VERTICAL
        return INPUT(vec2(tc.x, 1.0 - input_coord));