commit f839c0359c308fd06895d9f73fc12c4f3869e399
author caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 26 21:03:50 2012 +0000
committer caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Oct 26 21:03:50 2012 +0000
tree 0c5821437bb8d2eefc6a2e7f9c476b1b865f783f
parent 0c5f3762e863411798b1d6c55157d24c69d5bc25

shape ops work in progress

git-svn-id: http://skia.googlecode.com/svn/trunk@6159 2bbb7eff-a529-9590-31e7-b0007b416f81

experimental/Intersection/ShapeOps.cpp

diff --git a/experimental/Intersection/ShapeOps.cpp b/experimental/Intersection/ShapeOps.cpp
index 4785e86..669fa6d 100644
--- a/experimental/Intersection/ShapeOps.cpp
+++ b/experimental/Intersection/ShapeOps.cpp
@@ -17,8 +17,9 @@
 }
 
 static void bridgeOp(SkTDArray<Contour*>& contourList, const ShapeOp op,
-        const int aXorMask, const int bXorMask, SkPath& simple) {
+        const int aXorMask, const int bXorMask, PathWrapper& simple) {
     bool firstContour = true;
+    SkPoint topLeft = {SK_ScalarMin, SK_ScalarMin};
     do {
 
 #if SORTABLE_CONTOURS // old way
@@ -32,7 +33,7 @@
         Segment* current = topStart->findTop(index, endIndex);
 #else // new way: iterate while top is unsortable
         int index, endIndex;
-        Segment* current = findSortableTop(contourList, index, endIndex);
+        Segment* current = findSortableTop(contourList, index, endIndex, topLeft);
         if (!current) {
             break;
         }
@@ -68,7 +69,7 @@
             SkDebugf("%s contourWinding=%d\n", __FUNCTION__, contourWinding);
 #endif
         }
-        SkPoint lastPt;
+    //    SkPoint lastPt;
         int winding = contourWinding;
         int spanWinding = current->spanSign(index, endIndex);
         int oppWinding = current->oppSign(index, endIndex);
@@ -81,7 +82,7 @@
                     __FUNCTION__, active ? "true" : "false",
                     winding, spanWinding);
         #endif
-            const SkPoint* firstPt = NULL;
+        //    const SkPoint* firstPt = NULL;
             do {
                 SkASSERT(!current->done());
                 int nextStart = index;
@@ -93,21 +94,23 @@
                     // FIXME: if unsortable, allow partial paths to be later
                     // assembled
                     SkASSERT(!unsortable);
-                    if (active && firstPt && current->verb() != SkPath::kLine_Verb && *firstPt != lastPt) {
-                        lastPt = current->addCurveTo(index, endIndex, simple, true);
-                        SkASSERT(*firstPt == lastPt);
+                    if (active && simple.hasMove()
+                            && current->verb() != SkPath::kLine_Verb
+                            && !simple.isClosed()) {
+                       /* lastPt = */ current->addCurveTo(index, endIndex, simple, true);
+                        SkASSERT(simple.isClosed());
                     }
                     break;
                 }
-                if (!firstPt) {
-                    firstPt = &current->addMoveTo(index, simple, active);
-                }
-                lastPt = current->addCurveTo(index, endIndex, simple, active);
+         //       if (!firstPt) {
+         //           firstPt = &current->addMoveTo(index, simple, active);
+         //       }
+                /* lastPt = */ current->addCurveTo(index, endIndex, simple, active);
                 current = next;
                 index = nextStart;
                 endIndex = nextEnd;
-            } while (*firstPt != lastPt && (active || !current->done()));
-            if (firstPt && active) {
+            } while (!simple.isClosed() && (active || !current->done()));
+            if (simple.hasMove() && active) {
         #if DEBUG_PATH_CONSTRUCTION
                 SkDebugf("%s close\n", __FUNCTION__);
         #endif
@@ -175,5 +178,6 @@
     coincidenceCheck(contourList);
     fixOtherTIndex(contourList);
     // construct closed contours
-    bridgeOp(contourList, op, aXorMask, bXorMask, result);
+    Op::PathWrapper wrapper(result);
+    bridgeOp(contourList, op, aXorMask, bXorMask, wrapper);
 }