mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-18 02:42:47 +00:00
Path Precision Tools: Common Tangents adds the centerline between tiny paths
The centerline was left out whenever the two centers were less than 1e-9 points apart, so two separate paths a billionth of a point wide got their tangents but no centerline. Centers now count as one point only when they are closer than a billionth of the larger path's size.
This commit is contained in:
@@ -96,7 +96,8 @@ fn common_tangents(s: &mut Session, p: &Value) -> Result<Value> {
|
||||
};
|
||||
return Ok(json!({ "ids": [], "external": 0, "internal": 0, "centerline": null, "warning": warning.to_string() }));
|
||||
}
|
||||
let center = (centerline && (a.center() - b.center()).hypot() > 1e-9).then(|| (a.center(), b.center()));
|
||||
// Centers closer than a billionth of the larger path's size count as one point: no line.
|
||||
let center = (centerline && (a.center() - b.center()).hypot() > 1e-9 * a.size().max(b.size())).then(|| (a.center(), b.center()));
|
||||
let fill = Paint::None;
|
||||
let stroke = if s.paint.stroke.is_none() { Paint::solid(Color::BLACK) } else { s.paint.stroke.clone() };
|
||||
let mut look = s.new_art_look(fill, stroke, s.paint.stroke_width.max(0.1));
|
||||
|
||||
@@ -162,6 +162,19 @@ fn a_convex_bezier_path_and_the_centerline() {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn tiny_paths_close_together_still_get_the_centerline() {
|
||||
// Two circles a ten-billionth of a point wide, half a billionth apart: separate, with all four
|
||||
// tangents, and centers apart by far more than their sizes' rounding.
|
||||
let mut s = session();
|
||||
let a = circle(&mut s, 1.0, 1.0, 1e-10);
|
||||
let b = circle(&mut s, 1.0 + 5e-10, 1.0, 1e-10);
|
||||
let r = s.execute(C, &json!({"ids": [a.0, b.0], "centerline": true})).unwrap();
|
||||
assert_eq!((r["external"].as_u64(), r["internal"].as_u64()), (Some(2), Some(2)), "{r}");
|
||||
assert_eq!(r["ids"].as_array().map(Vec::len), Some(5), "{r}");
|
||||
assert_eq!(r["centerline"], r["ids"][4]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_lines_take_the_current_stroke_and_no_fill() {
|
||||
let mut s = session();
|
||||
|
||||
@@ -259,7 +259,7 @@ impl Outline {
|
||||
}
|
||||
|
||||
/// The diagonal of the bounds (an ellipse's: of the box its axes span).
|
||||
fn size(&self) -> f64 {
|
||||
pub fn size(&self) -> f64 {
|
||||
match self {
|
||||
Outline::Ellipse { m, .. } => {
|
||||
let [a, b, c, d] = *m;
|
||||
|
||||
Reference in New Issue
Block a user