Merge pull request hannobraun#2289 from hannobraun/topology

Reframe "objects" as "topology"

crates/fj-core/src/algorithms/approx/curve.rs

@@ -9,8 +9,8 @@ use crate::{
         CurveBoundary, GlobalPath, HalfEdgeGeometry, SurfaceGeometry,
         SurfacePath,
     },
-    objects::Curve,
     storage::Handle,
+    topology::Curve,
     Core,
 };
 
@@ -187,8 +187,8 @@ mod tests {
             CurveBoundary, GlobalPath, HalfEdgeGeometry, SurfaceGeometry,
             SurfacePath,
         },
-        objects::Curve,
         operations::insert::Insert,
+        topology::Curve,
         Core,
     };
 

crates/fj-core/src/algorithms/approx/cycle.rs

@@ -4,7 +4,7 @@
 
 use fj_math::Segment;
 
-use crate::{geometry::SurfaceGeometry, objects::Cycle, Core};
+use crate::{geometry::SurfaceGeometry, topology::Cycle, Core};
 
 use super::{
     edge::{HalfEdgeApprox, HalfEdgeApproxCache},

crates/fj-core/src/algorithms/approx/edge.rs

@@ -6,7 +6,7 @@
 //! the caller doesn't have to deal with duplicate vertices.
 
 use crate::{
-    geometry::SurfaceGeometry, objects::HalfEdge, storage::Handle, Core,
+    geometry::SurfaceGeometry, storage::Handle, topology::HalfEdge, Core,
 };
 
 use super::{

crates/fj-core/src/algorithms/approx/face.rs

@@ -7,8 +7,8 @@ use std::{collections::BTreeSet, ops::Deref};
 use fj_interop::Color;
 
 use crate::{
-    objects::{Face, Handedness, ObjectSet},
     operations::presentation::GetColor,
+    topology::{Face, Handedness, ObjectSet},
     validation::ValidationConfig,
     Core,
 };

crates/fj-core/src/algorithms/approx/shell.rs

@@ -2,7 +2,7 @@
 
 use std::collections::BTreeSet;
 
-use crate::{objects::Shell, Core};
+use crate::{topology::Shell, Core};
 
 use super::{edge::HalfEdgeApproxCache, face::FaceApprox, Approx, Tolerance};
 

crates/fj-core/src/algorithms/approx/sketch.rs

@@ -2,7 +2,7 @@
 
 use std::collections::BTreeSet;
 
-use crate::{objects::Sketch, Core};
+use crate::{topology::Sketch, Core};
 
 use super::{edge::HalfEdgeApproxCache, face::FaceApprox, Approx, Tolerance};
 

crates/fj-core/src/algorithms/approx/solid.rs

@@ -2,7 +2,7 @@
 
 use std::collections::BTreeSet;
 
-use crate::{objects::Solid, Core};
+use crate::{topology::Solid, Core};
 
 use super::{edge::HalfEdgeApproxCache, face::FaceApprox, Approx, Tolerance};
 

crates/fj-core/src/algorithms/approx/vertex.rs

@@ -4,7 +4,7 @@ use std::collections::BTreeMap;
 
 use fj_math::Point;
 
-use crate::{objects::Vertex, storage::Handle};
+use crate::{storage::Handle, topology::Vertex};
 
 /// Cache for vertex approximations
 #[derive(Default)]

crates/fj-core/src/algorithms/bounding_volume/cycle.rs

@@ -1,6 +1,6 @@
 use fj_math::Aabb;
 
-use crate::{geometry::Geometry, objects::Cycle};
+use crate::{geometry::Geometry, topology::Cycle};
 
 impl super::BoundingVolume<2> for Cycle {
     fn aabb(&self, geometry: &Geometry) -> Option<Aabb<2>> {

crates/fj-core/src/algorithms/bounding_volume/edge.rs

@@ -2,8 +2,8 @@ use fj_math::{Aabb, Vector};
 
 use crate::{
     geometry::{Geometry, SurfacePath},
-    objects::HalfEdge,
     storage::Handle,
+    topology::HalfEdge,
 };
 
 impl super::BoundingVolume<2> for Handle<HalfEdge> {

crates/fj-core/src/algorithms/bounding_volume/face.rs

@@ -2,7 +2,7 @@ use fj_math::Aabb;
 
 use crate::{
     geometry::{Geometry, GlobalPath},
-    objects::Face,
+    topology::Face,
 };
 
 impl super::BoundingVolume<3> for Face {

crates/fj-core/src/algorithms/bounding_volume/shell.rs

@@ -1,6 +1,6 @@
 use fj_math::Aabb;
 
-use crate::{geometry::Geometry, objects::Shell};
+use crate::{geometry::Geometry, topology::Shell};
 
 impl super::BoundingVolume<3> for Shell {
     fn aabb(&self, geometry: &Geometry) -> Option<Aabb<3>> {

crates/fj-core/src/algorithms/bounding_volume/solid.rs

@@ -1,6 +1,6 @@
 use fj_math::Aabb;
 
-use crate::{geometry::Geometry, objects::Solid};
+use crate::{geometry::Geometry, topology::Solid};
 
 impl super::BoundingVolume<3> for Solid {
     fn aabb(&self, geometry: &Geometry) -> Option<Aabb<3>> {

crates/fj-core/src/algorithms/triangulate/delaunay.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use fj_math::{Point, Scalar, Triangle, Winding};
 use spade::HasPosition;
 
-use crate::{algorithms::approx::cycle::CycleApprox, objects::Handedness};
+use crate::{algorithms::approx::cycle::CycleApprox, topology::Handedness};
 
 /// Create a Delaunay triangulation of all points
 pub fn triangulate(

crates/fj-core/src/algorithms/triangulate/mod.rs

@@ -85,11 +85,11 @@ mod tests {
 
     use crate::{
         algorithms::approx::{Approx, Tolerance},
-        objects::{Cycle, Face},
         operations::{
             build::{BuildCycle, BuildFace},
             update::{UpdateFace, UpdateRegion},
         },
+        topology::{Cycle, Face},
         Core,
     };
 
@@ -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| {

crates/fj-core/src/geometry/boundary.rs

@@ -5,7 +5,7 @@ use std::{
 
 use fj_math::Point;
 
-use crate::{objects::Vertex, storage::Handle};
+use crate::{storage::Handle, topology::Vertex};
 
 /// A boundary on a curve
 ///

crates/fj-core/src/geometry/geometry.rs

@@ -3,8 +3,8 @@ use std::collections::BTreeMap;
 use fj_math::Vector;
 
 use crate::{
-    objects::{HalfEdge, Objects, Surface},
     storage::Handle,
+    topology::{HalfEdge, Surface, Topology},
 };
 
 use super::{GlobalPath, HalfEdgeGeometry, SurfaceGeometry};
@@ -21,14 +21,14 @@ pub struct Geometry {
 
 impl Geometry {
     /// Create a new instance of `Geometry`
-    pub fn new(objects: &Objects) -> Self {
+    pub fn new(topology: &Topology) -> Self {
         let mut self_ = Self {
             half_edge: BTreeMap::new(),
             surface: BTreeMap::new(),
 
-            xy_plane: objects.surfaces.xy_plane(),
-            xz_plane: objects.surfaces.xz_plane(),
-            yz_plane: objects.surfaces.yz_plane(),
+            xy_plane: topology.surfaces.xy_plane(),
+            xz_plane: topology.surfaces.xz_plane(),
+            yz_plane: topology.surfaces.yz_plane(),
         };
 
         self_.define_surface_inner(

crates/fj-core/src/layers/geometry.rs

@@ -2,8 +2,8 @@
 
 use crate::{
     geometry::{Geometry, HalfEdgeGeometry, SurfaceGeometry},
-    objects::{HalfEdge, Surface},
     storage::Handle,
+    topology::{HalfEdge, Surface},
 };
 
 use super::{Command, Event, Layer};

crates/fj-core/src/layers/layers.rs

@@ -1,7 +1,7 @@
 use crate::{
     geometry::Geometry,
-    objects::Objects,
     presentation::Presentation,
+    topology::Topology,
     validation::{Validation, ValidationConfig},
 };
 
@@ -22,11 +22,10 @@ use super::Layer;
 /// For now, there is no need for this, and all layers are just hardcoded here.
 /// That can be changed, once necessary.
 pub struct Layers {
-    /// The objects layer
+    /// The topology layer
     ///
-    /// Manages the stores of topological and geometric objects that make up
-    /// shapes.
-    pub objects: Layer<Objects>,
+    /// Manages the stores of topological objects.
+    pub topology: Layer<Topology>,
 
     /// The geometry layer
     ///
@@ -47,11 +46,11 @@ pub struct Layers {
 impl Layers {
     /// Construct an instance of `Layers`
     pub fn new() -> Self {
-        let objects = Objects::new();
-        let geometry = Geometry::new(&objects);
+        let topology = Topology::new();
+        let geometry = Geometry::new(&topology);
 
         Self {
-            objects: Layer::new(objects),
+            topology: Layer::new(topology),
             geometry: Layer::new(geometry),
             validation: Layer::default(),
             presentation: Layer::default(),

crates/fj-core/src/layers/mod.rs

@@ -3,8 +3,8 @@
 //! See [`Layers`].
 
 pub mod geometry;
-pub mod objects;
 pub mod presentation;
+pub mod topology;
 pub mod validation;
 
 mod layer;

crates/fj-core/src/layers/presentation.rs

@@ -3,9 +3,9 @@
 use fj_interop::Color;
 
 use crate::{
-    objects::{AnyObject, Region, Stored},
     presentation::Presentation,
     storage::Handle,
+    topology::{AnyObject, Region, Stored},
 };
 
 use super::{Command, Event, Layer};

crates/fj-core/src/layers/objects.rs → crates/fj-core/src/layers/topology.rs

@@ -1,14 +1,14 @@
-//! Layer infrastructure for [`Objects`]
+//! Layer infrastructure for [`Topology`]
 
 use crate::{
     geometry::Geometry,
-    objects::{AboutToBeStored, AnyObject, Objects},
+    topology::{AboutToBeStored, AnyObject, Topology},
     validation::Validation,
 };
 
 use super::{validation::ValidateObject, Command, Event, Layer};
 
-impl Layer<Objects> {
+impl Layer<Topology> {
     /// Insert an object into the stores
     ///
     /// Passes any events produced to the validation layer.
@@ -38,17 +38,17 @@ pub struct InsertObject {
     pub object: AnyObject<AboutToBeStored>,
 }
 
-impl Command<Objects> for InsertObject {
+impl Command<Topology> for InsertObject {
     type Result = ();
     type Event = InsertObject;
 
-    fn decide(self, _: &Objects, events: &mut Vec<Self::Event>) {
+    fn decide(self, _: &Topology, events: &mut Vec<Self::Event>) {
         events.push(self);
     }
 }
 
-impl Event<Objects> for InsertObject {
-    fn evolve(&self, state: &mut Objects) {
+impl Event<Topology> for InsertObject {
+    fn evolve(&self, state: &mut Topology) {
         self.object.clone().insert(state);
     }
 }

crates/fj-core/src/layers/validation.rs

@@ -2,7 +2,7 @@
 
 use crate::{
     geometry::Geometry,
-    objects::{AnyObject, Stored},
+    topology::{AnyObject, Stored},
     validation::{Validation, ValidationError, ValidationErrors},
 };
 

crates/fj-core/src/lib.rs

@@ -84,11 +84,11 @@
 pub mod algorithms;
 pub mod geometry;
 pub mod layers;
-pub mod objects;
 pub mod operations;
 pub mod presentation;
 pub mod queries;
 pub mod storage;
+pub mod topology;
 pub mod validate;
 pub mod validation;
 

crates/fj-core/src/operations/build/cycle.rs

@@ -2,8 +2,8 @@ use fj_math::{Point, Scalar};
 use itertools::Itertools;
 
 use crate::{
-    objects::{Cycle, HalfEdge},
     operations::{build::BuildHalfEdge, update::UpdateCycle},
+    topology::{Cycle, HalfEdge},
     Core,
 };
 

crates/fj-core/src/operations/build/face.rs

@@ -4,12 +4,12 @@ use fj_interop::ext::ArrayExt;
 use fj_math::{Point, Scalar};
 
 use crate::{
-    objects::{Cycle, Face, HalfEdge, Region, Surface, Vertex},
     operations::{
         build::{BuildCycle, BuildRegion, BuildSurface},
         insert::{Insert, IsInserted, IsInsertedNo},
     },
     storage::Handle,
+    topology::{Cycle, Face, HalfEdge, Region, Surface, Vertex},
     Core,
 };
 

crates/fj-core/src/operations/build/half_edge.rs

@@ -3,9 +3,9 @@ use fj_math::{Arc, Point, Scalar};
 
 use crate::{
     geometry::{HalfEdgeGeometry, SurfacePath},
-    objects::{Curve, HalfEdge, Vertex},
     operations::{geometry::UpdateHalfEdgeGeometry, insert::Insert},
     storage::Handle,
+    topology::{Curve, HalfEdge, Vertex},
     Core,
 };
 

crates/fj-core/src/operations/build/region.rs

@@ -1,8 +1,8 @@
 use fj_math::{Point, Scalar};
 
 use crate::{
-    objects::{Cycle, Region},
     operations::{build::BuildCycle, insert::Insert},
+    topology::{Cycle, Region},
     Core,
 };