shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@4174 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/Simplify.cpp b/experimental/Intersection/Simplify.cpp
index f3c095e..0efe02a 100644
--- a/experimental/Intersection/Simplify.cpp
+++ b/experimental/Intersection/Simplify.cpp
@@ -1063,17 +1063,17 @@
int firstT = 0;
int lastT = 0;
int firstCoinT = 0;
- SkScalar topY = fPts[0].fY;
+ SkPoint topPt = fPts[0];
int count = fTs.count();
int index;
for (index = 1; index < count; ++index) {
const Span& span = fTs[index];
- double t = span.fT;
- SkScalar yIntercept = t == 1 ? fPts[fVerb].fY : yAtT(t);
- if (topY > yIntercept) {
- topY = yIntercept;
+ const SkPoint& intercept = xyAtT(&span);
+ if (topPt.fY > intercept.fY || (topPt.fY == intercept.fY
+ && topPt.fX > intercept.fX)) {
+ topPt = intercept;
firstT = lastT = firstCoinT = index;
- } else if (topY == yIntercept) {
+ } else if (topPt == intercept) {
lastT = index;
if (span.fCoincident) {
firstCoinT = index;