EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Merge pull request #1123 from nanox333/fix/808-source-point-convert
Brandon Thomas5c0ac48f3169
diff --cc crates/script/src/tests.rsindex 87f1f45e8,986dc1361..34333fe61--- a/crates/script/src/tests.rs+++ b/crates/script/src/tests.rs@@@ -1056,29 -1011,24 +1056,51 @@@ fn scripted_text_range_selector_resolveassert_eq!(o.result, json!([1, "ADBE Text Selector", 50, 100, "ADBE Text Percent Offset"]));}+/// `setInterpolationTypeAtKey` and `setTemporalEaseAtKey` (`keys.interpolation` / `keys.velocity`)+/// act on effect parameters too, not just transform properties (#994).+#[test]+fn effect_parameter_interpolation_and_ease() {+ let mut s = session();+ let o = ok(+ &mut s,+ r#"+ var c = app.project.items.addComp("E", 100, 100, 1, 5, 25);+ var l = c.layers.addNull();+ var slider = l.property("ADBE Effect Parade").addProperty("ADBE Slider Control").property(1);+ slider.setValuesAtTimes([0, 1, 2], [0, 50, 100]);+ slider.setInterpolationTypeAtKey(1, KeyframeInterpolationType.BEZIER, KeyframeInterpolationType.BEZIER);+ slider.setTemporalEaseAtKey(2, [new KeyframeEase(0, 16.67)], [new KeyframeEase(0, 33.33)]);+ var point = l.property("ADBE Effect Parade").addProperty("ADBE Point3D Control").property(1);+ point.setValuesAtTimes([0, 1], [[0, 0, 0], [50, 50, 50]]);+ point.setInterpolationTypeAtKey(1, KeyframeInterpolationType.BEZIER, KeyframeInterpolationType.BEZIER);+ [slider.keyInInterpolationType(1) == KeyframeInterpolationType.BEZIER,+ slider.keyOutInterpolationType(1) == KeyframeInterpolationType.BEZIER,+ slider.keyInTemporalEase(2)[0].influence,+ slider.keyOutTemporalEase(2)[0].influence,+ point.keyInInterpolationType(1) == KeyframeInterpolationType.BEZIER];+ "#,+ );+ assert_eq!(o.result, json!([true, true, 16.67, 33.33, true]));+}+++ /// #808: sourcePointToComp and compPointToSource follow the layer's transform.+ #[test]+ fn source_point_conversions_follow_the_layer_transform() {+ let mut s = session();+ let o = ok(+ &mut s,+ r#"+ var comp = app.project.items.addComp("Repro", 1920, 1080, 1, 10, 25);+ var layer = comp.layers.addSolid([1, 0, 0], "S", 200, 100, 1);+ layer.transform.position.setValue([400, 300]);+ layer.transform.scale.setValue([50, 50]);+ var a = layer.sourcePointToComp([0, 0]);+ var b = layer.compPointToSource([400, 300]);+ [a[0], a[1], b[0], b[1]]+ "#,+ );+ let v = o.result;+ let near = |x: &Value, want: f64| x.as_f64().is_some_and(|g| (g - want).abs() < 1e-6);+ assert!(near(&v[0], 350.0) && near(&v[1], 275.0), "{v}");+ assert!(near(&v[2], 100.0) && near(&v[3], 50.0), "{v}");+ }