rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-05-12 05:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Inline redundant struct

Browse Source
This commit is contained in:
Hanno Braun 2024-05-22 19:55:53 +02:00
parent 4dd921656e
commit de90327970
1 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
crates/fj-core/src/validate/shell.rs
View File

@ -84,13 +84,10 @@ impl ShellValidationError {
)
.all(|d| d < config.distinct_min_distance)
{
let boundaries = CoincidentHalfEdgeBoundaries {
boundaries: [half_edge_a, half_edge_b].map(
|half_edge| {
geometry.of_half_edge(half_edge).boundary
},
),
};
let boundaries =
[half_edge_a, half_edge_b].map(|half_edge| {
geometry.of_half_edge(half_edge).boundary
});
let curves = CoincidentHalfEdgeCurves {
curves: [half_edge_a, half_edge_b]
.map(|half_edge| half_edge.curve().clone()),
@ -126,7 +123,7 @@ impl ShellValidationError {
#[derive(Clone, Debug, thiserror::Error)]
pub struct CoincidentHalfEdgesAreNotSiblings {
/// The boundaries of the half-edges
pub boundaries: CoincidentHalfEdgeBoundaries,
pub boundaries: [CurveBoundary<Point<1>>; 2],
/// The curves of the half-edges
pub curves: CoincidentHalfEdgeCurves,
@ -149,45 +146,31 @@ impl fmt::Display for CoincidentHalfEdgesAreNotSiblings {
siblings",
)?;
{
let [a, b] = &self.boundaries;
if a != &b.reverse() {
writeln!(
f,
"Boundaries don't match.\n\
\tHalf-edge 1 has boundary `{a:?}`\n\
\tHalf-edge 2 has boundary `{b:?}`\n\
\t(expecting same boundary, but reversed)"
)?;
}
}
write!(
f,
"{}\
{}\
{}\
Half-edge 1: {:#?}\n\
Half-edge 2: {:#?}",
self.boundaries,
self.curves,
self.vertices,
self.half_edge_a,
self.half_edge_b,
self.curves, self.vertices, self.half_edge_a, self.half_edge_b,
)
}
}
#[derive(Clone, Debug)]
pub struct CoincidentHalfEdgeBoundaries {
pub boundaries: [CurveBoundary<Point<1>>; 2],
}
impl fmt::Display for CoincidentHalfEdgeBoundaries {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let [a, b] = &self.boundaries;
if a != &b.reverse() {
writeln!(
f,
"Boundaries don't match.\n\
\tHalf-edge 1 has boundary `{a:?}`\n\
\tHalf-edge 2 has boundary `{b:?}`\n\
\t(expecting same boundary, but reversed)"
)?;
}
Ok(())
}
}
#[derive(Clone, Debug)]
pub struct CoincidentHalfEdgeCurves {
pub curves: [Handle<Curve>; 2],