From c2269d916ffa10e162d23bbe6c2b47d06ee4c9c4 Mon Sep 17 00:00:00 2001
From: Holmes Futrell <holmes@gingerlabs.com>
Date: Wed, 28 Nov 2018 13:27:45 -0800
Subject: [PATCH] use even-odd winding rule for most boolean ops (excception is
 crossings removed). Disable some debug logs and more specific handling of
 correcting initial winding value.

---
 BezierKit/Library/AugmentedGraph.swift | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/BezierKit/Library/AugmentedGraph.swift b/BezierKit/Library/AugmentedGraph.swift
index b6509100..ffa2e59b 100644
--- a/BezierKit/Library/AugmentedGraph.swift
+++ b/BezierKit/Library/AugmentedGraph.swift
@@ -132,7 +132,8 @@ internal class PathLinkedListRepresentation {
     }
     
     fileprivate func markEntryExit(_ path: Path, _ nonCrossingComponents: inout [PathComponent], useRelativeWinding: Bool = false) {
-        let fillRule = PathFillRule.winding
+        let fillRule: PathFillRule = useRelativeWinding ? .winding : .evenOdd
+//        let fillRule = PathFillRule.winding
         for i in 0..<lists.count {
             
             // determine winding counts relative to the first vertex
@@ -186,20 +187,19 @@ internal class PathLinkedListRepresentation {
                 
                 let prev = lists[i][0].emitPrevious()
                 let a = prev.compute(0.5)
+                // TODO: 1.0e-5 is a magic number (just an arbitrary small value)
                 let b = a + 1.0e-5 * prev.normal(0.5)
-                let c = a - 1.0e-5 * prev.normal(0.5)
+                //let c = a - 1.0e-5 * prev.normal(0.5)
                 
                 let w1 = path.windingCount(b)
-                let w2 = path.windingCount(c)
+                //let w2 = path.windingCount(c)
                 
-                print("w1 = \(w1)")
-                print("w2 = \(w2)")
+                // print("w1 = \(w1)")
+                // print("w2 = \(w2)")
                 
-                if w1 < initialWinding {
+                if w1 == initialWinding-1 {
                     initialWinding = w1
                 }
-                
-
             }
             else {
                 initialWinding = path.windingCount(lists[i][0].emitPrevious().compute(0.5))