EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
Clipboard: keyframe text for a 2D layer writes the Z it shows (#1908)
tylerjenningsw22ddf7bb99ed
diff --git a/crates/engine/src/keyframe_text.rs b/crates/engine/src/keyframe_text.rsindex 793d0cfb8..59e5402b7 100644--- a/crates/engine/src/keyframe_text.rs+++ b/crates/engine/src/keyframe_text.rs@@ -56,7 +56,13 @@ pub(crate) fn text(project: &Project, comp: &Comp, keys: &[KeyRef], statics: &[(_ => ["X", "Y", "Z"].iter().take(dims).map(|axis| format!("{axis} {unit}")).collect(),};blocks.push_str(&format!("Transform\t{}\n\tFrame\t{}\n", pr.name, columns.join("\t")));- for (frame, values) in rows {+ for (frame, mut values) in rows {+ // A 2D layer ignores the Z it may keep (from pasted 3D keys): write the one it shows.+ if !layer.is_3d()+ && let Some(z) = values.get_mut(2)+ {+ *z = if *id == "scale" { 100.0 } else { 0.0 };+ }let values: Vec<String> = values.into_iter().map(num).collect();blocks.push_str(&format!("\t{frame}\t{}\n", values.join("\t")));}diff --git a/crates/engine/src/tests_keyframe_text.rs b/crates/engine/src/tests_keyframe_text.rsindex 81ca97bd4..8ff9f9c20 100644--- a/crates/engine/src/tests_keyframe_text.rs+++ b/crates/engine/src/tests_keyframe_text.rs@@ -138,6 +138,26 @@ fn properties_the_layer_does_not_use_are_left_out() {assert!(names(&text).contains(&"Point of Interest"), "{text}");}+#[test]+fn a_2d_layer_writes_the_z_it_shows() {+ // Keys pasted from a 3D layer keep their Z on a 2D one, which ignores it.+ let (mut s, l) = session();+ let src = LayerId(s.execute("layer.newSolid", json!({"color": "#00ff00", "width": 200, "height": 100})).unwrap()["layer"].as_u64().unwrap());+ edit_layer(&mut s, src, |l| l.switches.three_d = true);+ add_key(&mut s, src, "transform/position", Tick::ZERO, json!([100, 200, 300]));+ add_key(&mut s, src, "transform/scale", Tick::ZERO, json!([50, 60, 70]));+ s.state.selected_keys = ["transform/position", "transform/scale"].map(|p| KeyRef { layer: src, prop: uid(&s, src, p), time: Tick::ZERO }).to_vec();+ s.execute("keys.copy", json!({})).unwrap();+ s.execute("keys.paste", json!({"layers": [l.0], "time": 0})).unwrap();+ let pasted = s.active_comp().unwrap().layer(l).unwrap().props.prop("transform/position").unwrap().keys[0].value.components();+ assert_eq!(pasted, [100.0, 200.0, 300.0], "the 2D layer keeps the pasted Z");+ s.state.selected_keys = ["transform/position", "transform/scale"].map(|p| KeyRef { layer: l, prop: uid(&s, l, p), time: Tick::ZERO }).to_vec();+ s.execute("keys.copy", json!({})).unwrap();+ let text = s.state.keyframe_text.clone().unwrap();+ assert!(text.contains("Transform\tPosition\n\tFrame\tX pixels\tY pixels\tZ pixels\n\t0\t100\t200\t0\n"), "{text}");+ assert!(text.contains("Transform\tScale\n\tFrame\tX percent\tY percent\tZ percent\n\t0\t50\t60\t100\n"), "{text}");+}+#[test]fn keys_from_two_layers_have_no_text() {let (mut s, a) = session();