Skip to content
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.

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

Add CurveBoundary::is_normalized, simplify CurveBoundary::normalize #1991

Merged
merged 4 commits into from
Aug 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 15 additions & 9 deletions crates/fj-core/src/geometry/boundary.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,26 @@ impl<T: CurveBoundaryElement> CurveBoundary<T> {
Self { inner: [b, a] }
}

/// Indicate whether the boundary is normalized
///
/// If the boundary is normalized, its bounding elements are in a defined
/// order, and calling `normalize` will return an identical instance.
pub fn is_normalized(&self) -> bool {
let [a, b] = &self.inner;
a <= b
}

/// Normalize the boundary
///
/// Returns a new instance of this struct, which has the bounding elements
/// in a defined order, alongside a boolean that indicates whether the new
/// instance is different from the original one.
///
/// This can be used to compare a boundary while disregarding its direction.
/// in a defined order. This can be used to compare boundaries while
/// disregarding their direction.
#[must_use]
pub fn normalize(self) -> (Self, bool) {
let [a, b] = &self.inner;
if a > b {
(self.reverse(), true)
pub fn normalize(self) -> Self {
if self.is_normalized() {
self
} else {
(self, false)
self.reverse()
}
}
}
Expand Down
7 changes: 2 additions & 5 deletions crates/fj-core/src/validate/shell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,6 @@ impl ShellValidationError {
.bounding_vertices_of_edge(edge)
.expect("Expected edge to be part of shell")
.normalize()
.0
};

bounding_vertices_of(edge_a)
Expand Down Expand Up @@ -315,8 +314,7 @@ impl ShellValidationError {
.expect(
"Cycle should provide bounds of its own half-edge",
)
.normalize()
.0;
.normalize();

let edge = (curve, bounding_vertices);

Expand Down Expand Up @@ -396,8 +394,7 @@ impl ShellValidationError {
.expect(
"Just got edge from this cycle; must be part of it",
)
.normalize()
.0;
.normalize();

edges_by_coincidence
.entry((curve, boundary))
Expand Down