54359294a7
Replace the implicit curve intersection with a geometric curve intersection. The implicit intersection proved mathematically unstable and took a long time to zero in on an answer. Use pointers instead of indices to refer to parts of curves. Indices required awkward renumbering. Unify t and point values so that small intervals can be eliminated in one pass. Break cubics up front to eliminate loops and cusps. Make the Simplify and Op code more regular and eliminate arbitrary differences. Add a builder that takes an array of paths and operators. Delete unused code. BUG=skia:3588 R=reed@google.com Review URL: https://codereview.chromium.org/1037573004
81 lines
2.6 KiB
C++
81 lines
2.6 KiB
C++
/*
|
|
* Copyright 2014 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
#include "SkIntersections.h"
|
|
#include "SkTDArray.h"
|
|
#include "Test.h"
|
|
|
|
// check intersections for consistency
|
|
|
|
struct Curve {
|
|
int ptCount;
|
|
SkDCubic curve; // largest can hold lines / quads/ cubics
|
|
};
|
|
|
|
static const Curve testSet0[] = { // extracted from skpClip2
|
|
{4, {{{134,11414}, {131.990234,11414}, {130.32666,11415.4824}, {130.042755,11417.4131}}} },
|
|
{4, {{{130.042755,11417.4131}, {130.233124,11418.3193}, {131.037079,11419}, {132,11419}}} },
|
|
{4, {{{132,11419}, {130.895432,11419}, {130,11418.1045}, {130,11417}}} },
|
|
};
|
|
|
|
static const Curve testSet1[] = { // extracted from cubicOp85i
|
|
{4, {{{3,4}, {1,5}, {4,3}, {6,4}}} },
|
|
{1, {{{6,4}, {3,4}}} },
|
|
{4, {{{3,4}, {4,6}, {4,3}, {5,1}}} },
|
|
{1, {{{5,1}, {3,4}}} },
|
|
};
|
|
|
|
static const struct TestSet {
|
|
const Curve* tests;
|
|
int testCount;
|
|
} testSets[] = {
|
|
{ testSet0, (int) SK_ARRAY_COUNT(testSet0) },
|
|
{ testSet1, (int) SK_ARRAY_COUNT(testSet1) },
|
|
};
|
|
|
|
static const int testSetsCount = (int) SK_ARRAY_COUNT(testSets);
|
|
|
|
static void testSetTest(skiatest::Reporter* reporter, int index) {
|
|
const TestSet& testSet = testSets[index];
|
|
int testCount = testSet.testCount;
|
|
SkASSERT(testCount > 1);
|
|
SkTDArray<SkIntersections> combos;
|
|
for (int outer = 0; outer < testCount - 1; ++outer) {
|
|
const Curve& oTest = testSet.tests[outer];
|
|
for (int inner = outer + 1; inner < testCount; ++inner) {
|
|
const Curve& iTest = testSet.tests[inner];
|
|
SkIntersections* i = combos.append();
|
|
sk_bzero(i, sizeof(SkIntersections));
|
|
SkDLine oLine = {{ oTest.curve[0], oTest.curve[1] }};
|
|
SkDLine iLine = {{ iTest.curve[0], iTest.curve[1] }};
|
|
if (oTest.ptCount == 1 && iTest.ptCount == 1) {
|
|
i->intersect(oLine, iLine);
|
|
} else if (oTest.ptCount == 1 && iTest.ptCount == 4) {
|
|
i->intersect(iTest.curve, oLine);
|
|
} else if (oTest.ptCount == 4 && iTest.ptCount == 1) {
|
|
i->intersect(oTest.curve, iLine);
|
|
} else if (oTest.ptCount == 4 && iTest.ptCount == 4) {
|
|
i->intersect(oTest.curve, iTest.curve);
|
|
} else {
|
|
SkASSERT(0);
|
|
}
|
|
// i->dump();
|
|
}
|
|
}
|
|
}
|
|
|
|
DEF_TEST(PathOpsThreeWay, reporter) {
|
|
for (int index = 0; index < testSetsCount; ++index) {
|
|
testSetTest(reporter, index);
|
|
reporter->bumpTestCount();
|
|
}
|
|
}
|
|
|
|
DEF_TEST(PathOpsThreeWayOneOff, reporter) {
|
|
int index = 1;
|
|
testSetTest(reporter, index);
|
|
}
|