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

Consolidate redundant calls

Browse Source
This commit is contained in:
Hanno Braun 2024-06-17 22:23:33 +02:00
parent 9e85c98627
commit 845b0578f8
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ use std::fmt;
use fj_math::{Point, Scalar};
use crate::{
geometry::{CurveBoundary, Geometry, SurfaceGeom},
geometry::{CurveBoundary, Geometry},
queries::{
AllHalfEdgesWithSurface, BoundingVerticesOfHalfEdge, SiblingOfHalfEdge,
},
@ -178,7 +178,7 @@ fn distances(
fn sample(
percent: f64,
half_edge: &Handle<HalfEdge>,
surface: &SurfaceGeom,
surface: &Handle<Surface>,
geometry: &Geometry,
) -> Point<3> {
let [start, end] = geometry.of_half_edge(half_edge).boundary.inner;
@ -187,7 +187,9 @@ fn distances(
.of_half_edge(half_edge)
.path
.point_from_path_coords(path_coords);
surface.point_from_surface_coords(surface_coords)
geometry
.of_surface(surface)
.point_from_surface_coords(surface_coords)
}
// Three samples (start, middle, end), are enough to detect weather lines
@ -199,18 +201,8 @@ fn distances(
let mut distances = Vec::new();
for i in 0..sample_count {
let percent = i as f64 * step;
let sample1 = sample(
percent,
&half_edge_a,
geometry.of_surface(surface_a),
geometry,
);
let sample2 = sample(
1.0 - percent,
&half_edge_b,
geometry.of_surface(surface_b),
geometry,
);
let sample1 = sample(percent, &half_edge_a, surface_a, geometry);
let sample2 = sample(1.0 - percent, &half_edge_b, surface_b, geometry);
distances.push(sample1.distance_to(&sample2))
}
distances.into_iter()