Merge pull request #1794 from hannobraun/operations

Make some cleanups in operations API
hannobraun · Apr 26, 2023 · d9d954a · d9d954a
2 parents b69b144 + d8348d0
commit d9d954a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 27 deletions.
diff --git a/crates/fj-kernel/src/operations/build/shell.rs b/crates/fj-kernel/src/operations/build/shell.rs
@@ -35,47 +35,46 @@ pub trait BuildShell {
     ) -> Tetrahedron {
         let [a, b, c, d] = points.map(Into::into);
 
-        let face_abc = Face::triangle([a, b, c], objects).face;
-        let face_bad =
+        let abc = Face::triangle([a, b, c], objects).face;
+        let bad =
             Face::triangle([b, a, d], objects)
                 .face
                 .update_exterior(|cycle| {
                     cycle
-                        .join_to(face_abc.exterior(), 0..=0, 0..=0, objects)
+                        .join_to(abc.exterior(), 0..=0, 0..=0, objects)
                         .insert(objects)
                 });
-        let face_dac =
+        let dac =
             Face::triangle([d, a, c], objects)
                 .face
                 .update_exterior(|cycle| {
                     cycle
-                        .join_to(face_abc.exterior(), 1..=1, 2..=2, objects)
-                        .join_to(face_bad.exterior(), 0..=0, 1..=1, objects)
+                        .join_to(abc.exterior(), 1..=1, 2..=2, objects)
+                        .join_to(bad.exterior(), 0..=0, 1..=1, objects)
                         .insert(objects)
                 });
-        let face_cbd =
+        let cbd =
             Face::triangle([c, b, d], objects)
                 .face
                 .update_exterior(|cycle| {
                     cycle
-                        .join_to(face_abc.exterior(), 0..=0, 1..=1, objects)
-                        .join_to(face_bad.exterior(), 1..=1, 2..=2, objects)
-                        .join_to(face_dac.exterior(), 2..=2, 2..=2, objects)
+                        .join_to(abc.exterior(), 0..=0, 1..=1, objects)
+                        .join_to(bad.exterior(), 1..=1, 2..=2, objects)
+                        .join_to(dac.exterior(), 2..=2, 2..=2, objects)
                         .insert(objects)
                 });
 
-        let faces = [face_abc, face_bad, face_dac, face_cbd]
-            .map(|face| face.insert(objects));
+        let faces = [abc, bad, dac, cbd].map(|face| face.insert(objects));
         let shell = Shell::new(faces.clone());
 
-        let [face_abc, face_bad, face_dac, face_cbd] = faces;
+        let [abc, bad, dac, cbd] = faces;
 
         Tetrahedron {
             shell,
-            face_abc,
-            face_bad,
-            face_dac,
-            face_cbd,
+            abc,
+            bad,
+            dac,
+            cbd,
         }
     }
 }
@@ -94,14 +93,14 @@ pub struct Tetrahedron {
     pub shell: Shell,
 
     /// The face formed by the points `a`, `b`, and `c`.
-    pub face_abc: Handle<Face>,
+    pub abc: Handle<Face>,
 
     /// The face formed by the points `b`, `a`, and `d`.
-    pub face_bad: Handle<Face>,
+    pub bad: Handle<Face>,
 
     /// The face formed by the points `d`, `a`, and `c`.
-    pub face_dac: Handle<Face>,
+    pub dac: Handle<Face>,
 
     /// The face formed by the points `c`, `b`, and `d`.
-    pub face_cbd: Handle<Face>,
+    pub cbd: Handle<Face>,
 }
diff --git a/crates/fj-kernel/src/operations/update/cycle.rs b/crates/fj-kernel/src/operations/update/cycle.rs
@@ -22,11 +22,11 @@ pub trait UpdateCycle {
         replacement: Handle<HalfEdge>,
     ) -> Cycle;
 
-    /// Replace the half-edge at the given index
+    /// Update the half-edge at the given index
     ///
     /// # Panics
     ///
-    /// Panics, unless this operation replaces exactly one half-edge.
+    /// Panics, unless this operation updates exactly one half-edge.
     fn update_nth_half_edge(
         &self,
         index: usize,

diff --git a/crates/fj-kernel/src/operations/update/face.rs b/crates/fj-kernel/src/operations/update/face.rs
@@ -9,14 +9,14 @@ pub trait UpdateFace {
     fn update_exterior(
         &self,
         f: impl FnOnce(&Handle<Cycle>) -> Handle<Cycle>,
-    ) -> Face;
+    ) -> Self;
 }
 
 impl UpdateFace for Face {
     fn update_exterior(
         &self,
         f: impl FnOnce(&Handle<Cycle>) -> Handle<Cycle>,
-    ) -> Face {
+    ) -> Self {
         let exterior = f(self.exterior());
 
         Face::new(

diff --git a/crates/fj-kernel/src/validate/shell.rs b/crates/fj-kernel/src/validate/shell.rs
@@ -210,7 +210,7 @@ mod tests {
             [[0., 0., 0.], [0., 1., 0.], [1., 0., 0.], [0., 0., 1.]],
             &mut services.objects,
         );
-        let invalid = valid.shell.update_face(&valid.face_abc, |face| {
+        let invalid = valid.shell.update_face(&valid.abc, |face| {
             face.update_exterior(|cycle| {
                 cycle
                     .update_nth_half_edge(0, |half_edge| {
@@ -243,7 +243,7 @@ mod tests {
             [[0., 0., 0.], [0., 1., 0.], [1., 0., 0.], [0., 0., 1.]],
             &mut services.objects,
         );
-        let invalid = valid.shell.remove_face(&valid.face_abc);
+        let invalid = valid.shell.remove_face(&valid.abc);
 
         valid.shell.validate_and_return_first_error()?;
         assert_contains_err!(