From e40d4f828ff5e80fa7202b27ecda455d418ad132 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Sat, 23 Mar 2024 11:52:10 +0100 Subject: [PATCH] Update struct field name --- crates/fj-core/src/algorithms/triangulate/mod.rs | 6 +++--- crates/fj-core/src/layers/layers.rs | 4 ++-- crates/fj-core/src/operations/insert/insert_trait.rs | 4 ++-- crates/fj-core/src/validation/checks/face_boundary.rs | 2 +- crates/fj-core/src/validation/checks/face_winding.rs | 2 +- models/cuboid/src/lib.rs | 2 +- models/spacer/src/lib.rs | 2 +- models/star/src/lib.rs | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crates/fj-core/src/algorithms/triangulate/mod.rs b/crates/fj-core/src/algorithms/triangulate/mod.rs index 71dfe1448..bf1f594b9 100644 --- a/crates/fj-core/src/algorithms/triangulate/mod.rs +++ b/crates/fj-core/src/algorithms/triangulate/mod.rs @@ -105,7 +105,7 @@ mod tests { let d = [0., 1.]; let face = - Face::unbound(core.layers.objects.surfaces.xy_plane(), &mut core) + Face::unbound(core.layers.topology.surfaces.xy_plane(), &mut core) .update_region( |region, core| { region.update_exterior( @@ -145,7 +145,7 @@ mod tests { let g = [3., 3.]; let h = [3., 1.]; - let surface = core.layers.objects.surfaces.xy_plane(); + let surface = core.layers.topology.surfaces.xy_plane(); let face = Face::unbound(surface.clone(), &mut core).update_region( |region, core| { @@ -234,7 +234,7 @@ mod tests { let d = [1., 1.]; let e = [0., 9.]; - let surface = core.layers.objects.surfaces.xy_plane(); + let surface = core.layers.topology.surfaces.xy_plane(); let face = Face::unbound(surface.clone(), &mut core).update_region( |region, core| { diff --git a/crates/fj-core/src/layers/layers.rs b/crates/fj-core/src/layers/layers.rs index c6915b3a4..df6ae3f93 100644 --- a/crates/fj-core/src/layers/layers.rs +++ b/crates/fj-core/src/layers/layers.rs @@ -26,7 +26,7 @@ pub struct Layers { /// /// Manages the stores of topological and geometric objects that make up /// shapes. - pub objects: Layer, + pub topology: Layer, /// The geometry layer /// @@ -51,7 +51,7 @@ impl Layers { let geometry = Geometry::new(&objects); Self { - objects: Layer::new(objects), + topology: Layer::new(objects), geometry: Layer::new(geometry), validation: Layer::default(), presentation: Layer::default(), diff --git a/crates/fj-core/src/operations/insert/insert_trait.rs b/crates/fj-core/src/operations/insert/insert_trait.rs index b51ea8e0a..4dd27fe5e 100644 --- a/crates/fj-core/src/operations/insert/insert_trait.rs +++ b/crates/fj-core/src/operations/insert/insert_trait.rs @@ -38,9 +38,9 @@ macro_rules! impl_insert { type Inserted = Handle; fn insert(self, core: &mut Core) -> Self::Inserted { - let handle = core.layers.objects.$store.reserve(); + let handle = core.layers.topology.$store.reserve(); let object = (handle.clone(), self).into(); - core.layers.objects.insert( + core.layers.topology.insert( object, &core.layers.geometry, &mut core.layers.validation, diff --git a/crates/fj-core/src/validation/checks/face_boundary.rs b/crates/fj-core/src/validation/checks/face_boundary.rs index b436cbcba..3f48cc731 100644 --- a/crates/fj-core/src/validation/checks/face_boundary.rs +++ b/crates/fj-core/src/validation/checks/face_boundary.rs @@ -49,7 +49,7 @@ mod tests { let mut core = Core::new(); let valid = Face::circle( - core.layers.objects.surfaces.xy_plane(), + core.layers.topology.surfaces.xy_plane(), [0., 0.], 1., &mut core, diff --git a/crates/fj-core/src/validation/checks/face_winding.rs b/crates/fj-core/src/validation/checks/face_winding.rs index 3328a8a20..96267061b 100644 --- a/crates/fj-core/src/validation/checks/face_winding.rs +++ b/crates/fj-core/src/validation/checks/face_winding.rs @@ -88,7 +88,7 @@ mod tests { let mut core = Core::new(); let valid = Face::polygon( - core.layers.objects.surfaces.xy_plane(), + core.layers.topology.surfaces.xy_plane(), [[0., 0.], [3., 0.], [0., 3.]], &mut core, ) diff --git a/models/cuboid/src/lib.rs b/models/cuboid/src/lib.rs index 7041ea1e0..6c37de589 100644 --- a/models/cuboid/src/lib.rs +++ b/models/cuboid/src/lib.rs @@ -13,7 +13,7 @@ use fj::{ pub fn model(size: impl Into>, core: &mut fj::core::Core) -> Solid { let [x, y, z] = size.into().components; - let bottom_surface = core.layers.objects.surfaces.xy_plane(); + let bottom_surface = core.layers.topology.surfaces.xy_plane(); let sweep_path = Vector::from([Scalar::ZERO, Scalar::ZERO, z]); Sketch::empty() diff --git a/models/spacer/src/lib.rs b/models/spacer/src/lib.rs index da8200b56..89db21660 100644 --- a/models/spacer/src/lib.rs +++ b/models/spacer/src/lib.rs @@ -17,7 +17,7 @@ pub fn model( height: f64, core: &mut fj::core::Core, ) -> Solid { - let bottom_surface = core.layers.objects.surfaces.xy_plane(); + let bottom_surface = core.layers.topology.surfaces.xy_plane(); let sweep_path = Vector::from([0., 0., height]); Sketch::empty() diff --git a/models/star/src/lib.rs b/models/star/src/lib.rs index 53e49e526..35615b420 100644 --- a/models/star/src/lib.rs +++ b/models/star/src/lib.rs @@ -40,7 +40,7 @@ pub fn model( inner_points.push([x / 2., y / 2.]); } - let bottom_surface = core.layers.objects.surfaces.xy_plane(); + let bottom_surface = core.layers.topology.surfaces.xy_plane(); let sweep_path = Vector::from([0., 0., h]); Sketch::empty()