diff options
| author |  caryclark <caryclark@google.com> | 2015-04-20 08:31:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-20 08:31:59 -0700 |
| commit | 1049f1246e7be4ccb68001361efceb8933e6f81c (patch) | |
| tree | 9c71ceb245856cbe2173913eaec3b0ebb490dd74 /src/pathops/SkPathWriter.cpp | |
| parent | 5c476fb2776639bdbf0e974dd38d1c5d4c4ff1aa (diff) | |
Now, path ops natively intersect conics, quads, and cubics in any combination. There are still a class of cubic tests that fail and a handful of undiagnosed failures from skps and fuzz tests, but things are much better overall.
Extended tests (150M+) run to completion in release in about 6 minutes; the standard test suite exceeds 100K and finishes in a few seconds on desktops.
TBR=reed
BUG=skia:3588
Review URL: https://codereview.chromium.org/1037953004
Diffstat (limited to 'src/pathops/SkPathWriter.cpp')
| -rw-r--r-- | src/pathops/SkPathWriter.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/pathops/SkPathWriter.cpp b/src/pathops/SkPathWriter.cpp index 46ec7b9131..bd8c72134c 100644 --- a/src/pathops/SkPathWriter.cpp +++ b/src/pathops/SkPathWriter.cpp @@ -35,6 +35,24 @@ void SkPathWriter::close() { init(); } +void SkPathWriter::conicTo(const SkPoint& pt1, const SkPoint& pt2, SkScalar weight) { + lineTo(); + if (fEmpty && AlmostEqualUlps(fDefer[0], pt1) && AlmostEqualUlps(pt1, pt2)) { + deferredLine(pt2); + return; + } + moveTo(); + fDefer[1] = pt2; + nudge(); + fDefer[0] = fDefer[1]; +#if DEBUG_PATH_CONSTRUCTION + SkDebugf("path.conicTo(%1.9g,%1.9g, %1.9g,%1.9g, %1.9g);\n", + pt1.fX, pt1.fY, fDefer[1].fX, fDefer[1].fY, weight); +#endif + fPathPtr->conicTo(pt1.fX, pt1.fY, fDefer[1].fX, fDefer[1].fY, weight); + fEmpty = false; +} + void SkPathWriter::cubicTo(const SkPoint& pt1, const SkPoint& pt2, const SkPoint& pt3) { lineTo(); if (fEmpty && AlmostEqualUlps(fDefer[0], pt1) && AlmostEqualUlps(pt1, pt2) |