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

Merge pull request #2358 from hannobraun/query

Browse Source 
Refactor `AllHalfEdgesWithSurface` query to not require allocations
This commit is contained in:
Hanno Braun 2024-05-17 14:26:52 +02:00 committed by GitHub
commit 1f4569d1b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
crates/fj-core/src/queries/all_half_edges_with_surface.rs
View File

@ -8,34 +8,29 @@ pub trait AllHalfEdgesWithSurface {
/// Access all half-edges of the object, and the surface they're on /// Access all half-edges of the object, and the surface they're on
fn all_half_edges_with_surface( fn all_half_edges_with_surface(
&self, &self,
result: &mut Vec<(Handle<HalfEdge>, Handle<Surface>)>, ) -> impl Iterator<Item = (Handle<HalfEdge>, Handle<Surface>)>;
);
} }
impl AllHalfEdgesWithSurface for Face { impl AllHalfEdgesWithSurface for Face {
fn all_half_edges_with_surface( fn all_half_edges_with_surface(
&self, &self,
result: &mut Vec<(Handle<HalfEdge>, Handle<Surface>)>, ) -> impl Iterator<Item = (Handle<HalfEdge>, Handle<Surface>)> {
) { self.region().all_cycles().flat_map(|cycle| {
for cycle in self.region().all_cycles() {
result.extend(
cycle cycle
.half_edges() .half_edges()
.iter() .iter()
.cloned() .cloned()
.map(|half_edge| (half_edge, self.surface().clone())), .map(|half_edge| (half_edge, self.surface().clone()))
); })
}
} }
} }
impl AllHalfEdgesWithSurface for Shell { impl AllHalfEdgesWithSurface for Shell {
fn all_half_edges_with_surface( fn all_half_edges_with_surface(
&self, &self,
result: &mut Vec<(Handle<HalfEdge>, Handle<Surface>)>, ) -> impl Iterator<Item = (Handle<HalfEdge>, Handle<Surface>)> {
) { self.faces()
for face in self.faces() { .into_iter()
face.all_half_edges_with_surface(result); .flat_map(|face| face.all_half_edges_with_surface())
}
} }
} }

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

@ -84,8 +84,8 @@ impl ShellValidationError {
config: &ValidationConfig, config: &ValidationConfig,
errors: &mut Vec<ValidationError>, errors: &mut Vec<ValidationError>,
) { ) {
let mut edges_and_surfaces = Vec::new(); let edges_and_surfaces =
shell.all_half_edges_with_surface(&mut edges_and_surfaces); shell.all_half_edges_with_surface().collect::<Vec<_>>();
for (edge_a, surface_a) in &edges_and_surfaces { for (edge_a, surface_a) in &edges_and_surfaces {
for (edge_b, surface_b) in &edges_and_surfaces { for (edge_b, surface_b) in &edges_and_surfaces {
@ -230,8 +230,8 @@ impl ShellValidationError {
config: &ValidationConfig, config: &ValidationConfig,
errors: &mut Vec<ValidationError>, errors: &mut Vec<ValidationError>,
) { ) {
let mut edges_and_surfaces = Vec::new(); let edges_and_surfaces =
shell.all_half_edges_with_surface(&mut edges_and_surfaces); shell.all_half_edges_with_surface().collect::<Vec<_>>();
// This is O(N^2) which isn't great, but we can't use a HashMap since we // This is O(N^2) which isn't great, but we can't use a HashMap since we
// need to deal with float inaccuracies. Maybe we could use some smarter // need to deal with float inaccuracies. Maybe we could use some smarter