shape ops work in progress
refined line/quad intersection, made more robust
still working on edge cases
git-svn-id: http://skia.googlecode.com/svn/trunk@6017 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/QuadraticImplicit.cpp b/experimental/Intersection/QuadraticImplicit.cpp
index 268d7d3..9960117 100644
--- a/experimental/Intersection/QuadraticImplicit.cpp
+++ b/experimental/Intersection/QuadraticImplicit.cpp
@@ -93,8 +93,7 @@
for (int i1 = 0; i1 < 3; i1 += 2) {
for (int i2 = 0; i2 < 3; i2 += 2) {
if (q1[i1] == q2[i2]) {
- i.insertOne(i1 >> 1, 0);
- i.insertOne(i2 >> 1, 1);
+ i.insert(i1 >> 1, i2 >> 1);
}
}
}
@@ -110,7 +109,6 @@
// if the quads share an end point, check to see if they overlap
if (onlyEndPtsInCommon(q1, q2, i)) {
- assert(i.insertBalanced());
return i.intersected();
}
QuadImplicitForm i1(q1);