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

Merge pull request #2416 from hannobraun/validate

Browse Source 
Remove superfluous info from validation check
This commit is contained in:
Hanno Braun 2024-07-09 21:51:37 +02:00 committed by GitHub
commit e0204138fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/fj-core/src/validation/checks/coincident_half_edges_are_not_siblings.rs
View File

@ -14,14 +14,11 @@ use crate::{
/// A [`Shell`] contains two [`HalfEdge`]s that are coincident but not siblings /// A [`Shell`] contains two [`HalfEdge`]s that are coincident but not siblings
/// ///
/// Coincident half-edges must reference the same curve, and have the same /// Coincident half-edges must reference the same curve, and must have opposite
/// boundaries on that curve. This provides clear, topological information, /// start and end vertices (i.e. the start vertex of one must be the end vertex
/// which is important to handle the shell geometry in a robust way. /// of the other, respectively).
#[derive(Clone, Debug, thiserror::Error)] #[derive(Clone, Debug, thiserror::Error)]
pub struct CoincidentHalfEdgesAreNotSiblings { pub struct CoincidentHalfEdgesAreNotSiblings {
/// The boundaries of the half-edges
pub boundaries: [CurveBoundary<Point<1>>; 2],
/// The curves of the half-edges /// The curves of the half-edges
pub curves: [Handle<Curve>; 2], pub curves: [Handle<Curve>; 2],
@ -43,20 +40,6 @@ impl fmt::Display for CoincidentHalfEdgesAreNotSiblings {
siblings", 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)"
)?;
}
}
{ {
let [a, b] = &self.curves; let [a, b] = &self.curves;
@ -139,10 +122,6 @@ impl ValidationCheck<Shell> for CoincidentHalfEdgesAreNotSiblings {
// If all points on distinct curves are within // If all points on distinct curves are within
// `distinct_min_distance`, that's a problem. // `distinct_min_distance`, that's a problem.
if distances.all(|d| d < config.distinct_min_distance) { if distances.all(|d| d < config.distinct_min_distance) {
let boundaries =
[half_edge_a, half_edge_b].map(|half_edge| {
geometry.of_half_edge(half_edge).boundary
});
let curves = [half_edge_a, half_edge_b] let curves = [half_edge_a, half_edge_b]
.map(|half_edge| half_edge.curve().clone()); .map(|half_edge| half_edge.curve().clone());
let vertices = let vertices =
@ -155,7 +134,6 @@ impl ValidationCheck<Shell> for CoincidentHalfEdgesAreNotSiblings {
}); });
errors.push(CoincidentHalfEdgesAreNotSiblings { errors.push(CoincidentHalfEdgesAreNotSiblings {
boundaries,
curves, curves,
vertices, vertices,
half_edge_a: half_edge_a.clone(), half_edge_a: half_edge_a.clone(),