Skip to content

Port to linesweeper #2670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jneem wants to merge 1 commit into
base: master
Choose a base branch
from
+66 −82
Draft

Port to linesweeper #2670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions libraries/path-bool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ default = ["parsing"]
glam = "0.29.0"
regex = "1.10.6"
slotmap = "1.0.7"
kurbo = "0.12.0"
linesweeper = "0.1.2"
lyon_geom = "1.0"
roots = "0.0.8"
rustc-hash = "2.0.0"
Expand Down
130 changes: 48 additions & 82 deletions libraries/path-bool/src/path_boolean.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@
//! This approach allows for efficient and accurate boolean operations, even on
//! complex paths with many intersections or self-intersections.

#![allow(dead_code, unused_imports)]

new_key_type! {
pub struct MajorVertexKey;
pub struct MajorEdgeKey;
Expand All @@ -74,6 +76,8 @@ use crate::path_segment::PathSegment;
use crate::path_to_path_data;

use glam::{BVec2, DVec2, I64Vec2};
use kurbo::BezPath;
use linesweeper::topology::{BinaryWindingNumber, Topology};
use roots::{Roots, find_roots_cubic};
use rustc_hash::FxHashMap as HashMap;
use rustc_hash::FxHashSet as HashSet;
Expand Down Expand Up @@ -1694,96 +1698,58 @@ impl Display for BooleanError {
/// - Issues arise in determining the nesting structure of the paths.
#[inline(never)]
pub fn path_boolean(a: &Path, a_fill_rule: FillRule, b: &Path, b_fill_rule: FillRule, op: PathBooleanOperation) -> Result<Vec<Path>, BooleanError> {
let mut unsplit_edges: Vec<MajorGraphEdgeStage1> = a.iter().map(segment_to_edge(1)).chain(b.iter().map(segment_to_edge(2))).flatten().collect();

if unsplit_edges.is_empty() {
return Ok(Vec::new());
}
split_at_self_intersections(&mut unsplit_edges);

let split_edges = split_at_intersections(&unsplit_edges);

#[cfg(feature = "logging")]
for (edge, _) in split_edges.iter() {
eprintln!("{}", path_to_path_data(&vec![*edge], 0.001));
}

let major_graph = find_vertices(&split_edges);

#[cfg(feature = "logging")]
eprintln!("Major graph:");
#[cfg(feature = "logging")]
eprintln!("{}", major_graph_to_dot(&major_graph));

let mut minor_graph = compute_minor(&major_graph);

#[cfg(feature = "logging")]
eprintln!("Minor graph:");
#[cfg(feature = "logging")]
eprintln!("{}", minor_graph_to_dot(&minor_graph.edges));

remove_dangling_edges(&mut minor_graph);
#[cfg(feature = "logging")]
eprintln!("After removing dangling edges:");
#[cfg(feature = "logging")]
eprintln!("{}", minor_graph_to_dot(&minor_graph.edges));

#[cfg(feature = "logging")]
for (key, edge) in minor_graph.edges.iter() {
eprintln!("{key:?}:\n{}", path_to_path_data(&edge.segments.to_vec(), 0.001));
}
#[cfg(feature = "logging")]
for vertex in minor_graph.vertices.values() {
eprintln!("{vertex:?}");
}
sort_outgoing_edges_by_angle(&mut minor_graph);
#[cfg(feature = "logging")]
for vertex in minor_graph.vertices.values() {
eprintln!("{vertex:?}");
}
let a = path_to_kurbo(a);
let b = path_to_kurbo(b);

for (edge_key, edge) in &minor_graph.edges {
assert!(minor_graph.vertices.contains_key(edge.incident_vertices[0]), "Edge {edge_key:?} has invalid start vertex");
assert!(minor_graph.vertices.contains_key(edge.incident_vertices[1]), "Edge {edge_key:?} has invalid end vertex");
assert!(edge.twin.is_some(), "Edge {edge_key:?} should have a twin");
let twin = &minor_graph.edges[edge.twin.unwrap()];
assert_eq!(twin.twin.unwrap(), edge_key, "Twin relationship should be symmetrical for edge {edge_key:?}");
}

let mut dual_graph = compute_dual(&minor_graph)?;
let inside = |windings: BinaryWindingNumber| -> bool {
let in_a = match a_fill_rule {
FillRule::NonZero => windings.shape_a != 0,
FillRule::EvenOdd => windings.shape_a % 2 == 1,
};
let in_b = match b_fill_rule {
FillRule::NonZero => windings.shape_b != 0,
FillRule::EvenOdd => windings.shape_b % 2 == 1,
};

let nesting_trees = compute_nesting_tree(&mut dual_graph);
match op {
PathBooleanOperation::Union => in_a || in_b,
PathBooleanOperation::Difference => in_a && !in_b,
PathBooleanOperation::Intersection => in_a && in_b,
PathBooleanOperation::Exclusion => in_a != in_b,
PathBooleanOperation::Division => unimplemented!(),
PathBooleanOperation::Fracture => unimplemented!(),
}
};
let top = Topology::from_paths_binary(&a, &b, 1e-5).map_err(|_| BooleanError::MultipleOuterFaces)?;
let contours = top.contours(inside);
Ok(contours.contours().map(|c| path_from_kurbo(&c.path)).collect())
}

#[cfg(feature = "logging")]
for tree in &nesting_trees {
eprintln!("nesting_trees: {tree:?}");
fn seg_to_kurbo(seg: &PathSegment) -> kurbo::PathSeg {
let p = |dv: &DVec2| kurbo::Point::new(dv.x, dv.y);
match seg {
PathSegment::Line(a, b) => kurbo::Line::new(p(a), p(b)).into(),
PathSegment::Quadratic(a, b, c) => kurbo::QuadBez::new(p(a), p(b), p(c)).into(),
PathSegment::Cubic(a, b, c, d) => kurbo::CubicBez::new(p(a), p(b), p(c), p(d)).into(),
PathSegment::Arc(..) => unimplemented!(),
}
}

let DualGraph { edges, vertices, .. } = &dual_graph;

#[cfg(feature = "logging")]
eprintln!("Dual Graph:");
#[cfg(feature = "logging")]
eprintln!("{}", dual_graph_to_dot(&dual_graph.components, edges));

let mut flags = new_hash_map(vertices.len());
flag_faces(&nesting_trees, a_fill_rule, b_fill_rule, edges, vertices, &mut flags);
fn path_to_kurbo(p: &Path) -> kurbo::BezPath {
BezPath::from_path_segments(p.iter().map(seg_to_kurbo))
}

#[cfg(feature = "logging")]
for (face, flag) in &flags {
eprintln!("{:?}: {:b}", face.0, flag);
fn seg_from_kurbo(seg: kurbo::PathSeg) -> PathSegment {
let d = |p: kurbo::Point| DVec2::new(p.x, p.y);
match seg {
kurbo::PathSeg::Line(l) => PathSegment::Line(d(l.p0), d(l.p1)),
kurbo::PathSeg::Quad(q) => PathSegment::Quadratic(d(q.p0), d(q.p1), d(q.p2)),
kurbo::PathSeg::Cubic(c) => PathSegment::Cubic(d(c.p0), d(c.p1), d(c.p2), d(c.p3)),
}
}

let predicate = OPERATION_PREDICATES[op as usize];

match op {
PathBooleanOperation::Division | PathBooleanOperation::Fracture => Ok(dump_faces(&nesting_trees, predicate, edges, vertices, &flags)),
_ => {
let mut selected_faces: Vec<DualVertexKey> = get_selected_faces(&predicate, &flags).collect();
selected_faces.sort_unstable();
Ok(vec![walk_faces(&selected_faces, edges, vertices).collect()])
}
}
fn path_from_kurbo(p: &BezPath) -> Path {
p.segments().map(seg_from_kurbo).collect()
}

#[cfg(test)]
Expand Down
Loading