AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1a9971ed47
skia2/tests/InsetConvexPolyTest.cpp
Ben Wagner e9dd316a00 Revert "Reland "Add some optimizations to PolyUtils"" 
This reverts commit 946c37057f.

Reason for revert: strict weak ordering: ((__x LT __y) && (__y LT __x)) != false

Original change's description:
> Reland "Add some optimizations to PolyUtils"
> 
> This is a reland of 8bb0db3d07
> 
> Original change's description:
> > Add some optimizations to PolyUtils
> > 
> > * Switch inset/offset code to use a linked list rather than an array
> > * Use std::set to store active edge list for IsSimplePolygon rather than array
> > * Pre-alloc the priority queue for IsSimplePolygon
> > * When adding radial curves, expand the array all at once rather than pushing
> > one at a time.
> > 
> > Bug: skia:
> > Change-Id: I692f8c29c500c41ec1d1be39d924d8a752676bf4
> > Reviewed-on: https://skia-review.googlesource.com/140787
> > Reviewed-by: Robert Phillips <robertphillips@google.com>
> > Commit-Queue: Jim Van Verth <jvanverth@google.com>
> 
> Bug: skia:
> Change-Id: I3f5d42cfb941deab2b28bed020b37ce199e91d3d
> Reviewed-on: https://skia-review.googlesource.com/142200
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Jim Van Verth <jvanverth@google.com>

TBR=jvanverth@google.com,bsalomon@google.com,robertphillips@google.com

Change-Id: Ie8cdf2375613c51dedaf0d11125d6d22d88821df
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/142281
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
2018-07-18 21:28:02 +00:00

107 lines
5.5 KiB
C++
Raw Blame History

