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

Set curve geometry in JoinCycle method

Browse Source
This commit is contained in:
Hanno Braun 2024-05-03 13:59:50 +02:00
parent a6738fc9b6
commit 36056ee995
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/fj-core/src/operations/join/cycle.rs
View File

@ -3,7 +3,7 @@ use std::ops::RangeInclusive;
use itertools::Itertools;
use crate::{
geometry::HalfEdgeGeom,
geometry::{HalfEdgeGeom, LocalCurveGeom},
operations::{
build::BuildHalfEdge,
geometry::UpdateHalfEdgeGeometry,
@ -92,7 +92,7 @@ impl JoinCycle for Cycle {
fn add_joined_edges<Es>(
&self,
edges: Es,
_: Handle<Surface>,
surface: Handle<Surface>,
core: &mut Core,
) -> Self
where
@ -103,14 +103,24 @@ impl JoinCycle for Cycle {
.into_iter()
.circular_tuple_windows()
.map(|((prev_half_edge, _), (half_edge, geometry))| {
HalfEdge::unjoined(core)
let half_edge = HalfEdge::unjoined(core)
.update_curve(|_, _| half_edge.curve().clone(), core)
.update_start_vertex(
|_, _| prev_half_edge.start_vertex().clone(),
core,
)
.insert(core)
.set_geometry(geometry, &mut core.layers.geometry)
.set_geometry(geometry, &mut core.layers.geometry);
core.layers.geometry.define_curve(
half_edge.curve().clone(),
surface.clone(),
LocalCurveGeom {
path: geometry.path,
},
);
half_edge
})
.collect::<Vec<_>>();
self.add_half_edges(half_edges, core)