From a6449a2b94c34905f32633a6a0e5ae565b1afc45 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Wed, 13 May 2020 12:23:24 -0400
Subject: [PATCH] Finally closed off geometry in 'barbs' example

---
 src/examples.rs | 26 ++++++++++----------------
 src/lib.rs      |  2 +-
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/examples.rs b/src/examples.rs
index f6448b6..28ada6b 100644
--- a/src/examples.rs
+++ b/src/examples.rs
@@ -72,17 +72,14 @@ pub fn barbs() -> Rule<()> {
         );
 
         let geom = util::parallel_zigzag(next_verts.clone(), b0..b1+1, a0..a1);
-        /*let (vc, faces) = util::connect_convex(&next_verts, true);
-        let final_geom = Rc::new(OpenMesh {
-            verts: vec![vc],
-            alias_verts: vec![],
-            faces: faces,
-        });
-         */
+        let final_geom = MeshFunc {
+            verts: (0..4).map(|i| VertexUnion::Arg(i)).collect(),
+            faces: vec![ 0, 2, 1,   0, 3, 2 ],
+        };
 
         RuleEval {
             geom: Rc::new(geom.transform(&barb_incr)),
-            final_geom: Rc::new(prim::empty_meshfunc()), // TODO
+            final_geom: Rc::new(final_geom), // no transform needed (no vertices)
             children: vec![
                 Child {
                     rule: self_.clone(),
@@ -118,17 +115,14 @@ pub fn barbs() -> Rule<()> {
             verts: next_verts.clone(),
             faces: vec![],
         };
-        /*
-        let (vc, faces) = util::connect_convex(&next_verts, true);
-        let final_geom = Rc::new(MeshFunc {
-            verts: vec![vc],
-            faces: faces,
-        });
-         */
+        let final_geom = MeshFunc {
+            verts: (0..4).map(|i| VertexUnion::Arg(i)).collect(),
+            faces: vec![ 0, 2, 1,   0, 3, 2 ],
+        };
 
         RuleEval {
             geom: Rc::new(geom),
-            final_geom: Rc::new(prim::empty_meshfunc()), // TODO
+            final_geom: Rc::new(final_geom),
             children: vec![
                 Child {
                     rule: self_.clone(),
diff --git a/src/lib.rs b/src/lib.rs
index cb0f1ca..461e7a0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -74,7 +74,7 @@ mod tests {
     */
 
     #[test]
-    fn barbs() { run_test(examples::barbs(), 50, "barbs", false); }
+    fn barbs() { run_test(examples::barbs(), 80, "barbs", false); }
 
     /*
     #[test]