berkus
/
topola
mirror of https://codeberg.org/topola/topola.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Iterate and filtermap over tangents in math module instead of for loop

This commit is contained in:
Mikolaj Wielgus 2023-09-04 00:48:04 +02:00
parent 7d76051cbf
commit 84a5b81032
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/math.rs
View File

@ -92,35 +92,44 @@ fn tangent_point_pairs(circle1: Circle, circle2: Circle) -> [(Point, Point); 4]
] ]
} }
pub fn tangent_segments(
circle1: Circle,
cw1: Option<bool>,
circle2: Circle,
cw2: Option<bool>,
) -> impl Iterator<Item = Line> {
tangent_point_pairs(circle1, circle2)
.into_iter()
.filter_map(move |tangent_point_pair| {
if let Some(cw1) = cw1 {
let cross1 =
seq_cross_product(tangent_point_pair.0, tangent_point_pair.1, circle1.pos);
if (cw1 && cross1 <= 0.0) || (!cw1 && cross1 >= 0.0) {
return None;
}
}
if let Some(cw2) = cw2 {
let cross2 =
seq_cross_product(tangent_point_pair.0, tangent_point_pair.1, circle2.pos);
if (cw2 && cross2 <= 0.0) || (!cw2 && cross2 >= 0.0) {
return None;
}
}
Some(Line::new(tangent_point_pair.0, tangent_point_pair.1))
})
}
pub fn tangent_segment( pub fn tangent_segment(
circle1: Circle, circle1: Circle,
cw1: Option<bool>, cw1: Option<bool>,
circle2: Circle, circle2: Circle,
cw2: Option<bool>, cw2: Option<bool>,
) -> Line { ) -> Line {
let tangent_point_pairs = tangent_point_pairs(circle1, circle2); tangent_segments(circle1, cw1, circle2, cw2).next().unwrap()
for tangent_point_pair in tangent_point_pairs {
if let Some(cw1) = cw1 {
let cross1 = seq_cross_product(tangent_point_pair.0, tangent_point_pair.1, circle1.pos);
if (cw1 && cross1 <= 0.0) || (!cw1 && cross1 >= 0.0) {
continue;
}
}
if let Some(cw2) = cw2 {
let cross2 = seq_cross_product(tangent_point_pair.0, tangent_point_pair.1, circle2.pos);
if (cw2 && cross2 <= 0.0) || (!cw2 && cross2 >= 0.0) {
continue;
}
}
return Line::new(tangent_point_pair.0, tangent_point_pair.1);
}
unreachable!();
} }
pub fn intersect_circles(circle1: &Circle, circle2: &Circle) -> Vec<Point> { pub fn intersect_circles(circle1: &Circle, circle2: &Circle) -> Vec<Point> {