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

Simplify PartialCurve construction

Browse Source
This commit is contained in:
Hanno Braun 2023-02-17 12:12:27 +01:00
parent 252d439592
commit bc4d7b5055
5 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,9 +230,7 @@ mod tests {
let mut services = Services::new(); let mut services = Services::new();
let surface = services.objects.surfaces.xz_plane(); let surface = services.objects.surfaces.xz_plane();
let mut curve = PartialCurve { let mut curve = PartialCurve::default();
..Default::default()
};
curve.update_as_line_from_points([[1., 1.], [2., 1.]]); curve.update_as_line_from_points([[1., 1.], [2., 1.]]);
let curve = curve let curve = curve
.build(&mut services.objects) .build(&mut services.objects)
@ -254,9 +252,7 @@ mod tests {
) )
.build(&mut services.objects) .build(&mut services.objects)
.insert(&mut services.objects); .insert(&mut services.objects);
let mut curve = PartialCurve { let mut curve = PartialCurve::default();
..Default::default()
};
curve.update_as_line_from_points([[1., 1.], [1., 2.]]); curve.update_as_line_from_points([[1., 1.], [1., 2.]]);
let curve = curve let curve = curve
.build(&mut services.objects) .build(&mut services.objects)
@ -276,9 +272,7 @@ mod tests {
let surface = PartialSurface::from_axes(path, [0., 0., 1.]) let surface = PartialSurface::from_axes(path, [0., 0., 1.])
.build(&mut services.objects) .build(&mut services.objects)
.insert(&mut services.objects); .insert(&mut services.objects);
let mut curve = PartialCurve { let mut curve = PartialCurve::default();
..Default::default()
};
curve.update_as_line_from_points([[0., 1.], [1., 1.]]); curve.update_as_line_from_points([[0., 1.], [1., 1.]]);
let curve = curve let curve = curve
.build(&mut services.objects) .build(&mut services.objects)
@ -308,9 +302,7 @@ mod tests {
let mut services = Services::new(); let mut services = Services::new();
let surface = services.objects.surfaces.xz_plane(); let surface = services.objects.surfaces.xz_plane();
let mut curve = PartialCurve { let mut curve = PartialCurve::default();
..Default::default()
};
curve.update_as_circle_from_radius(1.); curve.update_as_circle_from_radius(1.);
let curve = curve let curve = curve
.build(&mut services.objects) .build(&mut services.objects)

16
crates/fj-kernel/src/algorithms/intersect/curve_edge.rs
View File

@ -87,9 +87,7 @@ mod tests {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane()); let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut curve = PartialCurve { let mut curve = PartialCurve::default();
..Default::default()
};
curve.update_as_u_axis(); curve.update_as_u_axis();
let curve = curve.build(&mut services.objects); let curve = curve.build(&mut services.objects);
let half_edge = { let half_edge = {
@ -117,9 +115,7 @@ mod tests {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane()); let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut curve = PartialCurve { let mut curve = PartialCurve::default();
..Default::default()
};
curve.update_as_u_axis(); curve.update_as_u_axis();
let curve = curve.build(&mut services.objects); let curve = curve.build(&mut services.objects);
let half_edge = { let half_edge = {
@ -147,9 +143,7 @@ mod tests {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane()); let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut curve = PartialCurve { let mut curve = PartialCurve::default();
..Default::default()
};
curve.update_as_u_axis(); curve.update_as_u_axis();
let curve = curve.build(&mut services.objects); let curve = curve.build(&mut services.objects);
let half_edge = { let half_edge = {
@ -172,9 +166,7 @@ mod tests {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane()); let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut curve = PartialCurve { let mut curve = PartialCurve::default();
..Default::default()
};
curve.update_as_u_axis(); curve.update_as_u_axis();
let curve = curve.build(&mut services.objects); let curve = curve.build(&mut services.objects);
let half_edge = { let half_edge = {

4
crates/fj-kernel/src/algorithms/intersect/curve_face.rs
View File

@ -163,9 +163,7 @@ mod tests {
let surface = Partial::from(services.objects.surfaces.xy_plane()); let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut curve = PartialCurve { let mut curve = PartialCurve::default();
..Default::default()
};
curve.update_as_line_from_points([[-3., 0.], [-2., 0.]]); curve.update_as_line_from_points([[-3., 0.], [-2., 0.]]);
let curve = curve.build(&mut services.objects); let curve = curve.build(&mut services.objects);

4
crates/fj-kernel/src/algorithms/intersect/face_face.rs
View File

@ -133,9 +133,7 @@ mod tests {
FaceFaceIntersection::compute([&a, &b], &mut services.objects); FaceFaceIntersection::compute([&a, &b], &mut services.objects);
let expected_curves = surfaces.map(|_| { let expected_curves = surfaces.map(|_| {
let mut curve = PartialCurve { let mut curve = PartialCurve::default();
..Default::default()
};
curve.update_as_line_from_points([[0., 0.], [1., 0.]]); curve.update_as_line_from_points([[0., 0.], [1., 0.]]);
curve curve
.build(&mut services.objects) .build(&mut services.objects)

8
crates/fj-kernel/src/algorithms/intersect/surface_surface.rs
View File

@ -120,16 +120,12 @@ mod tests {
None, None,
); );
let mut expected_xy = PartialCurve { let mut expected_xy = PartialCurve::default();
..Default::default()
};
expected_xy.update_as_u_axis(); expected_xy.update_as_u_axis();
let expected_xy = expected_xy let expected_xy = expected_xy
.build(&mut services.objects) .build(&mut services.objects)
.insert(&mut services.objects); .insert(&mut services.objects);
let mut expected_xz = PartialCurve { let mut expected_xz = PartialCurve::default();
..Default::default()
};
expected_xz.update_as_u_axis(); expected_xz.update_as_u_axis();
let expected_xz = expected_xz let expected_xz = expected_xz
.build(&mut services.objects) .build(&mut services.objects)