X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=slice_effect.frag;h=c6b36190b333dbefa81bc9705eec29318ff8ad13;hp=84165154b3f01b7e795fee7dc9b14e0ea71dd005;hb=refs%2Fheads%2F1.3.x-release;hpb=f3591ae239781d0587a141e14633e172ba9e376b

diff --git a/slice_effect.frag b/slice_effect.frag
index 8416515..c6b3619 100644
--- a/slice_effect.frag
+++ b/slice_effect.frag
@@ -1,12 +1,14 @@
-uniform float PREFIX(output_coord_to_slice_num);
-uniform float PREFIX(slice_num_to_input_coord);
-uniform float PREFIX(slice_offset_to_input_coord);
+// Implicit uniforms:
+// 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(normalized_offset);
  
 vec4 FUNCNAME(vec2 tc) {
 	// DIRECTION_VERTICAL will be #defined to 1 if we are expanding vertically,
 	// and 0 otherwise.
 #if DIRECTION_VERTICAL
-	float sliced_coord = tc.y;
+	float sliced_coord = 1.0 - tc.y;
 #else
 	float sliced_coord = tc.x;
 #endif
@@ -16,11 +18,13 @@ 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 input_coord = slice_num * PREFIX(slice_num_to_input_coord) + slice_offset * PREFIX(slice_offset_to_input_coord);
+	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, input_coord));
+	return INPUT(vec2(tc.x, 1.0 - input_coord));
 #else
 	return INPUT(vec2(input_coord, tc.y));
 #endif
 }
+
+#undef DIRECTION_VERTICAL