mirror of
https://github.com/storytold/effectcraft.git
synced 2026-10-14 19:27:05 -04:00
bflatasticandClaude Opus 5.5
f3db1ebe38
Dragging a keyframe moved it a frame or two and then let go: the key's widget id includes its time, so after the first move it was a new widget and egui ended the drag. The Timeline now follows the whole gesture itself (`KeyDrag`: from where the button went down, by whole frames, every selected key, one undo step), like After Effects. Holding Shift snaps the grabbed key to the current time, the work area and composition markers. Co-Authored-By: Claude Opus 5.5 <[email protected]>
82 lines
4.1 KiB
Rust
82 lines
4.1 KiB
Rust
//! Headless checks for Timeline keyframes as a person uses them: dragging keys over many frames
|
|
//! in one gesture (the drag used to end after the first frame), Shift-snapping, and Ctrl+C /
|
|
//! Ctrl+V, which the windowing layer delivers as clipboard events rather than key presses.
|
|
|
|
use effectcraft_engine::Session;
|
|
use effectcraft_engine::project::LayerId;
|
|
use effectcraft_ui_egui::EffectcraftApp;
|
|
use egui::{Event, Pos2, pos2};
|
|
use egui_kittest::Harness;
|
|
use serde_json::json;
|
|
|
|
/// A 4 s, 30 fps comp with a Box layer whose Opacity has keys at 0 s and 1 s, revealed in the
|
|
/// Timeline; returns the harness, the layer and the property uid.
|
|
fn harness() -> (Harness<'static, EffectcraftApp>, LayerId, u64) {
|
|
let mut s = Session::default();
|
|
s.execute("comp.new", json!({"name": "Keys", "width": 320, "height": 180, "frameRate": 30, "duration": 4})).unwrap();
|
|
s.execute("layer.newSolid", json!({"name": "Box", "color": "#e04020", "width": 80, "height": 80})).unwrap();
|
|
let id = s.active_comp().unwrap().layers[0].id;
|
|
for (t, v) in [(0.0, 0.0), (1.0, 100.0)] {
|
|
s.execute("prop.addKey", json!({"layer": id.0, "path": "transform/opacity", "time": t, "value": v})).unwrap();
|
|
}
|
|
let uid = s.active_comp().unwrap().layer(id).unwrap().props.prop("transform/opacity").unwrap().uid;
|
|
s.execute("layer.select", json!({"layers": [id.0]})).unwrap();
|
|
let mut h = Harness::builder().with_size(egui::vec2(1600.0, 1000.0)).build_eframe(|_| EffectcraftApp::new(s));
|
|
h.run_steps(3);
|
|
let ctx = h.ctx.clone();
|
|
effectcraft_ui_egui::menus::invoke(h.state_mut(), &ctx, "timeline.reveal.opacity", json!({})).unwrap();
|
|
h.run_steps(4);
|
|
(h, id, uid)
|
|
}
|
|
|
|
fn key_times(h: &Harness<'_, EffectcraftApp>, id: LayerId) -> Vec<f64> {
|
|
let l = h.state().session.active_comp().unwrap().layer(id).unwrap().clone();
|
|
l.props.prop("transform/opacity").unwrap().keys.iter().map(|k| (k.time.seconds() * 30.0).round() / 30.0).collect()
|
|
}
|
|
|
|
/// Screen centres of the property's keys, left to right.
|
|
fn keys(h: &Harness<'_, EffectcraftApp>, uid: u64) -> Vec<Pos2> {
|
|
let mut ks: Vec<Pos2> =
|
|
h.state().auto.query(&format!("timeline.key.{uid}.")).iter().map(|e| pos2(e.rect[0] + e.rect[2] / 2.0, e.rect[1] + e.rect[3] / 2.0)).collect();
|
|
ks.sort_by(|a, b| a.x.total_cmp(&b.x));
|
|
ks
|
|
}
|
|
|
|
/// Press at `from`, move to `to` in small steps (a real drag), release.
|
|
fn drag(h: &mut Harness<'_, EffectcraftApp>, from: Pos2, to: Pos2, modifiers: egui::Modifiers) {
|
|
h.input_mut().events.push(Event::PointerMoved(from));
|
|
h.step();
|
|
h.input_mut().events.push(Event::ModifiersChanged(modifiers));
|
|
h.input_mut().events.push(Event::PointerButton { pos: from, button: egui::PointerButton::Primary, pressed: true, modifiers });
|
|
h.step();
|
|
for i in 1..=24 {
|
|
h.input_mut().events.push(Event::PointerMoved(from + (to - from) * (i as f32 / 24.0)));
|
|
h.step();
|
|
}
|
|
h.input_mut().events.push(Event::PointerButton { pos: to, button: egui::PointerButton::Primary, pressed: false, modifiers });
|
|
h.input_mut().events.push(Event::ModifiersChanged(Default::default()));
|
|
h.run_steps(2);
|
|
}
|
|
|
|
#[test]
|
|
fn a_key_drag_follows_the_pointer_for_its_whole_length() {
|
|
let (mut h, id, uid) = harness();
|
|
let ks = keys(&h, uid);
|
|
assert_eq!(ks.len(), 2);
|
|
let px_per_s = ks[1].x - ks[0].x;
|
|
// Drag the 1 s key to where 2.5 s is: many frames, one gesture.
|
|
let to = pos2(ks[1].x + px_per_s * 1.5, ks[1].y);
|
|
drag(&mut h, ks[1], to, Default::default());
|
|
let ts = key_times(&h, id);
|
|
assert!((ts[1] - 2.5).abs() <= 2.0 / 30.0, "the key follows the whole drag: {ts:?}");
|
|
let steps = h.state().session.history.undo.iter().filter(|(l, _)| l == "Move Keyframes").count();
|
|
assert_eq!(steps, 1, "one undo step per drag");
|
|
// Shift snaps it to the current time indicator (at 0.5 s), from a few pixels away.
|
|
h.state_mut().session.set_time(effectcraft_engine::time::Tick::from_seconds_f64(0.5));
|
|
h.run_steps(2);
|
|
let ks = keys(&h, uid);
|
|
let near = pos2(ks[0].x + px_per_s * 0.5 + 4.0, ks[1].y);
|
|
drag(&mut h, ks[1], near, egui::Modifiers { shift: true, ..Default::default() });
|
|
assert_eq!(key_times(&h, id)[1], 0.5, "snapped to the current time");
|
|
}
|