commit 45a8fc6a8b00451f807783f2a6ec640e9bcc7256
author caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 14 15:29:11 2013 +0000
committer caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Feb 14 15:29:11 2013 +0000
tree bf483ee177b764a83768534293b9542a5a0c036e
parent 3976825a21532e254311b90b4a9046e25717e335

shape ops work in progress

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

experimental/Intersection/op.htm

diff --git a/experimental/Intersection/op.htm b/experimental/Intersection/op.htm
index 5454fdc..c3ae3c5 100644
--- a/experimental/Intersection/op.htm
+++ b/experimental/Intersection/op.htm
@@ -300,6 +300,17 @@
     testSimplifyx(path);
 </div>
 
+<div id="testLine5">
+    path.moveTo(3,0);
+    path.lineTo(6,2);
+    path.lineTo(0,2);
+    path.close();
+    path.moveTo(3,0);
+    path.lineTo(6,2);
+    path.lineTo(0,2);
+    path.close();
+</div>
+
 <div id="testLine6">
     SkPath path, simple;
     path.moveTo(0,0);
@@ -3405,11 +3416,139 @@
     pathB.close();
 </div>
 
+<div id="cubicOp8d">
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(0,1);
+    path.cubicTo(0,5, 1,0, 4,0);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(0,1);
+    pathB.cubicTo(0,4, 1,0, 5,0);
+    pathB.close();
+</div>
+
+<div id="cubicOp9d">
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(0,1);
+    path.cubicTo(1,6, 1,0, 2,1);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(0,1);
+    pathB.cubicTo(1,2, 1,0, 6,1);
+    pathB.close();
+</div>
+
+<div id="quadOp9d">
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(0,1);
+    path.quadTo(1,6, 1.5f,1);
+    path.quadTo(1.5f,0.8f, 2,1);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(0,1);
+    pathB.quadTo(1,2, 1.4f,1);
+    pathB.quadTo(3,0.4f, 6,1);
+    pathB.close();
+</div>
+
+<div id="lineOp9d">
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(0,1);
+    path.lineTo(1,6);
+    path.lineTo(1.5f,1);
+    path.lineTo(1.8f,0.8f);
+    path.lineTo(2,1);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(0,1);
+    pathB.lineTo(1,2);
+    pathB.lineTo(1.4f,1);
+    pathB.lineTo(3,0.4f);
+    pathB.lineTo(6,1);
+    pathB.close();
+</div>
+
+<div id="cubicOp1i">
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(0,1);
+    path.cubicTo(1,2, 1,0, 2,1);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(0,1);
+    pathB.cubicTo(1,2, 1,0, 2,1);
+    pathB.close();
+</div>
+
+<div id="cubicOp10d">
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(0,1);
+    path.cubicTo(1,3, 1,0, 4,1);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(0,1);
+    pathB.cubicTo(1,4, 1,0, 3,1);
+    pathB.close();
+</div>
+
+<div id="cubicOp11d">
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(0,1);
+    path.cubicTo(3,4, 1,0, 5,1);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(0,1);
+    pathB.cubicTo(1,5, 1,0, 4,3);
+    pathB.close();
+</div>
+
+<div id="cubicOp12d">
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(0,1);
+    path.cubicTo(1,6, 1,0, 1,0);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(0,1);
+    pathB.cubicTo(0,1, 1,0, 6,1);
+    pathB.close();
+</div>
+
+<div id="cubicOp13d">
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(0,1);
+    path.cubicTo(4,5, 1,0, 5,3);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(0,1);
+    pathB.cubicTo(3,5, 1,0, 5,4);
+    pathB.close();
+</div>
+
+<div id="cubicOp14d">
+    path.setFillType(SkPath::kWinding_FillType);
+    path.moveTo(0,1);
+    path.cubicTo(0,2, 2,0, 2,1);
+    path.close();
+    pathB.setFillType(SkPath::kWinding_FillType);
+    pathB.moveTo(0,2);
+    pathB.cubicTo(1,2, 1,0, 2,0);
+    pathB.close();
+</div>
+
 </div>
 
 <script type="text/javascript">
 
 var testDivs = [
+    cubicOp14d,
+    cubicOp13d,
+    cubicOp12d,
+    cubicOp11d,
+    cubicOp10d,
+    cubicOp1i,
+    lineOp9d,
+    quadOp9d,
+    cubicOp9d,
+    cubicOp8d,
     cubicOp7d,
     cubicOp6d,
     cubicOp5d,
@@ -3644,6 +3783,8 @@
     testLine9,
     testLine7b,
     testLine7,
+    testLine6,
+    testLine5,
     testSimplifyQuadratic21,
     testSimplifyQuadratic20,
     testSimplifyQuadratic19,