Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move all responsibilities of CurveBuilder to HalfEdgeBuilder #1615

Merged
merged 10 commits into from
Feb 24, 2023
Merged

Move all responsibilities of CurveBuilder to HalfEdgeBuilder #1615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c76f14d
Prepare code for follow-on change
hannobraun Feb 24, 2023
c2ad422
Return updated path from `HalfEdgeBuilder` method
hannobraun Feb 24, 2023
b8bf0bf
Return updated path from `HalfEdgeBuilder` method
hannobraun Feb 24, 2023
9f6658b
Move `CurveBuilder::update_as_u_axis`
hannobraun Feb 24, 2023
2559043
Move `CurveBuilder::update_as_v_axis`
hannobraun Feb 24, 2023
ea5704c
Return updated path from `HalfEdgeBuilder` method
hannobraun Feb 24, 2023
b3cc846
Inline `CurveBuilder` method
hannobraun Feb 24, 2023
b94f9a7
Inline `CurveBuilder` method
hannobraun Feb 24, 2023
0df6ef2
Inline `CurveBuilder::update_as_line_from_points`
hannobraun Feb 24, 2023
ff5b394
Inline `CurveBuilder` method
hannobraun Feb 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 4 additions & 95 deletions crates/fj-kernel/src/builder/curve.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,100 +1,9 @@
use fj_math::{Point, Scalar};

use crate::{geometry::path::SurfacePath, partial::PartialCurve};
use crate::partial::PartialCurve;

/// Builder API for [`PartialCurve`]
pub trait CurveBuilder {
/// Update partial curve to represent the u-axis of the surface it is on
///
/// Returns the updated path.
fn update_as_u_axis(&mut self) -> SurfacePath;

/// Update partial curve to represent the v-axis of the surface it is on
///
/// Returns the updated path.
fn update_as_v_axis(&mut self) -> SurfacePath;

/// 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
///
/// Returns the updated path.
fn update_as_circle_from_center_and_radius(
&mut self,
center: impl Into<Point<2>>,
radius: impl Into<Scalar>,
) -> SurfacePath;

/// Update partial curve to be a line, from the provided points
///
/// Returns the updated path.
fn update_as_line_from_points(
&mut self,
points: [impl Into<Point<2>>; 2],
) -> SurfacePath;

/// Update partial curve to be a line, from provided points and line coords
///
/// Returns the updated path.
fn update_as_line_from_points_with_line_coords(
&mut self,
points: [(impl Into<Point<1>>, impl Into<Point<2>>); 2],
) -> SurfacePath;
// No methods are currently defined. This trait serves as a placeholder, to
// make it clear where to add such methods, once necessary.
}

impl CurveBuilder for PartialCurve {
fn update_as_u_axis(&mut self) -> SurfacePath {
let path = SurfacePath::u_axis();
self.path = Some(path.into());
path
}

fn update_as_v_axis(&mut self) -> SurfacePath {
let path = SurfacePath::v_axis();
self.path = Some(path.into());
path
}

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(
&mut self,
center: impl Into<Point<2>>,
radius: impl Into<Scalar>,
) -> SurfacePath {
let path = SurfacePath::circle_from_center_and_radius(center, radius);
self.path = Some(path.into());
path
}

fn update_as_line_from_points(
&mut self,
points: [impl Into<Point<2>>; 2],
) -> SurfacePath {
let (path, _) = SurfacePath::line_from_points(points);
self.path = Some(path.into());
path
}

fn update_as_line_from_points_with_line_coords(
&mut self,
points: [(impl Into<Point<1>>, impl Into<Point<2>>); 2],
) -> SurfacePath {
let path = SurfacePath::from_points_with_line_coords(points);
self.path = Some(path.into());
path
}
}
impl CurveBuilder for PartialCurve {}
79 changes: 55 additions & 24 deletions crates/fj-kernel/src/builder/edge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,23 @@ use crate::{
partial::{MaybeSurfacePath, Partial, PartialGlobalEdge, PartialHalfEdge},
};

use super::CurveBuilder;

