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
244 lines
9.8 KiB
C++
244 lines
9.8 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 "PathOpsTestCommon.h"
|
|
#include "SkIntersections.h"
|
|
#include "SkPathOpsLine.h"
|
|
#include "Test.h"
|
|
|
|
// FIXME: add tests for intersecting, non-intersecting, degenerate, coincident
|
|
static const SkDLine tests[][2] = {
|
|
{{{{0.00010360032320022583, 1.0172703415155411}, {0.00014114845544099808, 1.0200891587883234}}},
|
|
{{{0.00010259449481964111, 1.017270140349865}, {0.00018215179443359375, 1.022890567779541}}}},
|
|
|
|
#if 0
|
|
// these do intersect at a pair of points, but not close enough for check results liking
|
|
{{{{365.848175,5081.15186}, {368,5103}}}, {{{367.967712,5102.61084}, {368.278717,5105.71045}}}},
|
|
#endif
|
|
{{{{30,20}, {30,50}}}, {{{24,30}, {36,30}}}},
|
|
{{{{323,193}, {-317,193}}}, {{{0,994}, {0,0}}}},
|
|
{{{{90,230}, {160,60}}}, {{{60,120}, {260,120}}}},
|
|
{{{{90,230}, {160,60}}}, {{{181.176468,120}, {135.294128,120}}}},
|
|
{{{{181.1764678955078125f, 120}, {186.3661956787109375f, 134.7042236328125f}}},
|
|
{{{175.8309783935546875f, 141.5211334228515625f}, {187.8782806396484375f, 133.7258148193359375f}}}},
|
|
#if 0 // FIXME: these fail because one line is too short and appears quasi-coincident
|
|
{{{{158.000000, 926.000000}, {1108.00000, 926.000000}}},
|
|
{{{1108.00000, 926.000000}, {1108.00000, 925.999634}}}},
|
|
{{{{1108,926}, {1108,925.9996337890625}}}, {{{158,926}, {1108,926}}}},
|
|
#endif
|
|
{{{{192, 4}, {243, 4}}}, {{{246, 4}, {189, 4}}}},
|
|
{{{{246, 4}, {189, 4}}}, {{{192, 4}, {243, 4}}}},
|
|
{{{{5, 0}, {0, 5}}}, {{{5, 4}, {1, 4}}}},
|
|
{{{{0, 0}, {1, 0}}}, {{{1, 0}, {0, 0}}}},
|
|
{{{{0, 0}, {0, 0}}}, {{{0, 0}, {1, 0}}}},
|
|
{{{{0, 1}, {0, 1}}}, {{{0, 0}, {0, 2}}}},
|
|
{{{{0, 0}, {1, 0}}}, {{{0, 0}, {2, 0}}}},
|
|
{{{{1, 1}, {2, 2}}}, {{{0, 0}, {3, 3}}}},
|
|
{{{{166.86950047022856, 112.69654129527828}, {166.86948801592692, 112.69655741235339}}},
|
|
{{{166.86960700313026, 112.6965477747386}, {166.86925794355412, 112.69656471103423}}}}
|
|
};
|
|
|
|
static const size_t tests_count = SK_ARRAY_COUNT(tests);
|
|
|
|
static const SkDLine noIntersect[][2] = {
|
|
{{{{(double) (2 - 1e-6f),2}, {(double) (2 - 1e-6f),4}}},
|
|
{{{2,1}, {2,3}}}},
|
|
|
|
{{{{0, 0}, {1, 0}}}, {{{3, 0}, {2, 0}}}},
|
|
{{{{0, 0}, {0, 0}}}, {{{1, 0}, {2, 0}}}},
|
|
{{{{0, 1}, {0, 1}}}, {{{0, 3}, {0, 2}}}},
|
|
{{{{0, 0}, {1, 0}}}, {{{2, 0}, {3, 0}}}},
|
|
{{{{1, 1}, {2, 2}}}, {{{4, 4}, {3, 3}}}},
|
|
};
|
|
|
|
static const size_t noIntersect_count = SK_ARRAY_COUNT(noIntersect);
|
|
|
|
static const SkDLine coincidentTests[][2] = {
|
|
{{{ {-1.48383003e-006,-83}, {4.2268899e-014,-60} }},
|
|
{{ {9.5359502e-007,-60}, {5.08227985e-015,-83} }}},
|
|
|
|
{{{ { 10105, 2510 }, { 10123, 2509.98999f } }},
|
|
{{{10105, 2509.98999f}, { 10123, 2510 } }}},
|
|
|
|
{{ { { 0, 482.5 }, { -4.4408921e-016, 682.5 } } },
|
|
{{{0,683}, {0,482}}}},
|
|
|
|
{{{{1.77635684e-015,312}, {-1.24344979e-014,348}}},
|
|
{{{0,348}, {0,312}}}},
|
|
|
|
{{{{979.304871, 561}, {1036.69507, 291}}},
|
|
{{{985.681519, 531}, {982.159790, 547.568542}}}},
|
|
|
|
{{{{232.159805, 547.568542}, {235.681549, 531}}},
|
|
{{{286.695129,291}, {229.304855,561}}}},
|
|
|
|
{{{{186.3661956787109375f, 134.7042236328125f}, {187.8782806396484375f, 133.7258148193359375f}}},
|
|
{{{175.8309783935546875f, 141.5211334228515625f}, {187.8782806396484375f, 133.7258148193359375f}}}},
|
|
|
|
{{{{235.681549, 531.000000}, {280.318420, 321.000000}}},
|
|
{{{286.695129, 291.000000}, {229.304855, 561.000000}}}},
|
|
};
|
|
|
|
static const size_t coincidentTests_count = SK_ARRAY_COUNT(coincidentTests);
|
|
|
|
static void check_results(skiatest::Reporter* reporter, const SkDLine& line1, const SkDLine& line2,
|
|
const SkIntersections& ts, bool nearAllowed) {
|
|
for (int i = 0; i < ts.used(); ++i) {
|
|
SkDPoint result1 = line1.ptAtT(ts[0][i]);
|
|
SkDPoint result2 = line2.ptAtT(ts[1][i]);
|
|
if (nearAllowed && result1.roughlyEqual(result2)) {
|
|
continue;
|
|
}
|
|
if (!result1.approximatelyEqual(result2) && !ts.nearlySame(i)) {
|
|
REPORTER_ASSERT(reporter, ts.used() != 1);
|
|
result2 = line2.ptAtT(ts[1][i ^ 1]);
|
|
if (!result1.approximatelyEqual(result2)) {
|
|
SkDebugf(".");
|
|
}
|
|
REPORTER_ASSERT(reporter, result1.approximatelyEqual(result2));
|
|
REPORTER_ASSERT(reporter, result1.approximatelyEqual(ts.pt(i).asSkPoint()));
|
|
}
|
|
}
|
|
}
|
|
|
|
static void testOne(skiatest::Reporter* reporter, const SkDLine& line1, const SkDLine& line2,
|
|
bool nearAllowed) {
|
|
SkASSERT(ValidLine(line1));
|
|
SkASSERT(ValidLine(line2));
|
|
SkIntersections i;
|
|
i.allowNear(nearAllowed);
|
|
int pts = i.intersect(line1, line2);
|
|
REPORTER_ASSERT(reporter, pts);
|
|
REPORTER_ASSERT(reporter, pts == i.used());
|
|
check_results(reporter, line1, line2, i, nearAllowed);
|
|
if (line1[0] == line1[1] || line2[0] == line2[1]) {
|
|
return;
|
|
}
|
|
if (line1[0].fY == line1[1].fY) {
|
|
double left = SkTMin(line1[0].fX, line1[1].fX);
|
|
double right = SkTMax(line1[0].fX, line1[1].fX);
|
|
SkIntersections ts;
|
|
ts.horizontal(line2, left, right, line1[0].fY, line1[0].fX != left);
|
|
check_results(reporter, line2, line1, ts, nearAllowed);
|
|
}
|
|
if (line2[0].fY == line2[1].fY) {
|
|
double left = SkTMin(line2[0].fX, line2[1].fX);
|
|
double right = SkTMax(line2[0].fX, line2[1].fX);
|
|
SkIntersections ts;
|
|
ts.horizontal(line1, left, right, line2[0].fY, line2[0].fX != left);
|
|
check_results(reporter, line1, line2, ts, nearAllowed);
|
|
}
|
|
if (line1[0].fX == line1[1].fX) {
|
|
double top = SkTMin(line1[0].fY, line1[1].fY);
|
|
double bottom = SkTMax(line1[0].fY, line1[1].fY);
|
|
SkIntersections ts;
|
|
ts.vertical(line2, top, bottom, line1[0].fX, line1[0].fY != top);
|
|
check_results(reporter, line2, line1, ts, nearAllowed);
|
|
}
|
|
if (line2[0].fX == line2[1].fX) {
|
|
double top = SkTMin(line2[0].fY, line2[1].fY);
|
|
double bottom = SkTMax(line2[0].fY, line2[1].fY);
|
|
SkIntersections ts;
|
|
ts.vertical(line1, top, bottom, line2[0].fX, line2[0].fY != top);
|
|
check_results(reporter, line1, line2, ts, nearAllowed);
|
|
}
|
|
reporter->bumpTestCount();
|
|
}
|
|
|
|
static void testOneCoincident(skiatest::Reporter* reporter, const SkDLine& line1,
|
|
const SkDLine& line2) {
|
|
SkASSERT(ValidLine(line1));
|
|
SkASSERT(ValidLine(line2));
|
|
SkIntersections ts;
|
|
int pts = ts.intersect(line1, line2);
|
|
REPORTER_ASSERT(reporter, pts == 2);
|
|
REPORTER_ASSERT(reporter, pts == ts.used());
|
|
check_results(reporter, line1, line2, ts, false);
|
|
if (line1[0] == line1[1] || line2[0] == line2[1]) {
|
|
return;
|
|
}
|
|
if (line1[0].fY == line1[1].fY) {
|
|
double left = SkTMin(line1[0].fX, line1[1].fX);
|
|
double right = SkTMax(line1[0].fX, line1[1].fX);
|
|
SkIntersections ts;
|
|
ts.horizontal(line2, left, right, line1[0].fY, line1[0].fX != left);
|
|
REPORTER_ASSERT(reporter, pts == 2);
|
|
REPORTER_ASSERT(reporter, pts == ts.used());
|
|
check_results(reporter, line2, line1, ts, false);
|
|
}
|
|
if (line2[0].fY == line2[1].fY) {
|
|
double left = SkTMin(line2[0].fX, line2[1].fX);
|
|
double right = SkTMax(line2[0].fX, line2[1].fX);
|
|
SkIntersections ts;
|
|
ts.horizontal(line1, left, right, line2[0].fY, line2[0].fX != left);
|
|
REPORTER_ASSERT(reporter, pts == 2);
|
|
REPORTER_ASSERT(reporter, pts == ts.used());
|
|
check_results(reporter, line1, line2, ts, false);
|
|
}
|
|
if (line1[0].fX == line1[1].fX) {
|
|
double top = SkTMin(line1[0].fY, line1[1].fY);
|
|
double bottom = SkTMax(line1[0].fY, line1[1].fY);
|
|
SkIntersections ts;
|
|
ts.vertical(line2, top, bottom, line1[0].fX, line1[0].fY != top);
|
|
REPORTER_ASSERT(reporter, pts == 2);
|
|
REPORTER_ASSERT(reporter, pts == ts.used());
|
|
check_results(reporter, line2, line1, ts, false);
|
|
}
|
|
if (line2[0].fX == line2[1].fX) {
|
|
double top = SkTMin(line2[0].fY, line2[1].fY);
|
|
double bottom = SkTMax(line2[0].fY, line2[1].fY);
|
|
SkIntersections ts;
|
|
ts.vertical(line1, top, bottom, line2[0].fX, line2[0].fY != top);
|
|
REPORTER_ASSERT(reporter, pts == 2);
|
|
REPORTER_ASSERT(reporter, pts == ts.used());
|
|
check_results(reporter, line1, line2, ts, false);
|
|
}
|
|
reporter->bumpTestCount();
|
|
}
|
|
|
|
DEF_TEST(PathOpsLineIntersection, reporter) {
|
|
size_t index;
|
|
for (index = 0; index < coincidentTests_count; ++index) {
|
|
const SkDLine& line1 = coincidentTests[index][0];
|
|
const SkDLine& line2 = coincidentTests[index][1];
|
|
testOneCoincident(reporter, line1, line2);
|
|
}
|
|
for (index = 0; index < tests_count; ++index) {
|
|
const SkDLine& line1 = tests[index][0];
|
|
const SkDLine& line2 = tests[index][1];
|
|
testOne(reporter, line1, line2, true);
|
|
}
|
|
for (index = 0; index < noIntersect_count; ++index) {
|
|
const SkDLine& line1 = noIntersect[index][0];
|
|
const SkDLine& line2 = noIntersect[index][1];
|
|
SkIntersections ts;
|
|
int pts = ts.intersect(line1, line2);
|
|
REPORTER_ASSERT(reporter, !pts);
|
|
REPORTER_ASSERT(reporter, pts == ts.used());
|
|
reporter->bumpTestCount();
|
|
}
|
|
}
|
|
|
|
DEF_TEST(PathOpsLineIntersectionOneOff, reporter) {
|
|
int index = 0;
|
|
SkASSERT(index < (int) tests_count);
|
|
testOne(reporter, tests[index][0], tests[index][1], true);
|
|
}
|
|
|
|
DEF_TEST(PathOpsLineIntersectionExactOneOff, reporter) {
|
|
int index = 0;
|
|
SkASSERT(index < (int) tests_count);
|
|
testOne(reporter, tests[index][0], tests[index][1], false);
|
|
}
|
|
|
|
DEF_TEST(PathOpsLineIntersectionOneCoincident, reporter) {
|
|
int index = 0;
|
|
SkASSERT(index < (int) coincidentTests_count);
|
|
const SkDLine& line1 = coincidentTests[index][0];
|
|
const SkDLine& line2 = coincidentTests[index][1];
|
|
testOneCoincident(reporter, line1, line2);
|
|
}
|