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

Inline redundant function

Browse Source
This commit is contained in:
Hanno Braun 2025-02-06 20:54:41 +01:00
parent ec835ebf13
commit 4246a2169f
2 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
experiments/2024-12-09/src/topology/connect.rs
View File

@ -1,4 +1,4 @@
use crate::geometry::Handle;
use crate::{geometry::Handle, math::Plane};
use super::{face::Face, solid::Solid};
@ -24,6 +24,27 @@ pub trait ConnectExt {
impl ConnectExt for Handle<Face> {
fn connect(self, other: Handle<Face>) -> Solid {
Solid::connect_faces([self, other])
assert_eq!(
self.vertices().count(),
other.vertices().count(),
"Can only connect faces that have the same number of vertices.",
);
let side_faces = self
.half_edges()
.zip(other.half_edges())
.map(|([q, r], [t, s])| {
let surface = Handle::new(Plane::from_points(
[q, r, s].map(|vertex| vertex.point),
));
let face = Face::new(
surface,
[q, r, s, t].map(|vertex| vertex.clone()),
);
Handle::new(face)
})
.collect::<Vec<_>>();
Solid::new([self, other].into_iter().chain(side_faces))
}
}

30
experiments/2024-12-09/src/topology/solid.rs
View File

@ -1,9 +1,6 @@
use std::fmt;
use crate::{
geometry::{AnyOp, Handle, Operation, TriMesh},
math::Plane,
};
use crate::geometry::{AnyOp, Handle, Operation, TriMesh};
use super::face::Face;
@ -17,31 +14,6 @@ impl Solid {
faces: faces.into_iter().collect(),
}
}
pub fn connect_faces([a, b]: [Handle<Face>; 2]) -> Self {
assert_eq!(
a.vertices().count(),
b.vertices().count(),
"Can only connect faces that have the same number of vertices.",
);
let side_faces = a
.half_edges()
.zip(b.half_edges())
.map(|([q, r], [t, s])| {
let surface = Handle::new(Plane::from_points(
[q, r, s].map(|vertex| vertex.point),
));
let face = Face::new(
surface,
[q, r, s, t].map(|vertex| vertex.clone()),
);
Handle::new(face)
})
.collect::<Vec<_>>();
Solid::new([a, b].into_iter().chain(side_faces))
}
}
impl Operation for Solid {