EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Roto Brush: Refine Edge strokes apply in drawing order (#1646)
tylerjenningswaf995ea26aea
diff --git a/crates/track/src/roto.rs b/crates/track/src/roto.rsindex acd1b0234..9e5d8d6e1 100644--- a/crates/track/src/roto.rs+++ b/crates/track/src/roto.rs@@ -806,8 +806,7 @@ fn core_of(soft: &[f32], w: usize, h: usize, r: f64) -> Vec<bool> {fn finish(_img: &Image, rgb: &[[f32; 3]], labels: Vec<u8>, strokes: &[&Stroke], warped_refine: Option<&[u8]>, opts: &SegOpts, refine_radius: f64) -> FrameSeg {let (w, h) = (_img.width as usize, _img.height as usize);let (fg, bg) = fit_models(rgb, &labels);- let add = rasterize(strokes, &[StrokeKind::Refine], opts.scale, w, h);- let erase = rasterize(strokes, &[StrokeKind::RefineErase], opts.scale, w, h);+ let painted = resolve(strokes, StrokeKind::Refine, StrokeKind::RefineErase, opts.scale, w, h);let near: Option<Vec<f32>> = warped_refine.filter(|r| r.iter().any(|v| *v != 0)).map(|_| matting::signed_distance(&labels, w, h));let rr = (refine_radius * opts.scale + 2.0) as f32;let refine: Vec<u8> = (0..w * h)@@ -816,7 +815,7 @@ fn finish(_img: &Image, rgb: &[[f32; 3]], labels: Vec<u8>, strokes: &[&Stroke],(Some(r), Some(sd)) => r[i] != 0 && sd[i].abs() <= rr,_ => false,};- ((carried || add[i]) && !erase[i]) as u8+ ((carried && painted[i] != OFF) || painted[i] == ON) as u8}).collect();FrameSeg { w, h, matte: labels, refine, fg, bg }diff --git a/crates/track/src/roto/tests.rs b/crates/track/src/roto/tests.rsindex 2b4add27c..1922dd0a2 100644--- a/crates/track/src/roto/tests.rs+++ b/crates/track/src/roto/tests.rs@@ -287,6 +287,31 @@ fn refine_edge_recovers_a_soft_edge_and_decontaminates() {assert!(a2.iter().zip(&seg.matte).all(|(x, y)| (*x - *y as f32).abs() < 1e-6));}+/// Refine Edge strokes correct each other the same way: refine over an earlier erase restores+/// the band there.+#[test]+fn later_refine_strokes_override_earlier_erases() {+ let c = [100.0, 75.0];+ let (img, _) = soft_frame(c, 10.0, [0.9, 0.25, 0.1], [0.1, 0.3, 0.9]);+ let spot = [c[0] + R, c[1]];+ let i = spot[1] as usize * W as usize + spot[0] as usize;+ let erase = Stroke { kind: StrokeKind::RefineErase, frame: 0, radius: 6.0, points: vec![spot] };+ let refine = Stroke { kind: StrokeKind::Refine, ..erase.clone() };+ let band = |st: &[Stroke]| segment(&img, &st.iter().collect::<Vec<_>>(), None, &SegOpts::default(), 9.0).refine[i];+ let mut st = vec![+ line(StrokeKind::Fg, 0, [c[0] - 15.0, c[1]], [c[0] + 15.0, c[1]], 5.0),+ line(StrokeKind::Bg, 0, [c[0] - 60.0, c[1] - 55.0], [c[0] + 60.0, c[1] - 55.0], 5.0),+ ring(0, c, R, 9.0),+ ];+ assert_eq!(band(&st), 1);+ st.push(erase.clone());+ assert_eq!(band(&st), 0, "erase removes the band");+ st.push(refine);+ assert_eq!(band(&st), 1, "refine over the erase restores it");+ st.push(erase);+ assert_eq!(band(&st), 0, "erase again removes it again");+}+#[test]fn reduce_chatter_and_motion_blur_use_the_neighbours() {let (w, h) = (40usize, 20usize);