diff options
author | Dean McNamee <deanm@chromium.org> | 2017-01-13 12:17:09 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-13 19:47:33 +0000 |
commit | 3b830a9ea3bce9eba663ab95486cf153831cd29c (patch) | |
tree | e812d53abf11dab3cb333f1d555d5cd9ecb826f1 /src/gpu/GrPathUtils.cpp | |
parent | 930f69eef346b0ad4164752a074f3a45c6f46770 (diff) |
Simplify k.w calculation in getConicKLM.
Additionally reformat the equations to better expose the symmetry.
BUG=skia:
Change-Id: If485cc7aeae97b89dedeb4d6b23efbe945036e3a
Reviewed-on: https://skia-review.googlesource.com/7000
Reviewed-by: Greg Daniel <egdaniel@google.com>
Reviewed-by: Dean McNamee <deanm@chromium.org>
Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/GrPathUtils.cpp')
-rw-r--r-- | src/gpu/GrPathUtils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/GrPathUtils.cpp b/src/gpu/GrPathUtils.cpp index bff9490113..aac2838f12 100644 --- a/src/gpu/GrPathUtils.cpp +++ b/src/gpu/GrPathUtils.cpp @@ -320,14 +320,14 @@ void GrPathUtils::QuadUVMatrix::set(const SkPoint qPts[3]) { //////////////////////////////////////////////////////////////////////////////// -// k = (y2 - y0, x0 - x2, (x2 - x0)*y0 - (y2 - y0)*x0 ) -// l = (2*w * (y1 - y0), 2*w * (x0 - x1), 2*w * (x1*y0 - x0*y1)) -// m = (2*w * (y2 - y1), 2*w * (x1 - x2), 2*w * (x2*y1 - x1*y2)) +// k = (y2 - y0, x0 - x2, x2*y0 - x0*y2) +// l = (y1 - y0, x0 - x1, x1*y0 - x0*y1) * 2*w +// m = (y2 - y1, x1 - x2, x2*y1 - x1*y2) * 2*w void GrPathUtils::getConicKLM(const SkPoint p[3], const SkScalar weight, SkScalar klm[9]) { const SkScalar w2 = 2.f * weight; klm[0] = p[2].fY - p[0].fY; klm[1] = p[0].fX - p[2].fX; - klm[2] = (p[2].fX - p[0].fX) * p[0].fY - (p[2].fY - p[0].fY) * p[0].fX; + klm[2] = p[2].fX * p[0].fY - p[0].fX * p[2].fY; klm[3] = w2 * (p[1].fY - p[0].fY); klm[4] = w2 * (p[0].fX - p[1].fX); |