rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-05-06 19:08:28 +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:56:56 +02:00
parent de90327970
commit f08f91f2ef
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,10 +88,8 @@ impl ShellValidationError {
[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()),
};
let curves = [half_edge_a, half_edge_b]
.map(|half_edge| half_edge.curve().clone());
let vertices = CoincidentHalfEdgeVertices {
vertices: [half_edge_a, half_edge_b].map(|half_edge| {
shell
@ -126,7 +124,7 @@ pub struct CoincidentHalfEdgesAreNotSiblings {
pub boundaries: [CurveBoundary<Point<1>>; 2],
/// The curves of the half-edges
pub curves: CoincidentHalfEdgeCurves,
pub curves: [Handle<Curve>; 2],
/// The vertices of the half-edges
pub vertices: CoincidentHalfEdgeVertices,
@ -160,40 +158,30 @@ impl fmt::Display for CoincidentHalfEdgesAreNotSiblings {
}
}
{
let [a, b] = &self.curves;
if a.id() != b.id() {
writeln!(
f,
"Curves don't match.\n\
\tHalf-edge 1 lies on {a:?}\n\
\tHalf-edge 2 lies on {b:?}\n\
\t(must be the same)"
)?;
}
}
write!(
f,
"{}\
{}\
Half-edge 1: {:#?}\n\
Half-edge 2: {:#?}",
self.curves, self.vertices, self.half_edge_a, self.half_edge_b,
self.vertices, self.half_edge_a, self.half_edge_b,
)
}
}
#[derive(Clone, Debug)]
pub struct CoincidentHalfEdgeCurves {
pub curves: [Handle<Curve>; 2],
}
impl fmt::Display for CoincidentHalfEdgeCurves {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let [a, b] = &self.curves;
if a.id() != b.id() {
writeln!(
f,
"Curves don't match.\n\
\tHalf-edge 1 lies on {a:?}\n\
\tHalf-edge 2 lies on {b:?}\n\
\t(must be the same)"
)?;
}
Ok(())
}
}
#[derive(Clone, Debug)]
pub struct CoincidentHalfEdgeVertices {
pub vertices: [CurveBoundary<Vertex>; 2],