shape ops work in progress
git-svn-id: http://skia.googlecode.com/svn/trunk@7758 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/Intersection/qc.htm b/experimental/Intersection/qc.htm
index 861bdc0..f22921a 100644
--- a/experimental/Intersection/qc.htm
+++ b/experimental/Intersection/qc.htm
@@ -1977,11 +1977,34 @@
{{x = 0, y = 1}, {x = 1.9274705288631189e-19, y = 1.0000000000000002}, {x = 0.0017190297609673323, y = 0.99828097023903239}, {x = 0.0053709083094631276, y = 0.99505672974365911}}
</div>
+<div id="cubicOp16d">
+{{0,2},{0,1},{3,0},{1,0}},
+{{0,3},{0,1},{2,0},{1,0}},
+
+ {{0,2}, {0.0229970175,1.6585632}, {0.366509308,1.33437416}},
+ {{0.366509308,1.33437416}, {0.710021598,1.01018513}, {1.09808495,0.737739381}},
+ {{1.09808495,0.737739381}, {1.40607875,0.517813127}, {1.57937247,0.352342403}},
+ {{1.57937247,0.352342403}, {1.75266619,0.186871679}, {1.64451042,0.0942001592}},
+ {{1.64451042,0.0942001592}, {1.53635465,0.00152863961}, {1,0}},
+
+ {{0,3}, {0.0263932023,2.17082039}, {0.352786405,1.57082039}},
+ {{0.352786405,1.57082039}, {0.679179607,0.970820393}, {0.988854382,0.6}},
+ {{0.988854382,0.6}, {1.23200941,0.3}, {1.27672209,0.15}},
+ {{1.27672209,0.15}, {1.32143477,9.25185854e-17}, {1,0}},
+</div>
+
+<div id="quadOp16d">
+ {{1.64451042,0.0942001592}, {1.53635465,0.00152863961}, {1,0}},
+ {{1.27672209,0.15}, {1.32143477,9.25185854e-17}, {1,0}},
+</div>
+
</div>
<script type="text/javascript">
var testDivs = [
+ quadOp16d,
+ cubicOp16d,
cubicTest7,
cubicTest6,
cubicTest5,
@@ -2253,7 +2276,7 @@
var curveStrs = test.split("{{");
if (curveStrs.length == 1)
curveStrs = test.split("=(");
- var pattern = /[a-z$=]?-?\d+\.*\d*/g;
+ var pattern = /[a-z$=]?-?\d+\.*\d*e?-?\d*/g;
var curves = [];
for (var c in curveStrs) {
var curveStr = curveStrs[c];