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

Extract building connecting face to dedicated fn

Browse Source
This commit is contained in:
Hanno Braun 2025-04-04 12:49:13 +02:00
parent 5fa10def8b
commit 1ac4a73cd9
1 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
experiments/2025-03-18/src/operations/connect.rs
View File

@ -2,7 +2,10 @@ use crate::{
handle::Handle,
math::Plane,
topology::{
curve::Curve, face::Face, half_edge::HalfEdge, solid::Solid,
curve::Curve,
face::{Face, HalfEdgeWithEndVertex},
half_edge::HalfEdge,
solid::Solid,
surface::Surface,
},
};
@ -54,42 +57,45 @@ fn build_connecting_faces(bottom: &Face, top: &Face) -> Vec<Handle<Face>> {
bottom
.half_edges_with_end_vertex()
.zip(top.half_edges_with_end_vertex())
.map(|(bottom, top)| {
let is_internal =
match [bottom.half_edge.is_internal, top.half_edge.is_internal]
{
[true, true] => true,
[false, false] => false,
_ => {
panic!(
"Trying to connect an internal half-edge of one \
face to an external half-edge of another"
);
}
};
let a = &bottom.half_edge.start;
let b = bottom.end_vertex;
let c = top.end_vertex;
let d = &top.half_edge.start;
let surface = Handle::new(Surface {
geometry: Box::new(Plane::from_points(
[a, b, d].map(|vertex| vertex.point),
)),
});
let face = Face::new(
surface,
[a, b, c, d].map(|vertex| {
Handle::new(HalfEdge {
curve: Handle::new(Curve {}),
start: vertex.clone(),
is_internal: false,
})
}),
is_internal,
);
Handle::new(face)
})
.map(|(bottom, top)| build_single_connecting_face([bottom, top]))
.collect::<Vec<_>>()
}
fn build_single_connecting_face(
[bottom, top]: [HalfEdgeWithEndVertex; 2],
) -> Handle<Face> {
let is_internal =
match [bottom.half_edge.is_internal, top.half_edge.is_internal] {
[true, true] => true,
[false, false] => false,
_ => {
panic!(
"Trying to connect an internal half-edge of one \
face to an external half-edge of another"
);
}
};
let a = &bottom.half_edge.start;
let b = bottom.end_vertex;
let c = top.end_vertex;
let d = &top.half_edge.start;
let surface = Handle::new(Surface {
geometry: Box::new(Plane::from_points(
[a, b, d].map(|vertex| vertex.point),
)),
});
let face = Face::new(
surface,
[a, b, c, d].map(|vertex| {
Handle::new(HalfEdge {
curve: Handle::new(Curve {}),
start: vertex.clone(),
is_internal: false,
})
}),
is_internal,
);
Handle::new(face)
}