mirror of
https://github.com/storytold/figcraft.git
synced 2026-10-28 04:16:46 -06:00
RealtaNuaandClaude Opus 5.5
b8e5b8e133
The Pen showed only its anchors while a path was drawn; handles appeared only in vector edit mode afterwards. Now: - The point being dragged shows its in and out handles, and the point before it its out handle (the handles shaping the segments at the pen), drawn like vector edit mode's (one shared canvas helper). - Moving on to the next point, the rubber band is the segment a click would make: it leaves the last anchor along its out handle instead of going straight. - A press no longer leaves the previous straight rubber band on screen over the segment being dragged. Overlay gains pen_handles and rubber_handle (shown in ui.inspect). Tests: pen_overlay_tests (handles during and after a drag, none and a straight band for corner points, cleared on finish); canvas_fixes_tests (handle lines and dots painted mid-drag, curved band after release). Refs #256 Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
66 lines
2.7 KiB
Rust
66 lines
2.7 KiB
Rust
//! What the Pen tool shows while a path is drawn (`tool.overlay`): the handles shaping the segments
|
|
//! at the pen, and the rubber band to the pointer, which follows the last anchor's out handle.
|
|
|
|
use crate::Session;
|
|
use crate::tools::{PointerEvent, PointerKind, ToolId};
|
|
|
|
fn at(s: &mut Session, kind: PointerKind, x: f64, y: f64) {
|
|
s.pointer(&PointerEvent::at(kind, x, y, 1.0)).unwrap();
|
|
}
|
|
|
|
/// A press at (x, y) dragged to (to_x, to_y) and released: a smooth point with out handle
|
|
/// (to - p).
|
|
fn drag_point(s: &mut Session, x: f64, y: f64, to_x: f64, to_y: f64) {
|
|
at(s, PointerKind::Down, x, y);
|
|
at(s, PointerKind::Move, to_x, to_y);
|
|
at(s, PointerKind::Up, to_x, to_y);
|
|
}
|
|
|
|
#[test]
|
|
fn the_dragged_point_shows_its_handles_and_the_one_before_its_out_handle() {
|
|
let mut s = Session::new();
|
|
s.set_tool(ToolId::Pen);
|
|
drag_point(&mut s, 100.0, 100.0, 140.0, 100.0);
|
|
assert_eq!(s.tool.overlay.pen_handles, vec![[100.0, 100.0, 60.0, 100.0], [100.0, 100.0, 140.0, 100.0]], "in and out of the first point");
|
|
// The second point, mid-drag.
|
|
at(&mut s, PointerKind::Down, 200.0, 200.0);
|
|
assert_eq!(s.tool.overlay.rubber, None, "the press shows the segment itself, not a straight band");
|
|
at(&mut s, PointerKind::Move, 200.0, 240.0);
|
|
assert_eq!(
|
|
s.tool.overlay.pen_handles,
|
|
vec![[100.0, 100.0, 140.0, 100.0], [200.0, 200.0, 200.0, 160.0], [200.0, 200.0, 200.0, 240.0]],
|
|
"the one before's out handle, then the dragged point's in and out"
|
|
);
|
|
at(&mut s, PointerKind::Up, 200.0, 240.0);
|
|
// Moving on: the band leaves along the last out handle.
|
|
at(&mut s, PointerKind::Hover, 300.0, 200.0);
|
|
assert_eq!(s.tool.overlay.rubber, Some([200.0, 200.0, 300.0, 200.0]));
|
|
assert_eq!(s.tool.overlay.rubber_handle, Some([200.0, 240.0]));
|
|
}
|
|
|
|
#[test]
|
|
fn corner_points_have_no_handles_and_a_straight_band() {
|
|
let mut s = Session::new();
|
|
s.set_tool(ToolId::Pen);
|
|
for (x, y) in [(100.0, 100.0), (200.0, 100.0)] {
|
|
at(&mut s, PointerKind::Down, x, y);
|
|
at(&mut s, PointerKind::Up, x, y);
|
|
}
|
|
at(&mut s, PointerKind::Hover, 250.0, 200.0);
|
|
assert!(s.tool.overlay.pen_handles.is_empty());
|
|
assert_eq!(s.tool.overlay.rubber, Some([200.0, 100.0, 250.0, 200.0]));
|
|
assert_eq!(s.tool.overlay.rubber_handle, None, "straight");
|
|
}
|
|
|
|
#[test]
|
|
fn finishing_the_path_clears_its_handles_and_band() {
|
|
let mut s = Session::new();
|
|
s.set_tool(ToolId::Pen);
|
|
drag_point(&mut s, 100.0, 100.0, 140.0, 100.0);
|
|
drag_point(&mut s, 200.0, 200.0, 200.0, 240.0);
|
|
at(&mut s, PointerKind::Hover, 300.0, 200.0);
|
|
s.pen_finish().unwrap();
|
|
let ov = &s.tool.overlay;
|
|
assert!(ov.pen.is_empty() && ov.pen_handles.is_empty() && ov.rubber.is_none() && ov.rubber_handle.is_none());
|
|
}
|