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

Inline CurveBuilder method

Browse Source
This commit is contained in:
Hanno Braun 2023-02-24 14:26:11 +01:00
parent ea5704cebe
commit b3cc84608a
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crates/fj-kernel/src/builder/curve.rs
View File

@ -4,14 +4,6 @@ use crate::{geometry::path::SurfacePath, partial::PartialCurve};
/// Builder API for [`PartialCurve`] /// Builder API for [`PartialCurve`]
pub trait CurveBuilder { pub trait CurveBuilder {
/// Update partial curve to be a circle, from the provided radius
///
/// Returns the updated path.
fn update_as_circle_from_radius(
&mut self,
radius: impl Into<Scalar>,
) -> SurfacePath;
/// Update partial curve to be a circle, from the provided radius /// Update partial curve to be a circle, from the provided radius
/// ///
/// Returns the updated path. /// Returns the updated path.
@ -39,15 +31,6 @@ pub trait CurveBuilder {
} }
impl CurveBuilder for PartialCurve { impl CurveBuilder for PartialCurve {
fn update_as_circle_from_radius(
&mut self,
radius: impl Into<Scalar>,
) -> SurfacePath {
let path = SurfacePath::circle_from_radius(radius);
self.path = Some(path.into());
path
}
fn update_as_circle_from_center_and_radius( fn update_as_circle_from_center_and_radius(
&mut self, &mut self,
center: impl Into<Point<2>>, center: impl Into<Point<2>>,

3
crates/fj-kernel/src/builder/edge.rs
View File

@ -92,7 +92,8 @@ impl HalfEdgeBuilder for PartialHalfEdge {
&mut self, &mut self,
radius: impl Into<Scalar>, radius: impl Into<Scalar>,
) -> SurfacePath { ) -> SurfacePath {
let path = self.curve.write().update_as_circle_from_radius(radius); let path = SurfacePath::circle_from_radius(radius);
self.curve.write().path = Some(path.into());
let [a_curve, b_curve] = let [a_curve, b_curve] =
[Scalar::ZERO, Scalar::TAU].map(|coord| Point::from([coord])); [Scalar::ZERO, Scalar::TAU].map(|coord| Point::from([coord]));