From 4be11abd3cc2250f63e1423dc83a93d3becd3e62 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Wed, 23 Feb 2022 17:53:01 +0100
Subject: [PATCH 1/3] Add `Approximation::for_face`

---
 src/kernel/approximation.rs | 89 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 87 insertions(+), 2 deletions(-)

diff --git a/src/kernel/approximation.rs b/src/kernel/approximation.rs
index e65014b16..bca9045b8 100644
--- a/src/kernel/approximation.rs
+++ b/src/kernel/approximation.rs
@@ -2,7 +2,10 @@ use std::collections::HashSet;
 
 use crate::math::{Point, Scalar, Segment};
 
-use super::topology::edges::{Cycle, Edge, Edges};
+use super::topology::{
+    edges::{Cycle, Edge, Edges},
+    faces::Face,
+};
 
 /// An approximation of an edge, multiple edges, or a face
 #[derive(Debug, PartialEq)]
@@ -106,6 +109,36 @@ impl Approximation {
 
         Self { points, segments }
     }
+
+    /// Compute an approximation for a face
+    ///
+    /// `tolerance` defines how far the approximation is allowed to deviate from
+    /// the actual edges.
+    #[allow(unused)]
+    pub fn for_face(face: &Face, tolerance: Scalar) -> Self {
+        // Curved faces whose curvature is not fully defined by their edges
+        // are not supported yet. For that reason, we can fully ignore `face`'s
+        // `surface` field and just pass the edges to `Self::for_edges`.
+        //
+        // An example of a curved face that is supported, is the cylinder. Its
+        // curvature is fully defined be the edges (circles) that border it. The
+        // circle approximations are sufficient to triangulate the surface.
+        //
+        // An example of a curved face that is currently not supported, and thus
+        // doesn't need to be handled here, is a sphere. A spherical face would
+        // would need to provide its own approximation, as the edges that bound
+        // it have nothing to do with its curvature.
+        match face {
+            Face::Face { surface: _, edges } => {
+                Self::for_edges(edges, tolerance)
+            }
+            _ => {
+                // No code that still uses triangle representation calls this
+                // method.
+                unreachable!()
+            }
+        }
+    }
 }
 
 #[cfg(test)]
@@ -116,9 +149,10 @@ mod tests {
 
     use crate::{
         kernel::{
-            geometry::Curve,
+            geometry::{Curve, Surface},
             topology::{
                 edges::{Cycle, Edge, Edges},
+                faces::Face,
                 vertices::Vertex,
             },
         },
@@ -253,4 +287,55 @@ mod tests {
             }
         );
     }
+
+    #[test]
+    fn for_face_closed() {
+        // Test a closed face, i.e. one that is completely encircled by edges.
+
+        let tolerance = Scalar::ONE;
+
+        let a = Point::from([1., 2., 3.]);
+        let b = Point::from([2., 3., 5.]);
+        let c = Point::from([3., 5., 8.]);
+        let d = Point::from([5., 8., 13.]);
+
+        let v1 = Vertex::create_at(a);
+        let v2 = Vertex::create_at(b);
+        let v3 = Vertex::create_at(c);
+        let v4 = Vertex::create_at(d);
+
+        let curve = Curve::Mock {
+            approx: Vec::new(),
+            coords: RefCell::new(vec![Point::from([0.]), Point::from([1.])]),
+        };
+
+        let ab = Edge::new(curve.clone(), Some([v1, v2]));
+        let bc = Edge::new(curve.clone(), Some([v2, v3]));
+        let cd = Edge::new(curve.clone(), Some([v3, v4]));
+        let da = Edge::new(curve.clone(), Some([v4, v1]));
+
+        let abcd = Cycle {
+            edges: vec![ab, bc, cd, da],
+        };
+
+        let edges = Edges { cycles: vec![abcd] };
+
+        let face = Face::Face {
+            surface: Surface::x_y_plane(),
+            edges,
+        };
+
+        assert_eq!(
+            Approximation::for_face(&face, tolerance),
+            Approximation {
+                points: set![a, b, c, d],
+                segments: set![
+                    Segment::from([a, b]),
+                    Segment::from([b, c]),
+                    Segment::from([c, d]),
+                    Segment::from([d, a]),
+                ],
+            }
+        );
+    }
 }

From 1f5a6c5887ee806dcbde39c683c888074a942b49 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Wed, 23 Feb 2022 17:55:16 +0100
Subject: [PATCH 2/3] Make use of `Approximation::for_face`

---
 src/kernel/topology/faces.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/kernel/topology/faces.rs b/src/kernel/topology/faces.rs
index c18e98b6b..0b77f4a25 100644
--- a/src/kernel/topology/faces.rs
+++ b/src/kernel/topology/faces.rs
@@ -102,8 +102,8 @@ impl Face {
         debug_info: &mut DebugInfo,
     ) {
         match self {
-            Self::Face { edges, surface } => {
-                let approx = Approximation::for_edges(edges, tolerance);
+            Self::Face { surface, .. } => {
+                let approx = Approximation::for_face(self, tolerance);
 
                 let points: Vec<_> = approx
                     .points

From 991817dde53f9ac70cfafc3e4b406fc9a21a4817 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hanno@braun-odw.eu>
Date: Wed, 23 Feb 2022 17:55:44 +0100
Subject: [PATCH 3/3] Un-suppress warning

---
 src/kernel/approximation.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/kernel/approximation.rs b/src/kernel/approximation.rs
index bca9045b8..fa8731ccf 100644
--- a/src/kernel/approximation.rs
+++ b/src/kernel/approximation.rs
@@ -114,7 +114,6 @@ impl Approximation {
     ///
     /// `tolerance` defines how far the approximation is allowed to deviate from
     /// the actual edges.
-    #[allow(unused)]
     pub fn for_face(face: &Face, tolerance: Scalar) -> Self {
         // Curved faces whose curvature is not fully defined by their edges
         // are not supported yet. For that reason, we can fully ignore `face`'s