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

Simplify make_line_on_surface

Browse Source
This commit is contained in:
Hanno Braun 2024-06-26 18:06:18 +02:00
parent acc0c00d48
commit c267df6cff
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,8 @@ pub trait BuildHalfEdge {
surface: Handle<Surface>,
core: &mut Core,
) -> Handle<HalfEdge> {
let boundary = boundary.unwrap_or_default();
let half_edge = HalfEdge::unjoined(core).insert(core);
half_edge.curve().clone().make_line_on_surface(
@ -96,12 +98,9 @@ pub trait BuildHalfEdge {
&mut core.layers.geometry,
);
core.layers.geometry.define_half_edge(
half_edge.clone(),
HalfEdgeGeom {
boundary: boundary.unwrap_or_default(),
},
);
core.layers
.geometry
.define_half_edge(half_edge.clone(), HalfEdgeGeom { boundary });
half_edge
}

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

@ -92,7 +92,7 @@ pub trait BuildShell {
let curve = curve.make_line_on_surface(
positions,
Some(boundary),
boundary,
surface.clone(),
&mut core.layers.geometry,
);

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

@ -35,7 +35,7 @@ pub trait UpdateCurveGeometry {
fn make_line_on_surface(
self,
points_surface: [impl Into<Point<2>>; 2],
points_curve: Option<CurveBoundary<Point<1>>>,
points_curve: CurveBoundary<Point<1>>,
surface: Handle<Surface>,
geometry: &mut Layer<Geometry>,
) -> Self;
@ -71,11 +71,10 @@ impl UpdateCurveGeometry for Handle<Curve> {
fn make_line_on_surface(
self,
points_surface: [impl Into<Point<2>>; 2],
points_curve: Option<CurveBoundary<Point<1>>>,
points_curve: CurveBoundary<Point<1>>,
surface: Handle<Surface>,
geometry: &mut Layer<Geometry>,
) -> Self {
let points_curve = points_curve.unwrap_or_default();
let path = SurfacePath::line_from_points_with_coords(
points_curve.inner.zip_ext(points_surface),
);

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

@ -133,7 +133,7 @@ impl SweepHalfEdge for Handle<HalfEdge> {
.unwrap_or_else(|| Curve::new().insert(core))
.make_line_on_surface(
[start, end],
Some(boundary),
boundary,
surface.clone(),
&mut core.layers.geometry,
);