From d6605c442a60547c2f161839afb0abde0715a49d Mon Sep 17 00:00:00 2001
From: Ivan Mahonin <bh@icystar.com>
Date: Apr 17 2015 20:19:58 +0000
Subject: Implement 'simple' shape initialization (ignore contours directions)


---

diff --git a/mono/Contours/Shape.cs b/mono/Contours/Shape.cs
index 2f2a209..099ea8b 100644
--- a/mono/Contours/Shape.cs
+++ b/mono/Contours/Shape.cs
@@ -464,6 +464,15 @@ namespace Contours {
                 organizeChildContours(c, contour);
         }
         
+        void invertContour(Contour contour) {
+            contour.inverted = !contour.inverted;
+            contour.forward.swapWith(contour.backward);
+            for(Link link = contour.forward.getFirst(); link != null; link.contour.getNextLinear())
+                link.forward = !link.forward;
+            for(Link link = contour.backward.getFirst(); link != null; link.contour.getNextLinear())
+                link.forward = !link.forward;
+        }
+        
         void buildContoursHierarhy(bool simple) {
             // calculate directions of contours
             foreach(Contour contour in contours)
@@ -488,28 +497,31 @@ namespace Contours {
             foreach(Contour c in rootContours)
                 organizeChildContours(c, null);
            
-            // TODO: if simple then invert invisible contours instead of removing
-           
             // remove invisible contours
             for(int i = 0; i < contours.Count; ++i) {
                 bool parentInverted = contours[i].parent == null || contours[i].parent.inverted;
                 if (parentInverted == contours[i].inverted) {
-                    // remove contour
-                    foreach(Contour c in contours[i].childs)
-                        c.parent = contours[i].parent;
-                    List<Contour> parentList = contours[i].parent == null
-                                             ? rootContours
-                                             : contours[i].parent.childs;
-                    parentList.AddRange(contours[i].childs);
-                    
-                    contours[i].parent = null;
-                    contours[i].childs.Clear();
-                    while(!contours[i].forward.empty())
-                        removeLink(contours[i].forward.getFirst());
-                    while(!contours[i].backward.empty())
-                        removeLink(contours[i].backward.getFirst());
-                    
-                    contours.RemoveAt(i--);
+                    if (simple) {
+                        // if simple then invert invisible contours instead of removing
+                        invertContour(contours[i]);
+                    } else {
+                        // remove contour
+                        foreach(Contour c in contours[i].childs)
+                            c.parent = contours[i].parent;
+                        List<Contour> parentList = contours[i].parent == null
+                                                 ? rootContours
+                                                 : contours[i].parent.childs;
+                        parentList.AddRange(contours[i].childs);
+                        
+                        contours[i].parent = null;
+                        contours[i].childs.Clear();
+                        while(!contours[i].forward.empty())
+                            removeLink(contours[i].forward.getFirst());
+                        while(!contours[i].backward.empty())
+                            removeLink(contours[i].backward.getFirst());
+                        
+                        contours.RemoveAt(i--);
+                    }
                 }
             }
 
@@ -537,10 +549,8 @@ namespace Contours {
         }
         
         public void invert() {
-            foreach(Link link in links)
-                link.forward = !link.forward;
             foreach(Contour contour in contours)
-                contour.forward.swapWith(contour.backward);
+                invertContour(contour);
         }
         
         static Shape mix(Shape a, bool invertA, Shape b, bool invertB) {