Viewer: the Rotation tool counts the turn from the press

The Rotation gesture seeded its angle from the pointer where egui
registered the drag, past the drag threshold, so the sweep round the
anchor before that was lost; near the anchor that is a large angle.
Count from where the button went down, as After Effects does and as the
Create and Pan Behind gestures already do. A press within 3 points of
the anchor, or with no anchor on screen, has no direction and still
counts from where the drag registered, so the first move doesn't jump.
The layer under the press is the one picked.

The issue's main cause, a pivot far off for child and 3D layers, was
fixed by #2887.

Refs #2769
This commit is contained in:
vangel76 committed 2026-11-07 14:02:20 +01:00
1 parent bb2d2005ce
commit 36854318db
2 files changed
+71 -3

No files matched your search

+10 -3
View File
@@ -1193,16 +1193,23 @@ fn phase_dragstart(app: &mut EffectcraftApp, ui: &mut egui::Ui, ectx: &EvalCtx,
})
}
Tool::MaskFeather => ov::begin_feather(app, ectx, &paths, &map, press).map(Gesture::Overlay),
Tool::Rotate => pick(app, ectx, cpt, mods.shift).map(|l| {
// The layer under the press is the one that turns.
Tool::Rotate => pick(app, ectx, map.to_comp(press), mods.shift).map(|l| {
let layer = comp.layer(l).cloned();
let sign = layer.as_ref().map_or(1.0, |l| rotation_sign(ectx, l));
let others = selected_others(app, comp, l)
.into_iter()
.filter_map(|o| Some((o.id, ectx.f(o, o.transform()?, "rotation", 0.0), rotation_sign(ectx, o) * sign)))
.collect();
let pivot = layer.as_ref().and_then(|l| anchor_in_comp(ectx, l)).unwrap_or(cpt);
let anchor = layer.as_ref().and_then(|l| anchor_in_comp(ectx, l));
let pivot = anchor.unwrap_or(cpt);
let rot = layer.as_ref().and_then(|l| l.transform().map(|tr| ectx.f(l, tr, "rotation", 0.0))).unwrap_or(0.0);
let last_angle = (cpt[1] - pivot[1]).atan2(cpt[0] - pivot[0]).to_degrees();
// The turn counts from where the button went down, as in After Effects: by the
// time the drag registers the pointer has already swept some way round the anchor.
// A press on the anchor (or with no anchor to turn about) has no direction, so
// the turn then counts from where the drag registered.
let seed = if anchor.is_some() && press.distance(map.to_screen(pivot)) > 3.0 { map.to_comp(press) } else { cpt };
let last_angle = (seed[1] - pivot[1]).atan2(seed[0] - pivot[0]).to_degrees();
Gesture::Rotate { layer: l, pivot, sign, last_angle, turned: 0.0, start_rot: rot, others }
}),
Tool::PanBehind => pick(app, ectx, cpt, false).and_then(|l| {
+61
View File
@@ -3022,6 +3022,67 @@ fn rotate_tool_counts_revolutions_both_ways() {
assert_eq!(h.state().session.history.undo.len(), undo_before + 1, "one drag, one undo step");
}
/// #2769: the Rotation tool counts the turn from where the button went down, as in After Effects,
/// not from where the drag registered: a first move that sweeps 60° round the anchor turns the
/// layer 60° (it used to drop that sweep, so near the anchor the tool lagged behind the pointer).
#[test]
fn rotate_tool_counts_the_turn_from_the_press() {
let mut h = harness();
let box_id = h.state().session.active_comp().unwrap().layers[0].id;
h.state_mut().session.execute("layer.select", json!({"layers": [box_id.0]})).unwrap();
h.state_mut().ui.tool = Tool::Rotate;
h.run_steps(2);
let center = screen(&h, [320.0, 180.0]);
let r = (screen(&h, [350.0, 180.0]) - center).x;
// Press on the box right of its anchor (0°), then one move to 60° clockwise, still on the box.
let press = center + vec2(r * 0.3, 0.0);
let to = center + vec2(r * 60f32.to_radians().cos(), r * 60f32.to_radians().sin());
h.input_mut().events.push(Event::PointerMoved(press));
h.input_mut().events.push(Event::PointerButton { pos: press, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
h.step();
h.input_mut().events.push(Event::PointerMoved(to));
h.step();
// The gesture applies the previous frame's pointer: hold a frame.
h.step();
h.input_mut().events.push(Event::PointerButton { pos: to, button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() });
h.run_steps(2);
let rot = h.state().session.active_comp().unwrap().layer(box_id).unwrap().props.prop("transform/rotation").unwrap().value.as_f64();
assert!((rot - 60.0).abs() < 1.0, "the whole sweep from the press turns the layer: {rot}");
}
/// #2769: a press right on the anchor point has no direction to count the turn from, so the layer
/// doesn't jump on the first move; the turn counts from where the drag registered.
#[test]
fn rotate_tool_pressed_on_the_anchor_does_not_jump() {
let mut h = harness();
let box_id = h.state().session.active_comp().unwrap().layers[0].id;
h.state_mut().session.execute("layer.select", json!({"layers": [box_id.0]})).unwrap();
h.state_mut().ui.tool = Tool::Rotate;
h.run_steps(2);
let rotation = |h: &Harness<'_, EffectcraftApp>| {
h.state().session.active_comp().unwrap().layer(box_id).unwrap().props.prop("transform/rotation").unwrap().value.as_f64()
};
let center = screen(&h, [320.0, 180.0]);
let r = (screen(&h, [350.0, 180.0]) - center).x;
let at = |deg: f32| center + vec2(r * deg.to_radians().cos(), r * deg.to_radians().sin());
h.input_mut().events.push(Event::PointerMoved(center));
h.input_mut().events.push(Event::PointerButton { pos: center, button: egui::PointerButton::Primary, pressed: true, modifiers: Default::default() });
h.step();
h.input_mut().events.push(Event::PointerMoved(at(60.0)));
h.step();
// The gesture applies the previous frame's pointer: hold a frame.
h.step();
let first = rotation(&h);
assert!(first.abs() < 1.0, "no jump on the first move: {first}");
h.input_mut().events.push(Event::PointerMoved(at(90.0)));
h.step();
h.step();
let next = rotation(&h);
assert!((next - 30.0).abs() < 1.0, "then turns with the pointer: {next}");
h.input_mut().events.push(Event::PointerButton { pos: at(90.0), button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() });
h.run_steps(2);
}
/// A harness whose Box is a child of Plate (anchor 320,180) with `plate` set on Plate first, at
/// parent-space position (200, 120). Returns the two layers' ids.
fn rotate_child_harness(plate: serde_json::Value) -> (Harness<'static, EffectcraftApp>, u64, u64) {