From 633c4ea8577c98e8479d91d4ff3ae80c2028fd4b Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Thu, 4 May 2023 10:07:41 +0200 Subject: [PATCH] Create `JoinCycle::add_joined_edges` --- crates/fj-kernel/src/operations/join/cycle.rs | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/crates/fj-kernel/src/operations/join/cycle.rs b/crates/fj-kernel/src/operations/join/cycle.rs index 52b6ddb4f..1b591a854 100644 --- a/crates/fj-kernel/src/operations/join/cycle.rs +++ b/crates/fj-kernel/src/operations/join/cycle.rs @@ -1,13 +1,24 @@ use std::ops::RangeInclusive; +use fj_math::Point; +use itertools::Itertools; + use crate::{ - objects::Cycle, - operations::{Insert, UpdateCycle, UpdateHalfEdge}, + geometry::curve::Curve, + objects::{Cycle, HalfEdge}, + operations::{BuildHalfEdge, Insert, UpdateCycle, UpdateHalfEdge}, services::Services, + storage::Handle, }; /// Join a [`Cycle`] to another pub trait JoinCycle { + /// Create a cycle that is joined to the provided edges + fn add_joined_edges(&self, edges: Es, services: &mut Services) -> Self + where + Es: IntoIterator, Curve, [Point<1>; 2])>, + Es::IntoIter: Clone + ExactSizeIterator; + /// Join the cycle to another /// /// Joins the cycle to the other at the provided ranges. The ranges specify @@ -47,6 +58,21 @@ pub trait JoinCycle { } impl JoinCycle for Cycle { + fn add_joined_edges(&self, edges: Es, services: &mut Services) -> Self + where + Es: IntoIterator, Curve, [Point<1>; 2])>, + Es::IntoIter: Clone + ExactSizeIterator, + { + self.add_half_edges(edges.into_iter().circular_tuple_windows().map( + |((prev, _, _), (half_edge, curve, boundary))| { + HalfEdge::unjoined(curve, boundary, services) + .replace_start_vertex(prev.start_vertex().clone()) + .replace_global_form(half_edge.global_form().clone()) + .insert(services) + }, + )) + } + fn join_to( &self, other: &Cycle,