fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-18 18:38:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a derivative causing NaNs in boolean ops (#934)

Browse Source 
* Fix a derivative causing NaNs

* Better error messages around boolean ops

* Tweak error dialog wording

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
0HyperCube
2023-01-01 08:54:10 +00:00
committed by Keavon Chambers
parent bf39a1dbe0
commit 4f0843d2bc
4 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
document-legacy/src/intersection.rs
View File

@@ -454,7 +454,10 @@ pub fn extend_curve(curve: &mut PathSeg, distance: f64) {
let mut c_prime = c.deriv().eval(0.0);
c_prime.x *= d / c_prime.distance(Point::ORIGIN);
c_prime.y *= d / c_prime.distance(Point::ORIGIN);
let es_vec = c.eval(0.0) - c_prime;
// Don't apply a subtraction if c_prime is not finite (to prevent NaNs)
let es_vec = if c_prime.is_finite() { c.eval(0.0) - c_prime } else { c.eval(0.0).to_vec2() };
Point { x: es_vec.x, y: es_vec.y }
}
match curve {
@@ -849,6 +852,27 @@ pub fn valid_t(t: f64) -> bool {
t > -F64PRECISE && t < (1.0 - F64PRECISE)
}
// Tests that a very simple line curve intersection computes two intersections
#[test]
fn line_curve_intersection() {
let mut alpha = BezPath::new();
alpha.move_to((10., 10.));
alpha.curve_to((10., 10.), (30., 10.), (30., 10.));
alpha.curve_to((30., 10.), (30., 30.), (30., 30.));
alpha.curve_to((30., 30.), (10., 30.), (10., 30.));
alpha.curve_to((10., 30.), (10., 10.), (10., 10.));
alpha.close_path();
let mut beta = BezPath::new();
beta.move_to((0., 0.));
beta.line_to((20., 0.));
beta.line_to((20., 20.));
beta.line_to((0., 20.));
beta.close_path();
assert_eq!(intersections(&alpha, &beta).len(), 2);
}
/// Each of these tests have been visually, but not mathematically, verified.
/// These tests are all ignored because each test looks for exact floating point comparisons, so isn't tolerant to small adjustments in the algorithm.
mod tests {