aleleba/vectorcraft
1
0
Fork 0
mirror of https://github.com/storytold/vectorcraft.git synced 2026-10-29 12:17:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

Shape Builder: a merge looks up the picked points of a coverage once

Browse Source 
The search for the faces a merge unites compared each reported face's
coverage with every picked point's coverage. The picked points are now
grouped by coverage once, before the walk, and each face is tested only
against the points of its own coverage.
This commit is contained in:
dotCooCoo
2026-10-29 10:01:22 +07:00
committed by bflatastic
parent 32601a6bc3
commit 4116fdbe47
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/pathops/src/pathfinder.rs
+13 -7
View File
@@ -491,13 +491,19 @@ impl FaceMerger {
}
picks.push((mask, crate::planar::interior_point(&r.path)?));
}
// `masks` holds the coverages in the order they were first picked, and `found` holds the
// faces of each that contain a picked point.
// `masks` holds the coverages in the order they were first picked, `points` the picked
// points of each, and `found` the faces of each that contain one of its points.
let mut masks: Vec<&[bool]> = vec![];
let mut seen = HashSet::new();
for (mask, _) in &picks {
if seen.insert(mask.as_slice()) {
let mut points: Vec<Vec<Point>> = vec![];
let mut index: HashMap<&[bool], usize> = HashMap::new();
for (mask, p) in &picks {
let m = *index.entry(mask.as_slice()).or_insert_with(|| {
masks.push(mask);
points.push(Vec::new());
masks.len() - 1
});
if let Some(at) = points.get_mut(m) {
at.push(*p);
}
}
let mut found: Vec<Vec<BezPath>> = vec![Vec::new(); masks.len()];
@@ -506,8 +512,8 @@ impl FaceMerger {
for &i in group {
face.extend(c[i].path.iter());
}
if let (Some(&mask), Some(out)) = (masks.get(m), found.get_mut(m))
&& picks.iter().any(|(k, p)| k.as_slice() == mask && face.winding(*p) != 0)
if let (Some(at), Some(out)) = (points.get(m), found.get_mut(m))
&& at.iter().any(|p| face.winding(*p) != 0)
{
out.push(face);
}