/*
* Copyright 2017 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#include "Test.h"
#include "SkPolyUtils.h"
DEF_TEST(InsetConvexPoly, reporter) {
SkTDArray<SkPoint> rrectPoly;
// round rect
*rrectPoly.push() = SkPoint::Make(-100, 55);
*rrectPoly.push() = SkPoint::Make(100, 55);
*rrectPoly.push() = SkPoint::Make(100 + 2.5f, 50 + 4.330127f);
*rrectPoly.push() = SkPoint::Make(100 + 3.535534f, 50 + 3.535534f);
*rrectPoly.push() = SkPoint::Make(100 + 4.330127f, 50 + 2.5f);
*rrectPoly.push() = SkPoint::Make(105, 50);
*rrectPoly.push() = SkPoint::Make(105, -50);
*rrectPoly.push() = SkPoint::Make(100 + 4.330127f, -50 - 2.5f);
*rrectPoly.push() = SkPoint::Make(100 + 3.535534f, -50 - 3.535534f);
*rrectPoly.push() = SkPoint::Make(100 + 2.5f, -50 - 4.330127f);
*rrectPoly.push() = SkPoint::Make(100, -55);
*rrectPoly.push() = SkPoint::Make(-100, -55);
*rrectPoly.push() = SkPoint::Make(-100 - 2.5f, -50 - 4.330127f);
*rrectPoly.push() = SkPoint::Make(-100 - 3.535534f, -50 - 3.535534f);
*rrectPoly.push() = SkPoint::Make(-100 - 4.330127f, -50 - 2.5f);
*rrectPoly.push() = SkPoint::Make(-105, -50);
*rrectPoly.push() = SkPoint::Make(-105, 50);
*rrectPoly.push() = SkPoint::Make(-100 - 4.330127f, 50 + 2.5f);
*rrectPoly.push() = SkPoint::Make(-100 - 3.535534f, 50 + 3.535534f);
*rrectPoly.push() = SkPoint::Make(-100 - 2.5f, 50 + 4.330127f);
REPORTER_ASSERT(reporter, SkIsConvexPolygon(rrectPoly.begin(), rrectPoly.count()));
// inset a little
SkTDArray<SkPoint> insetPoly;
bool result = SkInsetConvexPolygon(rrectPoly.begin(), rrectPoly.count(), 3, &insetPoly);
REPORTER_ASSERT(reporter, result);
REPORTER_ASSERT(reporter, SkIsConvexPolygon(insetPoly.begin(), insetPoly.count()));
// inset to rect
result = SkInsetConvexPolygon(rrectPoly.begin(), rrectPoly.count(), 10, &insetPoly);
REPORTER_ASSERT(reporter, result);
REPORTER_ASSERT(reporter, SkIsConvexPolygon(insetPoly.begin(), insetPoly.count()));
REPORTER_ASSERT(reporter, insetPoly.count() == 4);
if (insetPoly.count() == 4) {
REPORTER_ASSERT(reporter, insetPoly[0].equals(-95, 45));
REPORTER_ASSERT(reporter, insetPoly[1].equals(95, 45));
REPORTER_ASSERT(reporter, insetPoly[2].equals(95, -45));
REPORTER_ASSERT(reporter, insetPoly[3].equals(-95, -45));
}
// just to full inset
// fails, but outputs a line segment
result = SkInsetConvexPolygon(rrectPoly.begin(), rrectPoly.count(), 55, &insetPoly);
REPORTER_ASSERT(reporter, !result);
REPORTER_ASSERT(reporter, !SkIsConvexPolygon(insetPoly.begin(), insetPoly.count()));
REPORTER_ASSERT(reporter, insetPoly.count() == 2);
if (insetPoly.count() == 2) {
REPORTER_ASSERT(reporter, insetPoly[0].equals(-50, 0));
REPORTER_ASSERT(reporter, insetPoly[1].equals(50, 0));
}
// past full inset
result = SkInsetConvexPolygon(rrectPoly.begin(), rrectPoly.count(), 75, &insetPoly);
REPORTER_ASSERT(reporter, !result);
REPORTER_ASSERT(reporter, insetPoly.count() == 0);
// troublesome case
SkTDArray<SkPoint> clippedRRectPoly;
*clippedRRectPoly.push() = SkPoint::Make(335.928101f, 428.219055f);
*clippedRRectPoly.push() = SkPoint::Make(330.414459f, 423.034912f);
*clippedRRectPoly.push() = SkPoint::Make(325.749084f, 417.395508f);
*clippedRRectPoly.push() = SkPoint::Make(321.931946f, 411.300842f);
*clippedRRectPoly.push() = SkPoint::Make(318.963074f, 404.750977f);
*clippedRRectPoly.push() = SkPoint::Make(316.842468f, 397.745850f);
*clippedRRectPoly.push() = SkPoint::Make(315.570068f, 390.285522f);
*clippedRRectPoly.push() = SkPoint::Make(315.145966f, 382.369965f);
*clippedRRectPoly.push() = SkPoint::Make(315.570068f, 374.454346f);
*clippedRRectPoly.push() = SkPoint::Make(316.842468f, 366.994019f);
*clippedRRectPoly.push() = SkPoint::Make(318.963074f, 359.988892f);
*clippedRRectPoly.push() = SkPoint::Make(321.931946f, 353.439056f);
*clippedRRectPoly.push() = SkPoint::Make(325.749084f, 347.344421f);
*clippedRRectPoly.push() = SkPoint::Make(330.414459f, 341.705017f);
*clippedRRectPoly.push() = SkPoint::Make(335.928101f, 336.520813f);
*clippedRRectPoly.push() = SkPoint::Make(342.289948f, 331.791901f);
*clippedRRectPoly.push() = SkPoint::Make(377.312134f, 331.791901f);
*clippedRRectPoly.push() = SkPoint::Make(381.195313f, 332.532593f);
*clippedRRectPoly.push() = SkPoint::Make(384.464935f, 334.754700f);
*clippedRRectPoly.push() = SkPoint::Make(386.687042f, 338.024292f);
*clippedRRectPoly.push() = SkPoint::Make(387.427765f, 341.907532f);
*clippedRRectPoly.push() = SkPoint::Make(387.427765f, 422.832367f);
*clippedRRectPoly.push() = SkPoint::Make(386.687042f, 426.715576f);
*clippedRRectPoly.push() = SkPoint::Make(384.464935f, 429.985168f);
*clippedRRectPoly.push() = SkPoint::Make(381.195313f, 432.207275f);
*clippedRRectPoly.push() = SkPoint::Make(377.312134f, 432.947998f);
*clippedRRectPoly.push() = SkPoint::Make(342.289948f, 432.947998f);
REPORTER_ASSERT(reporter, SkIsConvexPolygon(clippedRRectPoly.begin(),
clippedRRectPoly.count()));
result = SkInsetConvexPolygon(clippedRRectPoly.begin(), clippedRRectPoly.count(), 32.3699417f,
&insetPoly);
REPORTER_ASSERT(reporter, result);
REPORTER_ASSERT(reporter, SkIsConvexPolygon(insetPoly.begin(), insetPoly.count()));
}
Reference in New Issue View Git Blame Copy Permalink