From 18fdb97f65f031eae8a3d13b1f18c3dce364cf91 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Fri, 10 Mar 2023 11:27:48 +0100 Subject: [PATCH] Require full `HalfEdge` in `connect_to_edges` --- crates/fj-kernel/src/algorithms/sweep/face.rs | 2 +- crates/fj-kernel/src/builder/cycle.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/fj-kernel/src/algorithms/sweep/face.rs b/crates/fj-kernel/src/algorithms/sweep/face.rs index c3f0757ed..df81567dc 100644 --- a/crates/fj-kernel/src/algorithms/sweep/face.rs +++ b/crates/fj-kernel/src/algorithms/sweep/face.rs @@ -78,7 +78,7 @@ impl Sweep for Handle { faces.push(face); top_edges.push(( - Partial::from(top_edge), + top_edge, half_edge.curve(), half_edge.boundary(), )); diff --git a/crates/fj-kernel/src/builder/cycle.rs b/crates/fj-kernel/src/builder/cycle.rs index e57941c5b..77e7bff35 100644 --- a/crates/fj-kernel/src/builder/cycle.rs +++ b/crates/fj-kernel/src/builder/cycle.rs @@ -3,7 +3,7 @@ use fj_math::Point; use crate::{ geometry::curve::Curve, objects::{HalfEdge, Objects}, - partial::{Partial, PartialCycle}, + partial::PartialCycle, services::Service, storage::Handle, }; @@ -45,7 +45,7 @@ pub trait CycleBuilder { objects: &mut Service, ) -> O::SameSize> where - O: ObjectArgument<(Partial, Curve, [Point<1>; 2])>; + O: ObjectArgument<(Handle, Curve, [Point<1>; 2])>; } impl CycleBuilder for PartialCycle { @@ -83,13 +83,13 @@ impl CycleBuilder for PartialCycle { objects: &mut Service, ) -> O::SameSize> where - O: ObjectArgument<(Partial, Curve, [Point<1>; 2])>, + O: ObjectArgument<(Handle, Curve, [Point<1>; 2])>, { edges.map_with_prev(|(_, curve, boundary), (prev, _, _)| { let half_edge = HalfEdge::make_half_edge( curve, boundary, - Some(prev.read().start_vertex.clone()), + Some(prev.start_vertex().clone()), None, objects, );