Make radius configuration unconfusing

1 files changed, 21 insertions, 6 deletions

diff --git a/src/geom/sides.rs b/src/geom/sides.rs
index 938539fe..72748916 100644
--- a/src/geom/sides.rs
+++ b/src/geom/sides.rs
@@ -48,17 +48,17 @@ impl<T> Sides<T> {
     /// Zip two instances into an instance.
     pub fn zip<F, V, W>(self, other: Sides<V>, mut f: F) -> Sides<W>
     where
-        F: FnMut(T, V, Side) -> W,
+        F: FnMut(T, V) -> W,
     {
         Sides {
-            left: f(self.left, other.left, Side::Left),
-            top: f(self.top, other.top, Side::Top),
-            right: f(self.right, other.right, Side::Right),
-            bottom: f(self.bottom, other.bottom, Side::Bottom),
+            left: f(self.left, other.left),
+            top: f(self.top, other.top),
+            right: f(self.right, other.right),
+            bottom: f(self.bottom, other.bottom),
         }
     }
 
-    /// An iterator over the sides.
+    /// An iterator over the sides, starting with the left side, clockwise.
     pub fn iter(&self) -> impl Iterator<Item = &T> {
         [&self.left, &self.top, &self.right, &self.bottom].into_iter()
     }
@@ -157,6 +157,21 @@ impl Side {
         }
     }
 
+    /// The first corner of the side in clockwise order.
+    pub fn start_corner(self) -> Corner {
+        match self {
+            Self::Left => Corner::BottomLeft,
+            Self::Top => Corner::TopLeft,
+            Self::Right => Corner::TopRight,
+            Self::Bottom => Corner::BottomRight,
+        }
+    }
+
+    /// The second corner of the side in clockwise order.
+    pub fn end_corner(self) -> Corner {
+        self.next_cw().start_corner()
+    }
+
     /// Return the corresponding axis.
     pub fn axis(self) -> SpecAxis {
         match self {