AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the axis-aligned vector special case to convexity checker

Browse Source 
There are bugs in the other code path that will require more state,
and maintaining this special case in parallel is going to be tricky.

Change-Id: I0083b0aa2af16391504f0993e765faa0f5522502
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/209163
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2019-04-18 12:17:04 -04:00 committed by Skia Commit-Bot
parent 1a668d26f8
commit 14ac42b280
2 changed files with 1 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/SkPath.cpp
View File

@ -2584,7 +2584,6 @@ SkPath::Convexity SkPath::internalGetConvexity() const {
#else #else
static int sign(SkScalar x1, SkScalar x2) { SkASSERT(x1 != x2); return x2 < x1; }
static int sign(SkScalar x) { return x < 0; } static int sign(SkScalar x) { return x < 0; }
#define kValueNeverReturnedBySign 2 #define kValueNeverReturnedBySign 2
@ -2613,10 +2612,6 @@ static bool almost_equal(SkScalar compA, SkScalar compB) {
return aBits < bBits + epsilon && bBits < aBits + epsilon; return aBits < bBits + epsilon && bBits < aBits + epsilon;
} }
static DirChange same_sign(SkScalar curr, SkScalar last, SkScalar prior) {
return sign(curr, last) == sign(last, prior) ? kStraight_DirChange : kBackwards_DirChange;
}
// only valid for a single contour // only valid for a single contour
struct Convexicator { struct Convexicator {
@ -2634,13 +2629,11 @@ struct Convexicator {
fCurrPt = pt; fCurrPt = pt;
if (fPriorPt == fLastPt) { // should only be true for first non-zero vector if (fPriorPt == fLastPt) { // should only be true for first non-zero vector
fFirstPt = pt; fFirstPt = pt;
fCurrAligned = pt.fX == fLastPt.fX || pt.fY == fLastPt.fY;
} else if (!this->addVec()) { } else if (!this->addVec()) {
return false; return false;
} }
fPriorPt = fLastPt; fPriorPt = fLastPt;
fLastPt = fCurrPt; fLastPt = fCurrPt;
fLastAligned = fCurrAligned;
return true; return true;
} }
@ -2694,35 +2687,6 @@ struct Convexicator {
private: private:
DirChange directionChange() { DirChange directionChange() {
// if both vectors are axis-aligned, don't do cross product
fCurrAligned = fCurrPt.fX == fLastPt.fX || fCurrPt.fY == fLastPt.fY;
if (fLastAligned && fCurrAligned) {
bool noYChange = fCurrPt.fY == fLastPt.fY && fLastPt.fY == fPriorPt.fY;
if (fCurrPt.fX == fLastPt.fX && fLastPt.fX == fPriorPt.fX) {
if (noYChange) {
return kStraight_DirChange;
}
return same_sign(fCurrPt.fY, fLastPt.fY, fPriorPt.fY);
}
if (!noYChange) { // must be turn to left or right
bool flip = fCurrPt.fX != fLastPt.fX;
SkASSERT(flip ? fCurrPt.fY == fLastPt.fY &&
fLastPt.fY != fPriorPt.fY && fLastPt.fX == fPriorPt.fX :
fCurrPt.fY != fLastPt.fY &&
fLastPt.fY == fPriorPt.fY && fLastPt.fX != fPriorPt.fX);
bool product = flip ? (fCurrPt.fX > fLastPt.fX) != (fLastPt.fY > fPriorPt.fY) :
(fCurrPt.fY > fLastPt.fY) == (fLastPt.fX > fPriorPt.fX);
SkDEBUGCODE(SkVector lastV = fLastPt - fPriorPt);
SkDEBUGCODE(SkVector curV = fCurrPt - fLastPt);
SkDEBUGCODE(SkScalar crossV = SkPoint::CrossProduct(lastV, curV));
SkDEBUGCODE(int signV = SkScalarSignAsInt(crossV));
SkASSERT(!signV || signV == (product ? 1 : -1));
return product ? kRight_DirChange : kLeft_DirChange;
}
return same_sign(fCurrPt.fX, fLastPt.fX, fPriorPt.fX);
}
// there are no subtractions above this line; axis aligned paths
// are robust and can handle arbitrary values
SkVector lastVec = fLastPt - fPriorPt; SkVector lastVec = fLastPt - fPriorPt;
SkVector curVec = fCurrPt - fLastPt; SkVector curVec = fCurrPt - fLastPt;
SkScalar cross = SkPoint::CrossProduct(lastVec, curVec); SkScalar cross = SkPoint::CrossProduct(lastVec, curVec);
@ -2790,8 +2754,6 @@ private:
SkPathPriv::FirstDirection fFirstDirection { SkPathPriv::kUnknown_FirstDirection }; SkPathPriv::FirstDirection fFirstDirection { SkPathPriv::kUnknown_FirstDirection };
int fReversals { 0 }; int fReversals { 0 };
bool fIsFinite { true }; bool fIsFinite { true };
bool fLastAligned { true };
bool fCurrAligned { true };
}; };
SkPath::Convexity SkPath::internalGetConvexity() const { SkPath::Convexity SkPath::internalGetConvexity() const {

2
tests/PathTest.cpp
View File

@ -3628,7 +3628,7 @@ static void test_rrect_convexity_is_unknown(skiatest::Reporter* reporter, SkPath
REPORTER_ASSERT(reporter, path->isConvex()); REPORTER_ASSERT(reporter, path->isConvex());
REPORTER_ASSERT(reporter, SkPathPriv::CheapIsFirstDirection(*path, SkPathPriv::AsFirstDirection(dir))); REPORTER_ASSERT(reporter, SkPathPriv::CheapIsFirstDirection(*path, SkPathPriv::AsFirstDirection(dir)));
path->setConvexity(SkPath::kUnknown_Convexity); path->setConvexity(SkPath::kUnknown_Convexity);
REPORTER_ASSERT(reporter, path->getConvexity() == SkPath::kConvex_Convexity); REPORTER_ASSERT(reporter, path->getConvexity() == SkPath::kConcave_Convexity);
path->reset(); path->reset();
} }