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

Merge pull request #2350 from hannobraun/geometry

Browse Source 
Return `Option` from `CurveGeom::local_on`
This commit is contained in:
Hanno Braun 2024-05-07 14:55:29 +02:00 committed by GitHub
commit 8ca2fbb7e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/fj-core/src/geometry/curve.rs
View File

@ -33,10 +33,11 @@ impl CurveGeom {
/// ## Panics /// ## Panics
/// ///
/// Panics, if the curve has not been defined on that surface. /// Panics, if the curve has not been defined on that surface.
pub fn local_on(&self, surface: &Handle<Surface>) -> &LocalCurveGeom { pub fn local_on(
self.definitions &self,
.get(surface) surface: &Handle<Surface>,
.expect("Curve not defined on provided surface") ) -> Option<&LocalCurveGeom> {
self.definitions.get(surface)
} }
} }

1
crates/fj-core/src/operations/build/half_edge.rs
View File

@ -135,6 +135,7 @@ pub trait BuildHalfEdge {
.of_curve(half_edge.curve()) .of_curve(half_edge.curve())
.expect("Curve geometry was just defined in same function") .expect("Curve geometry was just defined in same function")
.local_on(&surface) .local_on(&surface)
.expect("Curve geometry was just defined in same function")
.path, .path,
boundary: boundary.unwrap_or_default(), boundary: boundary.unwrap_or_default(),
}, },

4
crates/fj-core/src/operations/build/shell.rs
View File

@ -112,6 +112,10 @@ pub trait BuildShell {
defined in same function", defined in same function",
) )
.local_on(&surface) .local_on(&surface)
.expect(
"Curve geometry was just \
defined in same function",
)
.path, .path,
boundary, boundary,
}, },

8
crates/fj-core/src/operations/sweep/half_edge.rs
View File

@ -141,10 +141,14 @@ impl SweepHalfEdge for Handle<HalfEdge> {
.geometry .geometry
.of_curve(&curve) .of_curve(&curve)
.expect( .expect(
"Curve geometry was just \ "Curve geometry was just defined in same \
defined in same function", function",
) )
.local_on(&surface) .local_on(&surface)
.expect(
"Curve geometry was just defined in same \
function",
)
.path, .path,
boundary, boundary,
}, },