diff options
| author |  caryclark <caryclark@google.com> | 2015-05-11 07:21:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-11 07:21:28 -0700 |
| commit | 624637cc8ec22c000409704d0b403ac1b81ad4b0 (patch) | |
| tree | 3524a1f5dfb24a5afbe3dd1ebbfb495b8c0a299e /src/pathops/SkPathOpsQuad.h | |
| parent | af2d56d2139cc5597a5a43a4e16acbd8d10e9060 (diff) | |
Path ops formerly found the topmost unprocessed edge and determined its angle sort order to initialize the winding. This never worked correctly with cubics and was flaky with paths consisting mostly of vertical edges.
This replacement shoots axis-aligned rays through all intersecting edges to find the outermost one either horizontally or vertically. The resulting code is smaller and twice as fast.
To support this, most of the horizontal / vertical intersection code was rewritten and standardized, and old code supporting the top-directed winding was deleted.
Contours were pointed to by an SkTDArray. Instead, put them in a linked list, and designate the list head with its own class to ensure that methods that take lists of contours start at the top. This change removed a large percentage of memory allocations used by path ops.
TBR=reed@google.com
BUG=skia:3588
Review URL: https://codereview.chromium.org/1111333002
Diffstat (limited to 'src/pathops/SkPathOpsQuad.h')
| -rw-r--r-- | src/pathops/SkPathOpsQuad.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/pathops/SkPathOpsQuad.h b/src/pathops/SkPathOpsQuad.h index de4ce4baa3..01d4d64dbb 100644 --- a/src/pathops/SkPathOpsQuad.h +++ b/src/pathops/SkPathOpsQuad.h @@ -60,7 +60,6 @@ struct SkDQuad { static int AddValidTs(double s[], int realRoots, double* t); void align(int endIndex, SkDPoint* dstPt) const; SkDQuadPair chopAt(double t) const; - static bool Clockwise(const SkOpCurve& edge, bool* swap); SkDVector dxdyAtT(double t) const; static int FindExtrema(const double src[], double tValue[1]); bool hullIntersects(const SkDQuad& , bool* isLinear) const; @@ -69,7 +68,6 @@ struct SkDQuad { bool isLinear(int startIndex, int endIndex) const; bool monotonicInX() const; bool monotonicInY() const; - double nearestT(const SkDPoint&) const; void otherPts(int oddMan, const SkDPoint* endPt[2]) const; SkDPoint ptAtT(double t) const; static int RootsReal(double A, double B, double C, double t[2]); @@ -88,9 +86,8 @@ struct SkDQuad { quad.set(pts); return quad.subDivide(a, c, t1, t2); } - SkDConic toConic() const; - SkDCubic toCubic() const; + SkDCubic debugToCubic() const; // utilities callable by the user from the debugger when the implementation code is linked in void dump() const; void dumpID(int id) const; |