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

Inline variables

Browse Source
This commit is contained in:
Hanno Braun 2023-02-20 15:28:14 +01:00
parent 0bec935c54
commit bba87e7ccf
5 changed files with 19 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,8 +161,6 @@ mod tests {
fn compute() { fn compute() {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut curve = PartialCurve::default(); let mut curve = PartialCurve::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);
@ -184,7 +182,7 @@ mod tests {
let face = { let face = {
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior face.exterior

32
crates/fj-kernel/src/algorithms/intersect/face_point.rs
View File

@ -148,10 +148,8 @@ mod tests {
fn point_is_outside_face() { fn point_is_outside_face() {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -172,10 +170,8 @@ mod tests {
fn ray_hits_vertex_while_passing_outside() { fn ray_hits_vertex_while_passing_outside() {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -199,10 +195,8 @@ mod tests {
fn ray_hits_vertex_at_cycle_seam() { fn ray_hits_vertex_at_cycle_seam() {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -226,10 +220,8 @@ mod tests {
fn ray_hits_vertex_while_staying_inside() { fn ray_hits_vertex_while_staying_inside() {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -254,10 +246,8 @@ mod tests {
fn ray_hits_parallel_edge_and_leaves_face_at_vertex() { fn ray_hits_parallel_edge_and_leaves_face_at_vertex() {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -282,10 +272,8 @@ mod tests {
fn ray_hits_parallel_edge_and_does_not_leave_face_there() { fn ray_hits_parallel_edge_and_does_not_leave_face_there() {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -311,10 +299,8 @@ mod tests {
fn point_is_coincident_with_edge() { fn point_is_coincident_with_edge() {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -347,10 +333,8 @@ mod tests {
fn point_is_coincident_with_vertex() { fn point_is_coincident_with_vertex() {
let mut services = Services::new(); let mut services = Services::new();
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([

28
crates/fj-kernel/src/algorithms/intersect/ray_face.rs
View File

@ -163,10 +163,8 @@ mod tests {
let ray = HorizontalRayToTheRight::from([0., 0., 0.]); let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
let surface = Partial::from(services.objects.surfaces.yz_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.yz_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -189,10 +187,8 @@ mod tests {
let ray = HorizontalRayToTheRight::from([0., 0., 0.]); let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
let surface = Partial::from(services.objects.surfaces.yz_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.yz_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -218,10 +214,8 @@ mod tests {
let ray = HorizontalRayToTheRight::from([0., 0., 0.]); let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
let surface = Partial::from(services.objects.surfaces.yz_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.yz_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -244,10 +238,8 @@ mod tests {
let ray = HorizontalRayToTheRight::from([0., 0., 0.]); let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
let surface = Partial::from(services.objects.surfaces.yz_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.yz_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -281,10 +273,8 @@ mod tests {
let ray = HorizontalRayToTheRight::from([0., 0., 0.]); let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
let surface = Partial::from(services.objects.surfaces.yz_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.yz_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -318,10 +308,8 @@ mod tests {
let ray = HorizontalRayToTheRight::from([0., 0., 0.]); let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -346,10 +334,8 @@ mod tests {
let ray = HorizontalRayToTheRight::from([0., 0., 0.]); let ray = HorizontalRayToTheRight::from([0., 0., 0.]);
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([

4
crates/fj-kernel/src/algorithms/triangulate/mod.rs
View File

@ -96,10 +96,8 @@ mod tests {
let c = [2., 2.]; let c = [2., 2.];
let d = [0., 1.]; let d = [0., 1.];
let surface = Partial::from(services.objects.surfaces.xy_plane());
let mut face = PartialFace { let mut face = PartialFace {
surface, surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior face.exterior

8
crates/fj-kernel/src/validate/face.rs
View File

@ -161,10 +161,8 @@ mod tests {
let mut services = Services::new(); let mut services = Services::new();
let valid = { let valid = {
let surface = services.objects.surfaces.xy_plane();
let mut face = PartialFace { let mut face = PartialFace {
surface: Partial::from(surface), surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([
@ -212,10 +210,8 @@ mod tests {
let mut services = Services::new(); let mut services = Services::new();
let valid = { let valid = {
let surface = services.objects.surfaces.xy_plane();
let mut face = PartialFace { let mut face = PartialFace {
surface: Partial::from(surface), surface: Partial::from(services.objects.surfaces.xy_plane()),
..Default::default() ..Default::default()
}; };
face.exterior.write().update_as_polygon_from_points([ face.exterior.write().update_as_polygon_from_points([