4431e7757c
Mike K: please sanity check Test.cpp and skia_test.cpp Feel free to look at the rest, but I don't expect any in depth review of path ops innards. Path Ops first iteration used QuickSort to order segments radiating from an intersection to compute the winding rule. This revision uses a circular sort instead. Breaking out the circular sort into its own long-lived structure (SkOpAngle) allows doing less work and provides a home for caching additional sorting data. The circle sort is more stable than the former sort, has a robust ordering and fewer exceptions. It finds unsortable ordering less often. It is less reliant on the initial curve tangent, using convex hulls instead whenever it can. Additional debug validation makes sure that the computed structures are self-consistent. A new visualization tool helps verify that the angle ordering is correct. The 70+M tests pass with this change on Windows, Mac, Linux 32 and Linux 64 in debug and release. R=mtklein@google.com, reed@google.com Author: caryclark@google.com Review URL: https://codereview.chromium.org/131103009 git-svn-id: http://skia.googlecode.com/svn/trunk@14183 2bbb7eff-a529-9590-31e7-b0007b416f81
87 lines
3.6 KiB
C++
87 lines
3.6 KiB
C++
/*
|
|
* Copyright 2012 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "PathOpsExtendedTest.h"
|
|
#include "PathOpsThreadedCommon.h"
|
|
|
|
static void testOpCubicsMain(PathOpsThreadState* data) {
|
|
#if DEBUG_SHOW_TEST_NAME
|
|
strncpy(DEBUG_FILENAME_STRING, "", DEBUG_FILENAME_STRING_LENGTH);
|
|
#endif
|
|
SkASSERT(data);
|
|
PathOpsThreadState& state = *data;
|
|
char pathStr[1024]; // gdb: set print elements 400
|
|
bool progress = state.fReporter->verbose(); // FIXME: break out into its own parameter?
|
|
if (progress) {
|
|
sk_bzero(pathStr, sizeof(pathStr));
|
|
}
|
|
for (int a = 0 ; a < 6; ++a) {
|
|
for (int b = a + 1 ; b < 7; ++b) {
|
|
for (int c = 0 ; c < 6; ++c) {
|
|
for (int d = c + 1 ; d < 7; ++d) {
|
|
for (int e = SkPath::kWinding_FillType ; e <= SkPath::kEvenOdd_FillType; ++e) {
|
|
for (int f = SkPath::kWinding_FillType ; f <= SkPath::kEvenOdd_FillType; ++f) {
|
|
SkPath pathA, pathB;
|
|
if (progress) {
|
|
char* str = pathStr;
|
|
str += sprintf(str, " path.setFillType(SkPath::k%s_FillType);\n",
|
|
e == SkPath::kWinding_FillType ? "Winding" : e == SkPath::kEvenOdd_FillType
|
|
? "EvenOdd" : "?UNDEFINED");
|
|
str += sprintf(str, " path.moveTo(%d,%d);\n", state.fA, state.fB);
|
|
str += sprintf(str, " path.cubicTo(%d,%d, %d,%d, %d,%d);\n", state.fC, state.fD,
|
|
b, a, d, c);
|
|
str += sprintf(str, " path.close();\n");
|
|
str += sprintf(str, " pathB.setFillType(SkPath::k%s_FillType);\n",
|
|
f == SkPath::kWinding_FillType ? "Winding" : f == SkPath::kEvenOdd_FillType
|
|
? "EvenOdd" : "?UNDEFINED");
|
|
str += sprintf(str, " pathB.moveTo(%d,%d);\n", a, b);
|
|
str += sprintf(str, " pathB.cubicTo(%d,%d, %d,%d, %d,%d);\n", c, d,
|
|
state.fB, state.fA, state.fD, state.fC);
|
|
str += sprintf(str, " pathB.close();\n");
|
|
}
|
|
pathA.setFillType((SkPath::FillType) e);
|
|
pathA.moveTo(SkIntToScalar(state.fA), SkIntToScalar(state.fB));
|
|
pathA.cubicTo(SkIntToScalar(state.fC), SkIntToScalar(state.fD), SkIntToScalar(b),
|
|
SkIntToScalar(a), SkIntToScalar(d), SkIntToScalar(c));
|
|
pathA.close();
|
|
pathB.setFillType((SkPath::FillType) f);
|
|
pathB.moveTo(SkIntToScalar(a), SkIntToScalar(b));
|
|
pathB.cubicTo(SkIntToScalar(c), SkIntToScalar(d), SkIntToScalar(state.fB),
|
|
SkIntToScalar(state.fA), SkIntToScalar(state.fD), SkIntToScalar(state.fC));
|
|
pathB.close();
|
|
for (int op = 0 ; op <= kXOR_PathOp; ++op) {
|
|
if (progress) {
|
|
outputProgress(state.fPathStr, pathStr, (SkPathOp) op);
|
|
}
|
|
testThreadedPathOp(state.fReporter, pathA, pathB, (SkPathOp) op, "cubics");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
DEF_TEST(PathOpsOpCubicsThreaded, reporter) {
|
|
int threadCount = initializeTests(reporter, "cubicOp");
|
|
PathOpsThreadedTestRunner testRunner(reporter, threadCount);
|
|
for (int a = 0; a < 6; ++a) { // outermost
|
|
for (int b = a + 1; b < 7; ++b) {
|
|
for (int c = 0 ; c < 6; ++c) {
|
|
for (int d = c + 1; d < 7; ++d) {
|
|
*testRunner.fRunnables.append() = SkNEW_ARGS(PathOpsThreadedRunnable,
|
|
(&testOpCubicsMain, a, b, c, d, &testRunner));
|
|
}
|
|
}
|
|
if (!reporter->allowExtendedTest()) goto finish;
|
|
}
|
|
}
|
|
finish:
|
|
testRunner.render();
|
|
ShowTestArray();
|
|
}
|