mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-21 09:26:43 +00:00
Orient transform rotate arrows by quad winding
This commit is contained in:
1 parent
d630efdce2
commit
6eb625ccbf
2 files changed
+13
-2
No files matched your search
@@ -67,8 +67,10 @@ impl TransformSession {
|
||||
} else {
|
||||
let (a, b) = (quad[i], quad[(i + 1) % 4]);
|
||||
let normal = [a[1] - b[1], b[0] - a[0]];
|
||||
let center = quad.iter().fold([0.0; 2], |c, q| [c[0] + q[0] / 4.0, c[1] + q[1] / 4.0]);
|
||||
let sign = (normal[0] * (center[0] - a[0]) + normal[1] * (center[1] - a[1])).signum();
|
||||
// Winding orients every edge, even when a concave quad's mean corner position
|
||||
// lies on the wrong side of this edge. Translate before taking the area.
|
||||
let cross = |i: usize, j: usize| (quad[i][0] - quad[0][0]) * (quad[j][1] - quad[0][1]) - (quad[i][1] - quad[0][1]) * (quad[j][0] - quad[0][0]);
|
||||
let sign = (cross(1, 2) + cross(2, 3)).signum();
|
||||
normal.map(|v| v * sign)
|
||||
};
|
||||
unit(toward)
|
||||
|
||||
@@ -87,6 +87,7 @@ fn turned_box_zones_and_resize_cursors_follow_the_quad() {
|
||||
let xf = view(zoom);
|
||||
let t = app.ui.transform.as_ref().unwrap();
|
||||
for (p, expected, icon) in [
|
||||
([500.0, 100.0], Hit::Corner(1), CursorIcon::ResizeHorizontal),
|
||||
([180.0, 95.0], Hit::Edge(0), CursorIcon::ResizeNeSw),
|
||||
([505.0, 150.0], Hit::Edge(1), CursorIcon::ResizeNwSe),
|
||||
([180.0, 101.0], Hit::Inside, CursorIcon::Default),
|
||||
@@ -112,6 +113,14 @@ fn distorted_and_flipped_quads_use_their_edges_not_an_axis_aligned_box() {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn concave_quad_edge_direction_uses_winding_in_both_orientations() {
|
||||
let q = [[0.0, 0.0], [100.0, 0.0], [10.0, 10.0], [0.0, 100.0]];
|
||||
for q in [q, [q[1], q[0], q[3], q[2]]] {
|
||||
near(TransformSession::box_turn_direction(&q, [56.0, 14.0]), [-1.0 / 82.0_f64.sqrt(), -9.0 / 82.0_f64.sqrt()]);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn outside_rotation_has_eight_edge_and_corner_orientations() {
|
||||
let app = app(QUAD, 1.0);
|
||||
|
||||
Reference in new issue
Block a user