/// Builder API for [`PartialHalfEdge`]
pub trait HalfEdgeBuilder {
/// Update partial half-edge to represent the u-axis of the surface it is on
///
/// Returns the updated path.
fn update_as_u_axis(&mut self) -> SurfacePath;

/// Update partial curve to represent the v-axis of the surface it is on
///
/// Returns the updated path.
fn update_as_v_axis(&mut self) -> SurfacePath;

/// Update partial half-edge to be a circle, from the given radius
fn update_as_circle_from_radius(&mut self, radius: impl Into<Scalar>);
fn update_as_circle_from_radius(
&mut self,
radius: impl Into<Scalar>,
) -> SurfacePath;

/// Update partial half-edge to be an arc, spanning the given angle in
/// radians
Expand All @@ -29,10 +40,10 @@ pub trait HalfEdgeBuilder {
fn update_as_line_segment_from_points(
&mut self,
points: [impl Into<Point<2>>; 2],
);
) -> SurfacePath;

/// Update partial half-edge to be a line segment
fn update_as_line_segment(&mut self);
fn update_as_line_segment(&mut self) -> SurfacePath;

/// Infer the global form of the half-edge
///
Expand Down Expand Up @@ -63,8 +74,24 @@ pub trait HalfEdgeBuilder {
}

impl HalfEdgeBuilder for PartialHalfEdge {
fn update_as_circle_from_radius(&mut self, radius: impl Into<Scalar>) {
let path = self.curve.write().update_as_circle_from_radius(radius);
fn update_as_u_axis(&mut self) -> SurfacePath {
let path = SurfacePath::u_axis();
self.curve.write().path = Some(path.into());
path
}

fn update_as_v_axis(&mut self) -> SurfacePath {
let path = SurfacePath::v_axis();
self.curve.write().path = Some(path.into());
path
}

fn update_as_circle_from_radius(
&mut self,
radius: impl Into<Scalar>,
) -> SurfacePath {
let path = SurfacePath::circle_from_radius(radius);
self.curve.write().path = Some(path.into());

let [a_curve, b_curve] =
[Scalar::ZERO, Scalar::TAU].map(|coord| Point::from([coord]));
Expand All @@ -85,6 +112,8 @@ impl HalfEdgeBuilder for PartialHalfEdge {
}

self.infer_global_form();

path
}

fn update_as_arc(&mut self, angle_rad: impl Into<Scalar>) {
Expand All @@ -102,10 +131,9 @@ impl HalfEdgeBuilder for PartialHalfEdge {

let arc = fj_math::Arc::from_endpoints_and_angle(start, end, angle_rad);

let path = self
.curve
.write()
.update_as_circle_from_center_and_radius(arc.center, arc.radius);
let path =
SurfacePath::circle_from_center_and_radius(arc.center, arc.radius);
self.curve.write().path = Some(path.into());

let [a_curve, b_curve] =
[arc.start_angle, arc.end_angle].map(|coord| Point::from([coord]));
Expand All @@ -124,7 +152,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
fn update_as_line_segment_from_points(
&mut self,
points: [impl Into<Point<2>>; 2],
) {
) -> SurfacePath {
for (vertex, point) in self.vertices.each_mut_ext().zip_ext(points) {
let mut surface_form = vertex.1.write();
surface_form.position = Some(point.into());
Expand All @@ -133,7 +161,7 @@ impl HalfEdgeBuilder for PartialHalfEdge {
self.update_as_line_segment()
}

fn update_as_line_segment(&mut self) {
fn update_as_line_segment(&mut self) -> SurfacePath {
let boundary = self.vertices.each_ref_ext().map(|vertex| vertex.0);
let points_surface = self.vertices.each_ref_ext().map(|vertex| {
vertex
Expand All @@ -143,26 +171,29 @@ impl HalfEdgeBuilder for PartialHalfEdge {
.expect("Can't infer line segment without surface position")
});

if let [Some(start), Some(end)] = boundary {
let boundary = [start, end];
self.curve
.write()
.update_as_line_from_points_with_line_coords(
boundary.zip_ext(points_surface),
);
let path = if let [Some(start), Some(end)] = boundary {
let points = [start, end].zip_ext(points_surface);

let path = SurfacePath::from_points_with_line_coords(points);
self.curve.write().path = Some(path.into());

path
} else {
self.curve
.write()
.update_as_line_from_points(points_surface);
let (path, _) = SurfacePath::line_from_points(points_surface);
self.curve.write().path = Some(path.into());

for (vertex, position) in
self.vertices.each_mut_ext().zip_ext([0., 1.])
{
vertex.0 = Some([position].into());
}
}

path
};

self.infer_global_form();

path
}

fn infer_global_form(&mut self) -> Partial<GlobalEdge> {
Expand Down
2 changes: 1 addition & 1 deletion crates/fj-operations/src/sketch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ impl Shape for fj::Sketch {
},
);
line_segments.into_iter().for_each(|mut half_edge| {
half_edge.write().update_as_line_segment()
half_edge.write().update_as_line_segment();
});
arcs.into_iter().for_each(|(mut half_edge, angle)| {
half_edge.write().update_as_arc(angle.rad())
Expand Down