624637cc8e
This replacement shoots axis-aligned rays through all intersecting edges to find the outermost one either horizontally or vertically. The resulting code is smaller and twice as fast. To support this, most of the horizontal / vertical intersection code was rewritten and standardized, and old code supporting the top-directed winding was deleted. Contours were pointed to by an SkTDArray. Instead, put them in a linked list, and designate the list head with its own class to ensure that methods that take lists of contours start at the top. This change removed a large percentage of memory allocations used by path ops. TBR=reed@google.com BUG=skia:3588 Review URL: https://codereview.chromium.org/1111333002
75 lines
2.7 KiB
C++
75 lines
2.7 KiB
C++
/*
|
|
* Copyright 2013 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 "SkPathOpsBounds.h"
|
|
#include "SkPathOpsCurve.h"
|
|
#include "Test.h"
|
|
|
|
static const SkRect sectTests[][2] = {
|
|
{{2, 0, 4, 1}, {4, 0, 6, 1}},
|
|
{{2, 0, 4, 1}, {3, 0, 5, 1}},
|
|
{{2, 0, 4, 1}, {3, 0, 5, 0}},
|
|
{{2, 0, 4, 1}, {3, 1, 5, 2}},
|
|
{{2, 1, 4, 2}, {1, 0, 5, 3}},
|
|
{{2, 1, 5, 3}, {3, 1, 4, 2}},
|
|
{{2, 0, 4, 1}, {3, 0, 3, 0}}, // intersecting an empty bounds is OK
|
|
{{2, 0, 4, 1}, {4, 1, 5, 2}}, // touching just on a corner is OK
|
|
};
|
|
|
|
static const size_t sectTestsCount = SK_ARRAY_COUNT(sectTests);
|
|
|
|
static const SkRect noSectTests[][2] = {
|
|
{{2, 0, 4, 1}, {5, 0, 6, 1}},
|
|
{{2, 0, 4, 1}, {3, 2, 5, 2}},
|
|
};
|
|
|
|
static const size_t noSectTestsCount = SK_ARRAY_COUNT(noSectTests);
|
|
|
|
DEF_TEST(PathOpsBounds, reporter) {
|
|
for (size_t index = 0; index < sectTestsCount; ++index) {
|
|
const SkPathOpsBounds& bounds1 = static_cast<const SkPathOpsBounds&>(sectTests[index][0]);
|
|
SkASSERT(ValidBounds(bounds1));
|
|
const SkPathOpsBounds& bounds2 = static_cast<const SkPathOpsBounds&>(sectTests[index][1]);
|
|
SkASSERT(ValidBounds(bounds2));
|
|
bool touches = SkPathOpsBounds::Intersects(bounds1, bounds2);
|
|
REPORTER_ASSERT(reporter, touches);
|
|
}
|
|
for (size_t index = 0; index < noSectTestsCount; ++index) {
|
|
const SkPathOpsBounds& bounds1 = static_cast<const SkPathOpsBounds&>(noSectTests[index][0]);
|
|
SkASSERT(ValidBounds(bounds1));
|
|
const SkPathOpsBounds& bounds2 = static_cast<const SkPathOpsBounds&>(noSectTests[index][1]);
|
|
SkASSERT(ValidBounds(bounds2));
|
|
bool touches = SkPathOpsBounds::Intersects(bounds1, bounds2);
|
|
REPORTER_ASSERT(reporter, !touches);
|
|
}
|
|
SkPathOpsBounds bounds;
|
|
bounds.setEmpty();
|
|
bounds.add(1, 2, 3, 4);
|
|
SkPathOpsBounds expected;
|
|
expected.set(0, 0, 3, 4);
|
|
REPORTER_ASSERT(reporter, bounds == expected);
|
|
bounds.setEmpty();
|
|
SkPathOpsBounds ordinal;
|
|
ordinal.set(1, 2, 3, 4);
|
|
bounds.add(ordinal);
|
|
REPORTER_ASSERT(reporter, bounds == expected);
|
|
bounds.setEmpty();
|
|
SkDPoint botRight = {3, 4};
|
|
bounds.add(botRight);
|
|
REPORTER_ASSERT(reporter, bounds == expected);
|
|
const SkPoint curvePts[] = {{0, 0}, {1, 2}, {3, 4}, {5, 6}};
|
|
SkDCurve curve;
|
|
curve.fQuad.set(curvePts);
|
|
curve.setQuadBounds(curvePts, 1, 0, 1, &bounds);
|
|
expected.set(0, 0, 3, 4);
|
|
REPORTER_ASSERT(reporter, bounds == expected);
|
|
curve.fCubic.set(curvePts);
|
|
curve.setCubicBounds(curvePts, 1, 0, 1, &bounds);
|
|
expected.set(0, 0, 5, 6);
|
|
REPORTER_ASSERT(reporter, bounds == expected);
|
|
}
|