EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge main into #2348; resolve crates/effects/src/warp_stab.rs
bflatastic3830d43c4eb7
diff --cc crates/effects/src/warp_stab.rsindex 95c61f9f0,b49765c28..8d9fe6f0e--- a/crates/effects/src/warp_stab.rs+++ b/crates/effects/src/warp_stab.rs@@@ -584,25 -614,42 +594,61 @@@ mod testsassert_eq!(render(&ctx, Buf { img: img.clone(), offset: [0.0; 2], scale: 1.0 }).img.data, img.data);}+ #[test]+ fn prepared_default_plan_preserves_first_render_and_is_reused() {+ let json = analysis_json(25, 64.0, 48.0, |k| [((k * 7) % 5) as f64 - 2.0, k as f64 * 0.1]);+ let mut a = WarpAnalysis::from_json(&json).unwrap();+ a.start = 0.012345678901234567;+ a.tracks = (0..24)+ .map(|id| effectcraft_track::camtrack::Track2D {+ id,+ start: 0,+ pts: (0..25).map(|k| [8.0 + (id % 6) as f32 * 8.0 + ((k * 7) % 5) as f32, 8.0 + (id / 6) as f32 * 8.0 + k as f32 * 0.1]).collect(),+ })+ .collect();+ let json = a.to_json();+ let ps = params(&json, 2, 0);+ let ctx = EffectCtx { params: &ps, time: a.start, layer_size: a.size, seed: 1, adjustment: false, env: EffectEnv::default() };+ let input = Buf { img: frame([30.0, 22.0]), offset: [0.0; 2], scale: 1.0 };+ // Original flow: validate, discard the plan, then render from the stored analysis.+ let _discarded = plan(&a, &StabSettings { fps: 25.0, ..Default::default() });+ let before = render(&ctx, input.clone());+ let key = (fnv(json.as_bytes()), settings_key(&settings(&ps, 25.0)));+ plans().lock().unwrap().remove(&key);+ assert!(prepare_default_plan(&json));+ let prepared = plans().lock().unwrap().get(&key).unwrap().clone();+ assert!(!prepared.meshes.is_empty(), "exercise the Subspace Warp plan");+ let after = render(&ctx, input);+ let (_, _, rendered) = plan_at(&ps, a.start).unwrap();+ assert!(Arc::ptr_eq(&prepared, &rendered));+ assert_eq!(before.offset, after.offset);+ assert_eq!(before.scale.to_bits(), after.scale.to_bits());+ for (a, b) in before.img.data.iter().flatten().zip(after.img.data.iter().flatten()) {+ assert_eq!(a.to_bits(), b.to_bits());+ }+ assert!(!prepare_default_plan("invalid"));+ assert!(!prepare_default_plan(&WarpAnalysis::default().to_json()));+ }++ #[test]+ fn changing_analysis_changes_the_plan_key() {+ let json = analysis_json(10, 64.0, 48.0, |k| [k as f64 * 0.1, 0.0]);+ let mut ps = params(&json, 2, 0);+ let before = summary_key(&ps).unwrap();+ assert_eq!(before[0], fnv(json.as_bytes()));+ let mut a = WarpAnalysis::from_json(&json).unwrap();+ a.start = 1.0;+ ps.values.insert(ANALYSIS.into(), Value::Str(a.to_json()));+ let after = summary_key(&ps).unwrap();+ assert_ne!(before[0], after[0]);+ assert_eq!(before[1], after[1]);+ assert_eq!(*analysis(&ps).unwrap(), a);+ ps.values.insert(ANALYSIS.into(), Value::Str(json));+ assert_eq!(summary_key(&ps).unwrap(), before);+ ps.values.insert(ANALYSIS.into(), Value::Str(String::new()));+ assert!(analysis(&ps).is_none());+ }+#[test]fn nested_param_lookup() {let mut p = Params::default();