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/SkOpAngle.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/SkOpAngle.h')
| -rw-r--r-- | src/pathops/SkOpAngle.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/pathops/SkOpAngle.h b/src/pathops/SkOpAngle.h index 7088dd716f..dba3f3ffac 100644 --- a/src/pathops/SkOpAngle.h +++ b/src/pathops/SkOpAngle.h @@ -42,7 +42,7 @@ struct SkOpAngle { return SkDEBUGRELEASE(fID, -1); } -#if DEBUG_SORT || DEBUG_SWAP_TOP +#if DEBUG_SORT void debugLoop() const; #endif @@ -51,6 +51,7 @@ struct SkOpAngle { #endif const SkOpPtT* debugPtT(int id) const; const SkOpSegment* debugSegment(int id) const; + int debugSign() const; const SkOpSpanBase* debugSpan(int id) const; void debugValidate() const; void debugValidateNext() const; // in debug builds, verify that angle loop is uncorrupted @@ -69,14 +70,12 @@ struct SkOpAngle { bool endsIntersect(SkOpAngle* ); bool endToSide(const SkOpAngle* rh, bool* inside) const; - SkOpAngle* findFirst(); int findSector(SkPath::Verb verb, double x, double y) const; SkOpGlobalState* globalState() const; void insert(SkOpAngle* ); SkOpSpanBase* lastMarked() const; bool loopContains(const SkOpAngle* ) const; int loopCount() const; - bool markStops(); bool merge(SkOpAngle* ); double midT() const; bool midToSide(const SkOpAngle* rh, bool* inside) const; @@ -112,7 +111,6 @@ struct SkOpAngle { void setSector(); void setSpans(); - int sign() const; SkOpSpanBase* start() const { return fStart; @@ -138,7 +136,6 @@ struct SkOpAngle { int8_t fSectorStart; // in 32nds of a circle int8_t fSectorEnd; bool fIsCurve; - bool fStop; // set if ordered angle is greater than the previous bool fUnorderable; bool fUnorderedSweep; // set when a cubic's first control point between the sweep vectors bool fComputeSector; |