rei-mirrors/Fornjot
1
0
Fork 0
mirror of https://github.com/hannobraun/Fornjot synced 2025-05-07 19:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to prepare for follow-on change

Browse Source
This commit is contained in:
Hanno Braun 2024-03-25 13:37:20 +01:00
parent a3b6bd0b1d
commit 1c452196dc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/fj-core/src/algorithms/approx/curve.rs
View File

@ -192,12 +192,12 @@ mod tests {
fn approx_line_on_flat_surface() { fn approx_line_on_flat_surface() {
let mut core = Core::new(); let mut core = Core::new();
let surface = core.layers.topology.surfaces.xz_plane();
let (path, boundary) = let (path, boundary) =
SurfacePath::line_from_points([[1., 1.], [2., 1.]]); SurfacePath::line_from_points([[1., 1.], [2., 1.]]);
let curve = Curve::new().insert(&mut core); let curve = Curve::new().insert(&mut core);
let boundary = CurveBoundary::from(boundary); let boundary = CurveBoundary::from(boundary);
let half_edge = HalfEdgeGeom { path, boundary }; let half_edge = HalfEdgeGeom { path, boundary };
let surface = core.layers.topology.surfaces.xz_plane();
let tolerance = 1.; let tolerance = 1.;
let approx = (&curve, &half_edge, &surface) let approx = (&curve, &half_edge, &surface)
@ -210,16 +210,16 @@ mod tests {
fn approx_line_on_curved_surface_but_not_along_curve() { fn approx_line_on_curved_surface_but_not_along_curve() {
let mut core = Core::new(); let mut core = Core::new();
let (path, boundary) =
SurfacePath::line_from_points([[1., 1.], [2., 1.]]);
let curve = Curve::new().insert(&mut core);
let boundary = CurveBoundary::from(boundary);
let half_edge = HalfEdgeGeom { path, boundary };
let surface = Surface::from_uv( let surface = Surface::from_uv(
GlobalPath::circle_from_radius(1.), GlobalPath::circle_from_radius(1.),
[0., 0., 1.], [0., 0., 1.],
&mut core, &mut core,
); );
let (path, boundary) =
SurfacePath::line_from_points([[1., 1.], [2., 1.]]);
let curve = Curve::new().insert(&mut core);
let boundary = CurveBoundary::from(boundary);
let half_edge = HalfEdgeGeom { path, boundary };
let tolerance = 1.; let tolerance = 1.;
let approx = (&curve, &half_edge, &surface) let approx = (&curve, &half_edge, &surface)
@ -233,6 +233,7 @@ mod tests {
let mut core = Core::new(); let mut core = Core::new();
let global_path = GlobalPath::circle_from_radius(1.); let global_path = GlobalPath::circle_from_radius(1.);
let surface = Surface::from_uv(global_path, [0., 0., 1.], &mut core);
let path = SurfacePath::line_from_points_with_coords([ let path = SurfacePath::line_from_points_with_coords([
([0.], [0., 1.]), ([0.], [0., 1.]),
([TAU], [TAU, 1.]), ([TAU], [TAU, 1.]),
@ -240,7 +241,6 @@ mod tests {
let curve = Curve::new().insert(&mut core); let curve = Curve::new().insert(&mut core);
let boundary = CurveBoundary::from([[0.], [TAU]]); let boundary = CurveBoundary::from([[0.], [TAU]]);
let half_edge = HalfEdgeGeom { path, boundary }; let half_edge = HalfEdgeGeom { path, boundary };
let surface = Surface::from_uv(global_path, [0., 0., 1.], &mut core);
let tolerance = 1.; let tolerance = 1.;
let approx = (&curve, &half_edge, &surface) let approx = (&curve, &half_edge, &surface)
@ -266,11 +266,11 @@ mod tests {
fn approx_circle_on_flat_surface() { fn approx_circle_on_flat_surface() {
let mut core = Core::new(); let mut core = Core::new();
let surface = core.layers.topology.surfaces.xz_plane();
let path = SurfacePath::circle_from_center_and_radius([0., 0.], 1.); let path = SurfacePath::circle_from_center_and_radius([0., 0.], 1.);
let curve = Curve::new().insert(&mut core); let curve = Curve::new().insert(&mut core);
let boundary = CurveBoundary::from([[0.], [TAU]]); let boundary = CurveBoundary::from([[0.], [TAU]]);
let half_edge = HalfEdgeGeom { path, boundary }; let half_edge = HalfEdgeGeom { path, boundary };
let surface = core.layers.topology.surfaces.xz_plane();
let tolerance = 1.; let tolerance = 1.;
let approx = (&curve, &half_edge, &surface) let approx = (&curve, &half_edge, &surface)