From 5641a9c96e4fd17f213b892d9d7ff7782ec57660 Mon Sep 17 00:00:00 2001
From: Chris Hodapp <hodapp87@gmail.com>
Date: Tue, 12 May 2020 19:02:22 -0400
Subject: [PATCH] Progress with barbs example

---
 src/examples.rs | 27 +++++++++++++++++++++------
 src/lib.rs      |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/examples.rs b/src/examples.rs
index 611065c..7fbf611 100644
--- a/src/examples.rs
+++ b/src/examples.rs
@@ -61,9 +61,15 @@ pub fn barbs() -> Rule<()> {
 
     let incr: Transform = Transform::new().
         translate(0.0, 0.0, 1.0).
-        rotate(&Vector3::z_axis(), 0.1).
+        rotate(&Vector3::z_axis(), 0.15).
+        rotate(&Vector3::x_axis(), 0.1).
         scale(0.95);
 
+    let incr2: Transform = Transform::new().
+        translate(0.0, 0.0, 1.5).
+        rotate(&Vector3::y_axis(), -0.2).
+        scale(0.8);
+
     let b = base_verts.clone();
     let barb = move |self_: Rc<Rule<()>>| -> RuleEval<()> {
         let mut next_verts = b.clone();
@@ -71,8 +77,7 @@ pub fn barbs() -> Rule<()> {
             &mut (0..4).map(|i| VertexUnion::Arg(i)).collect()
         );
 
-
-        let geom = util::parallel_zigzag(next_verts.clone(), b0..b1, a0..a1);
+        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],
@@ -87,13 +92,15 @@ pub fn barbs() -> Rule<()> {
             children: vec![
                 Child {
                     rule: self_.clone(),
-                    xf: incr,
+                    xf: incr2,
                     vmap: (0..n).collect(),
                 }
             ]
         }
     };
 
+    let barb_ = Rc::new(barb);
+
     let b = base_verts.clone();
     let main = move |self_: Rc<Rule<()>>| -> RuleEval<()> {
         let mut next_verts = b.clone();
@@ -119,8 +126,16 @@ pub fn barbs() -> Rule<()> {
                     rule: self_.clone(),
                     xf: incr,
                     vmap: (0..n).collect(),
-                }
-            ]
+                },
+                Child {
+                    rule:  Rc::new(Rule { eval: barb_.clone(), ctxt: () }),
+                    xf: Transform::new().
+                        translate(0.0, 0.0, 1.4).
+                        rotate(&Vector3::y_axis(), -std::f32::consts::FRAC_PI_2).
+                        scale(0.9),
+                    vmap: vec![b0, b0 + 1, a0 + 1, a0],
+                },
+            ],
         }
     };
 
diff --git a/src/lib.rs b/src/lib.rs
index 6ff56dc..0c3c2d8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -74,7 +74,7 @@ mod tests {
     */
 
     #[test]
-    fn barbs() { run_test(examples::barbs(), 20, "barbs", false); }
+    fn barbs() { run_test(examples::barbs(), 60, "barbs", false); }
 
     /*
     #[test]