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

Merge pull request #2046 from hannobraun/boundary

Browse Source 
Make some improvements to `CurveBoundaries`
This commit is contained in:
Hanno Braun 2023-10-09 11:07:21 +02:00 committed by GitHub
commit 8048d8a44d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/fj-core/src/algorithms/approx/curve/approx.rs
View File

@ -50,12 +50,10 @@ impl CurveApprox {
impl<const N: usize> From<[CurveApproxSegment; N]> for CurveApprox {
fn from(segments: [CurveApproxSegment; N]) -> Self {
Self {
segments: CurveBoundaries {
inner: segments
.into_iter()
.map(|segment| (segment.boundary, segment.points))
.collect(),
},
segments: segments
.into_iter()
.map(|segment| (segment.boundary, segment.points))
.collect(),
}
}
}

18
crates/fj-core/src/geometry/boundary/multiple.rs
View File

@ -10,8 +10,7 @@ use crate::geometry::CurveBoundary;
/// boundary.
#[derive(Clone, Debug, Eq, PartialEq, Hash, Ord, PartialOrd)]
pub struct CurveBoundaries<T: CurveBoundariesPayload = ()> {
/// The [`CurveBoundary`] instances
pub inner: Vec<(CurveBoundary<Point<1>>, T)>,
inner: Vec<(CurveBoundary<Point<1>>, T)>,
}
impl<T: CurveBoundariesPayload> CurveBoundaries<T> {
@ -29,7 +28,7 @@ impl<T: CurveBoundariesPayload> CurveBoundaries<T> {
// the removed element's boundary matches the boundary provided
// to us.
//
// This is what the caller was asking for. Return it!
// This is what the caller is asking for. Return it!
Some(payload)
}
_ => {
@ -115,6 +114,19 @@ impl<T: CurveBoundariesPayload> Default for CurveBoundaries<T> {
}
}
impl<T: CurveBoundariesPayload> FromIterator<(CurveBoundary<Point<1>>, T)>
for CurveBoundaries<T>
{
fn from_iter<I>(iter: I) -> Self
where
I: IntoIterator<Item = (CurveBoundary<Point<1>>, T)>,
{
Self {
inner: iter.into_iter().collect(),
}
}
}
/// A payload that can be used in [`CurveBoundaries`]
pub trait CurveBoundariesPayload: Clone + Ord {
/// Reverse the orientation of the payload