Merge pull request #2327 from hannobraun/geometry

Create curve geometry update API

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

@@ -1,6 +1,6 @@
 use crate::{
-    geometry::{CurveGeom, SurfacePath},
-    operations::insert::Insert,
+    geometry::SurfacePath,
+    operations::{geometry::UpdateCurveGeometry, insert::Insert},
     storage::Handle,
     topology::{Curve, Surface},
     Core,
@@ -18,14 +18,11 @@ pub trait BuildCurve {
         surface: Handle<Surface>,
         core: &mut Core,
     ) -> Handle<Curve> {
-        let curve = Curve::new().insert(core);
-
-        core.layers.geometry.define_curve(
-            curve.clone(),
-            CurveGeom::from_path_and_surface(path, surface),
-        );
-
-        curve
+        Curve::new().insert(core).make_path_on_surface(
+            path,
+            surface,
+            &mut core.layers.geometry,
+        )
     }
 }
 

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

@@ -0,0 +1,33 @@
+use crate::{
+    geometry::{CurveGeom, Geometry, SurfacePath},
+    layers::Layer,
+    storage::Handle,
+    topology::{Curve, Surface},
+};
+
+/// Update the geometry of a [`Curve`]
+pub trait UpdateCurveGeometry {
+    /// Define the geometry as a path on a surface
+    fn make_path_on_surface(
+        self,
+        path: SurfacePath,
+        surface: Handle<Surface>,
+        geometry: &mut Layer<Geometry>,
+    ) -> Self;
+}
+
+impl UpdateCurveGeometry for Handle<Curve> {
+    fn make_path_on_surface(
+        self,
+        path: SurfacePath,
+        surface: Handle<Surface>,
+        geometry: &mut Layer<Geometry>,
+    ) -> Self {
+        geometry.define_curve(
+            self.clone(),
+            CurveGeom::from_path_and_surface(path, surface),
+        );
+
+        self
+    }
+}

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

@@ -1,5 +1,6 @@
 //! Operations to update the geometry of objects
 
+mod curve;
 mod half_edge;
 
-pub use self::half_edge::UpdateHalfEdgeGeometry;
+pub use self::{curve::UpdateCurveGeometry, half_edge::UpdateHalfEdgeGeometry};