2011-07-28 14:26:00 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Copyright 2011 Google Inc.
|
|
|
|
*
|
|
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
|
|
* found in the LICENSE file.
|
|
|
|
*/
|
2009-03-02 05:36:20 +00:00
|
|
|
#include "Test.h"
|
2011-09-07 12:23:41 +00:00
|
|
|
#include "SkPaint.h"
|
2009-03-02 05:36:20 +00:00
|
|
|
#include "SkPath.h"
|
2011-05-15 04:08:24 +00:00
|
|
|
#include "SkParse.h"
|
2011-09-21 19:05:12 +00:00
|
|
|
#include "SkReader32.h"
|
2010-02-11 11:09:39 +00:00
|
|
|
#include "SkSize.h"
|
2011-09-21 19:05:12 +00:00
|
|
|
#include "SkWriter32.h"
|
2009-03-02 05:36:20 +00:00
|
|
|
|
2011-11-14 19:29:14 +00:00
|
|
|
static void add_rect(SkPath* path, const SkRect& r) {
|
|
|
|
path->moveTo(r.fLeft, r.fTop);
|
|
|
|
path->lineTo(r.fRight, r.fTop);
|
|
|
|
path->lineTo(r.fRight, r.fBottom);
|
|
|
|
path->lineTo(r.fLeft, r.fBottom);
|
|
|
|
path->close();
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_bounds(skiatest::Reporter* reporter) {
|
|
|
|
static const SkRect rects[] = {
|
2011-11-14 19:34:57 +00:00
|
|
|
{ SkIntToScalar(10), SkIntToScalar(160), SkIntToScalar(610), SkIntToScalar(160) },
|
|
|
|
{ SkIntToScalar(610), SkIntToScalar(160), SkIntToScalar(610), SkIntToScalar(199) },
|
|
|
|
{ SkIntToScalar(10), SkIntToScalar(198), SkIntToScalar(610), SkIntToScalar(199) },
|
|
|
|
{ SkIntToScalar(10), SkIntToScalar(160), SkIntToScalar(10), SkIntToScalar(199) },
|
2011-11-14 19:29:14 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
SkPath path0, path1;
|
|
|
|
for (size_t i = 0; i < SK_ARRAY_COUNT(rects); ++i) {
|
|
|
|
path0.addRect(rects[i]);
|
|
|
|
add_rect(&path1, rects[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, path0.getBounds() == path1.getBounds());
|
|
|
|
}
|
|
|
|
|
2011-09-07 12:23:41 +00:00
|
|
|
static void stroke_cubic(const SkPoint pts[4]) {
|
|
|
|
SkPath path;
|
|
|
|
path.moveTo(pts[0]);
|
|
|
|
path.cubicTo(pts[1], pts[2], pts[3]);
|
|
|
|
|
|
|
|
SkPaint paint;
|
|
|
|
paint.setStyle(SkPaint::kStroke_Style);
|
|
|
|
paint.setStrokeWidth(SK_Scalar1 * 2);
|
|
|
|
|
|
|
|
SkPath fill;
|
|
|
|
paint.getFillPath(path, &fill);
|
|
|
|
}
|
|
|
|
|
|
|
|
// just ensure this can run w/o any SkASSERTS firing in the debug build
|
|
|
|
// we used to assert due to differences in how we determine a degenerate vector
|
|
|
|
// but that was fixed with the introduction of SkPoint::CanNormalize
|
|
|
|
static void stroke_tiny_cubic() {
|
|
|
|
SkPoint p0[] = {
|
|
|
|
{ 372.0f, 92.0f },
|
|
|
|
{ 372.0f, 92.0f },
|
|
|
|
{ 372.0f, 92.0f },
|
|
|
|
{ 372.0f, 92.0f },
|
|
|
|
};
|
|
|
|
|
|
|
|
stroke_cubic(p0);
|
|
|
|
|
|
|
|
SkPoint p1[] = {
|
|
|
|
{ 372.0f, 92.0f },
|
|
|
|
{ 372.0007f, 92.000755f },
|
|
|
|
{ 371.99927f, 92.003922f },
|
|
|
|
{ 371.99826f, 92.003899f },
|
|
|
|
};
|
|
|
|
|
|
|
|
stroke_cubic(p1);
|
|
|
|
}
|
|
|
|
|
2011-07-13 17:44:36 +00:00
|
|
|
static void check_close(skiatest::Reporter* reporter, const SkPath& path) {
|
|
|
|
for (int i = 0; i < 2; ++i) {
|
|
|
|
SkPath::Iter iter(path, (bool)i);
|
|
|
|
SkPoint mv;
|
|
|
|
SkPoint pts[4];
|
|
|
|
SkPath::Verb v;
|
|
|
|
int nMT = 0;
|
|
|
|
int nCL = 0;
|
2011-07-28 21:10:29 +00:00
|
|
|
mv.set(0, 0);
|
2011-07-13 17:44:36 +00:00
|
|
|
while (SkPath::kDone_Verb != (v = iter.next(pts))) {
|
|
|
|
switch (v) {
|
|
|
|
case SkPath::kMove_Verb:
|
|
|
|
mv = pts[0];
|
|
|
|
++nMT;
|
|
|
|
break;
|
|
|
|
case SkPath::kClose_Verb:
|
|
|
|
REPORTER_ASSERT(reporter, mv == pts[0]);
|
|
|
|
++nCL;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// if we force a close on the interator we should have a close
|
|
|
|
// for every moveTo
|
|
|
|
REPORTER_ASSERT(reporter, !i || nMT == nCL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_close(skiatest::Reporter* reporter) {
|
|
|
|
SkPath closePt;
|
|
|
|
closePt.moveTo(0, 0);
|
|
|
|
closePt.close();
|
|
|
|
check_close(reporter, closePt);
|
|
|
|
|
|
|
|
SkPath openPt;
|
|
|
|
openPt.moveTo(0, 0);
|
|
|
|
check_close(reporter, openPt);
|
|
|
|
|
|
|
|
SkPath empty;
|
|
|
|
check_close(reporter, empty);
|
|
|
|
empty.close();
|
|
|
|
check_close(reporter, empty);
|
|
|
|
|
|
|
|
SkPath rect;
|
|
|
|
rect.addRect(SK_Scalar1, SK_Scalar1, 10 * SK_Scalar1, 10*SK_Scalar1);
|
|
|
|
check_close(reporter, rect);
|
|
|
|
rect.close();
|
|
|
|
check_close(reporter, rect);
|
|
|
|
|
|
|
|
SkPath quad;
|
|
|
|
quad.quadTo(SK_Scalar1, SK_Scalar1, 10 * SK_Scalar1, 10*SK_Scalar1);
|
|
|
|
check_close(reporter, quad);
|
|
|
|
quad.close();
|
|
|
|
check_close(reporter, quad);
|
|
|
|
|
|
|
|
SkPath cubic;
|
|
|
|
quad.cubicTo(SK_Scalar1, SK_Scalar1, 10 * SK_Scalar1,
|
|
|
|
10*SK_Scalar1, 20 * SK_Scalar1, 20*SK_Scalar1);
|
|
|
|
check_close(reporter, cubic);
|
|
|
|
cubic.close();
|
|
|
|
check_close(reporter, cubic);
|
|
|
|
|
|
|
|
SkPath line;
|
|
|
|
line.moveTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
line.lineTo(10 * SK_Scalar1, 10*SK_Scalar1);
|
|
|
|
check_close(reporter, line);
|
|
|
|
line.close();
|
|
|
|
check_close(reporter, line);
|
|
|
|
|
|
|
|
SkPath rect2;
|
|
|
|
rect2.addRect(SK_Scalar1, SK_Scalar1, 10 * SK_Scalar1, 10*SK_Scalar1);
|
|
|
|
rect2.close();
|
|
|
|
rect2.addRect(SK_Scalar1, SK_Scalar1, 10 * SK_Scalar1, 10*SK_Scalar1);
|
|
|
|
check_close(reporter, rect2);
|
|
|
|
rect2.close();
|
|
|
|
check_close(reporter, rect2);
|
|
|
|
|
|
|
|
SkPath oval3;
|
|
|
|
oval3.addOval(SkRect::MakeWH(SK_Scalar1*100,SK_Scalar1*100));
|
|
|
|
oval3.close();
|
|
|
|
oval3.addOval(SkRect::MakeWH(SK_Scalar1*200,SK_Scalar1*200));
|
|
|
|
check_close(reporter, oval3);
|
|
|
|
oval3.close();
|
|
|
|
check_close(reporter, oval3);
|
|
|
|
|
|
|
|
SkPath moves;
|
|
|
|
moves.moveTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
moves.moveTo(5 * SK_Scalar1, SK_Scalar1);
|
|
|
|
moves.moveTo(SK_Scalar1, 10 * SK_Scalar1);
|
|
|
|
moves.moveTo(10 *SK_Scalar1, SK_Scalar1);
|
|
|
|
check_close(reporter, moves);
|
2011-09-07 12:23:41 +00:00
|
|
|
|
|
|
|
stroke_tiny_cubic();
|
2011-07-13 17:44:36 +00:00
|
|
|
}
|
|
|
|
|
2011-05-15 04:38:34 +00:00
|
|
|
static void check_convexity(skiatest::Reporter* reporter, const SkPath& path,
|
|
|
|
SkPath::Convexity expected) {
|
|
|
|
SkPath::Convexity c = SkPath::ComputeConvexity(path);
|
|
|
|
REPORTER_ASSERT(reporter, c == expected);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_convexity2(skiatest::Reporter* reporter) {
|
|
|
|
SkPath pt;
|
|
|
|
pt.moveTo(0, 0);
|
|
|
|
pt.close();
|
2011-05-16 14:16:04 +00:00
|
|
|
check_convexity(reporter, pt, SkPath::kConvex_Convexity);
|
2011-05-15 04:38:34 +00:00
|
|
|
|
|
|
|
SkPath line;
|
|
|
|
line.moveTo(12, 20);
|
|
|
|
line.lineTo(-12, -20);
|
|
|
|
line.close();
|
2011-05-16 14:16:04 +00:00
|
|
|
check_convexity(reporter, pt, SkPath::kConvex_Convexity);
|
2011-05-15 04:38:34 +00:00
|
|
|
|
|
|
|
SkPath triLeft;
|
|
|
|
triLeft.moveTo(0, 0);
|
|
|
|
triLeft.lineTo(1, 0);
|
|
|
|
triLeft.lineTo(1, 1);
|
|
|
|
triLeft.close();
|
|
|
|
check_convexity(reporter, triLeft, SkPath::kConvex_Convexity);
|
|
|
|
|
|
|
|
SkPath triRight;
|
|
|
|
triRight.moveTo(0, 0);
|
|
|
|
triRight.lineTo(-1, 0);
|
|
|
|
triRight.lineTo(1, 1);
|
|
|
|
triRight.close();
|
|
|
|
check_convexity(reporter, triRight, SkPath::kConvex_Convexity);
|
|
|
|
|
|
|
|
SkPath square;
|
|
|
|
square.moveTo(0, 0);
|
|
|
|
square.lineTo(1, 0);
|
|
|
|
square.lineTo(1, 1);
|
|
|
|
square.lineTo(0, 1);
|
|
|
|
square.close();
|
|
|
|
check_convexity(reporter, square, SkPath::kConvex_Convexity);
|
|
|
|
|
|
|
|
SkPath redundantSquare;
|
|
|
|
redundantSquare.moveTo(0, 0);
|
|
|
|
redundantSquare.lineTo(0, 0);
|
|
|
|
redundantSquare.lineTo(0, 0);
|
|
|
|
redundantSquare.lineTo(1, 0);
|
|
|
|
redundantSquare.lineTo(1, 0);
|
|
|
|
redundantSquare.lineTo(1, 0);
|
|
|
|
redundantSquare.lineTo(1, 1);
|
|
|
|
redundantSquare.lineTo(1, 1);
|
|
|
|
redundantSquare.lineTo(1, 1);
|
|
|
|
redundantSquare.lineTo(0, 1);
|
|
|
|
redundantSquare.lineTo(0, 1);
|
|
|
|
redundantSquare.lineTo(0, 1);
|
|
|
|
redundantSquare.close();
|
|
|
|
check_convexity(reporter, redundantSquare, SkPath::kConvex_Convexity);
|
|
|
|
|
|
|
|
SkPath bowTie;
|
|
|
|
bowTie.moveTo(0, 0);
|
|
|
|
bowTie.lineTo(0, 0);
|
|
|
|
bowTie.lineTo(0, 0);
|
|
|
|
bowTie.lineTo(1, 1);
|
|
|
|
bowTie.lineTo(1, 1);
|
|
|
|
bowTie.lineTo(1, 1);
|
|
|
|
bowTie.lineTo(1, 0);
|
|
|
|
bowTie.lineTo(1, 0);
|
|
|
|
bowTie.lineTo(1, 0);
|
|
|
|
bowTie.lineTo(0, 1);
|
|
|
|
bowTie.lineTo(0, 1);
|
|
|
|
bowTie.lineTo(0, 1);
|
|
|
|
bowTie.close();
|
|
|
|
check_convexity(reporter, bowTie, SkPath::kConcave_Convexity);
|
|
|
|
|
|
|
|
SkPath spiral;
|
|
|
|
spiral.moveTo(0, 0);
|
2011-05-17 17:36:59 +00:00
|
|
|
spiral.lineTo(100, 0);
|
|
|
|
spiral.lineTo(100, 100);
|
|
|
|
spiral.lineTo(0, 100);
|
|
|
|
spiral.lineTo(0, 50);
|
|
|
|
spiral.lineTo(50, 50);
|
|
|
|
spiral.lineTo(50, 75);
|
2011-05-15 04:38:34 +00:00
|
|
|
spiral.close();
|
2011-05-15 20:25:17 +00:00
|
|
|
check_convexity(reporter, spiral, SkPath::kConcave_Convexity);
|
2011-05-15 04:38:34 +00:00
|
|
|
|
|
|
|
SkPath dent;
|
2011-05-18 20:23:30 +00:00
|
|
|
dent.moveTo(SkIntToScalar(0), SkIntToScalar(0));
|
|
|
|
dent.lineTo(SkIntToScalar(100), SkIntToScalar(100));
|
|
|
|
dent.lineTo(SkIntToScalar(0), SkIntToScalar(100));
|
|
|
|
dent.lineTo(SkIntToScalar(-50), SkIntToScalar(200));
|
|
|
|
dent.lineTo(SkIntToScalar(-200), SkIntToScalar(100));
|
2011-05-15 04:38:34 +00:00
|
|
|
dent.close();
|
|
|
|
check_convexity(reporter, dent, SkPath::kConcave_Convexity);
|
|
|
|
}
|
|
|
|
|
2009-06-03 02:35:01 +00:00
|
|
|
static void check_convex_bounds(skiatest::Reporter* reporter, const SkPath& p,
|
|
|
|
const SkRect& bounds) {
|
|
|
|
REPORTER_ASSERT(reporter, p.isConvex());
|
|
|
|
REPORTER_ASSERT(reporter, p.getBounds() == bounds);
|
2011-02-07 19:39:09 +00:00
|
|
|
|
2009-06-03 02:35:01 +00:00
|
|
|
SkPath p2(p);
|
|
|
|
REPORTER_ASSERT(reporter, p2.isConvex());
|
|
|
|
REPORTER_ASSERT(reporter, p2.getBounds() == bounds);
|
|
|
|
|
|
|
|
SkPath other;
|
|
|
|
other.swap(p2);
|
|
|
|
REPORTER_ASSERT(reporter, other.isConvex());
|
|
|
|
REPORTER_ASSERT(reporter, other.getBounds() == bounds);
|
|
|
|
}
|
|
|
|
|
2011-05-15 04:08:24 +00:00
|
|
|
static void setFromString(SkPath* path, const char str[]) {
|
|
|
|
bool first = true;
|
|
|
|
while (str) {
|
|
|
|
SkScalar x, y;
|
|
|
|
str = SkParse::FindScalar(str, &x);
|
|
|
|
if (NULL == str) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
str = SkParse::FindScalar(str, &y);
|
|
|
|
SkASSERT(str);
|
|
|
|
if (first) {
|
|
|
|
path->moveTo(x, y);
|
|
|
|
first = false;
|
|
|
|
} else {
|
|
|
|
path->lineTo(x, y);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_convexity(skiatest::Reporter* reporter) {
|
|
|
|
static const SkPath::Convexity C = SkPath::kConcave_Convexity;
|
|
|
|
static const SkPath::Convexity V = SkPath::kConvex_Convexity;
|
|
|
|
|
|
|
|
SkPath path;
|
|
|
|
|
2011-05-16 14:16:04 +00:00
|
|
|
REPORTER_ASSERT(reporter, V == SkPath::ComputeConvexity(path));
|
2011-05-15 04:08:24 +00:00
|
|
|
path.addCircle(0, 0, 10);
|
|
|
|
REPORTER_ASSERT(reporter, V == SkPath::ComputeConvexity(path));
|
|
|
|
path.addCircle(0, 0, 10); // 2nd circle
|
|
|
|
REPORTER_ASSERT(reporter, C == SkPath::ComputeConvexity(path));
|
|
|
|
path.reset();
|
|
|
|
path.addRect(0, 0, 10, 10, SkPath::kCCW_Direction);
|
|
|
|
REPORTER_ASSERT(reporter, V == SkPath::ComputeConvexity(path));
|
|
|
|
path.reset();
|
|
|
|
path.addRect(0, 0, 10, 10, SkPath::kCW_Direction);
|
|
|
|
REPORTER_ASSERT(reporter, V == SkPath::ComputeConvexity(path));
|
|
|
|
|
|
|
|
static const struct {
|
|
|
|
const char* fPathStr;
|
|
|
|
SkPath::Convexity fExpectedConvexity;
|
|
|
|
} gRec[] = {
|
2011-05-16 14:16:04 +00:00
|
|
|
{ "", SkPath::kConvex_Convexity },
|
|
|
|
{ "0 0", SkPath::kConvex_Convexity },
|
|
|
|
{ "0 0 10 10", SkPath::kConvex_Convexity },
|
2011-05-15 20:25:17 +00:00
|
|
|
{ "0 0 10 10 20 20 0 0 10 10", SkPath::kConcave_Convexity },
|
2011-05-15 04:08:24 +00:00
|
|
|
{ "0 0 10 10 10 20", SkPath::kConvex_Convexity },
|
|
|
|
{ "0 0 10 10 10 0", SkPath::kConvex_Convexity },
|
|
|
|
{ "0 0 10 10 10 0 0 10", SkPath::kConcave_Convexity },
|
|
|
|
{ "0 0 10 0 0 10 -10 -10", SkPath::kConcave_Convexity },
|
|
|
|
};
|
|
|
|
|
|
|
|
for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) {
|
|
|
|
SkPath path;
|
|
|
|
setFromString(&path, gRec[i].fPathStr);
|
|
|
|
SkPath::Convexity c = SkPath::ComputeConvexity(path);
|
|
|
|
REPORTER_ASSERT(reporter, c == gRec[i].fExpectedConvexity);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-26 19:54:45 +00:00
|
|
|
// Simple isRect test is inline TestPath, below.
|
|
|
|
// test_isRect provides more extensive testing.
|
|
|
|
static void test_isRect(skiatest::Reporter* reporter) {
|
|
|
|
// passing tests (all moveTo / lineTo...
|
|
|
|
SkPoint r1[] = {{0, 0}, {1, 0}, {1, 1}, {0, 1}};
|
|
|
|
SkPoint r2[] = {{1, 0}, {1, 1}, {0, 1}, {0, 0}};
|
|
|
|
SkPoint r3[] = {{1, 1}, {0, 1}, {0, 0}, {1, 0}};
|
|
|
|
SkPoint r4[] = {{0, 1}, {0, 0}, {1, 0}, {1, 1}};
|
|
|
|
SkPoint r5[] = {{0, 0}, {0, 1}, {1, 1}, {1, 0}};
|
|
|
|
SkPoint r6[] = {{0, 1}, {1, 1}, {1, 0}, {0, 0}};
|
|
|
|
SkPoint r7[] = {{1, 1}, {1, 0}, {0, 0}, {0, 1}};
|
|
|
|
SkPoint r8[] = {{1, 0}, {0, 0}, {0, 1}, {1, 1}};
|
|
|
|
SkPoint r9[] = {{0, 1}, {1, 1}, {1, 0}, {0, 0}};
|
|
|
|
SkPoint ra[] = {{0, 0}, {0, .5f}, {0, 1}, {.5f, 1}, {1, 1}, {1, .5f},
|
|
|
|
{1, 0}, {.5f, 0}};
|
|
|
|
SkPoint rb[] = {{0, 0}, {.5f, 0}, {1, 0}, {1, .5f}, {1, 1}, {.5f, 1},
|
|
|
|
{0, 1}, {0, .5f}};
|
|
|
|
SkPoint rc[] = {{0, 0}, {1, 0}, {1, 1}, {0, 1}, {0, 0}};
|
|
|
|
SkPoint rd[] = {{0, 0}, {0, 1}, {1, 1}, {1, 0}, {0, 0}};
|
|
|
|
SkPoint re[] = {{0, 0}, {1, 0}, {1, 0}, {1, 1}, {0, 1}};
|
|
|
|
|
|
|
|
// failing tests
|
|
|
|
SkPoint f1[] = {{0, 0}, {1, 0}, {1, 1}}; // too few points
|
|
|
|
SkPoint f2[] = {{0, 0}, {1, 1}, {0, 1}, {1, 0}}; // diagonal
|
|
|
|
SkPoint f3[] = {{0, 0}, {1, 0}, {1, 1}, {0, 1}, {0, 0}, {1, 0}}; // wraps
|
|
|
|
SkPoint f4[] = {{0, 0}, {1, 0}, {0, 0}, {1, 0}, {1, 1}, {0, 1}}; // backs up
|
|
|
|
SkPoint f5[] = {{0, 0}, {1, 0}, {1, 1}, {2, 0}}; // end overshoots
|
|
|
|
SkPoint f6[] = {{0, 0}, {1, 0}, {1, 1}, {0, 1}, {0, 2}}; // end overshoots
|
|
|
|
SkPoint f7[] = {{0, 0}, {1, 0}, {1, 1}, {0, 2}}; // end overshoots
|
|
|
|
SkPoint f8[] = {{0, 0}, {1, 0}, {1, 1}, {1, 0}}; // 'L'
|
|
|
|
|
|
|
|
// failing, no close
|
|
|
|
SkPoint c1[] = {{0, 0}, {1, 0}, {1, 1}, {0, 1}}; // close doesn't match
|
|
|
|
SkPoint c2[] = {{0, 0}, {1, 0}, {1, 2}, {0, 2}, {0, 1}}; // ditto
|
|
|
|
|
|
|
|
size_t testLen[] = {
|
|
|
|
sizeof(r1), sizeof(r2), sizeof(r3), sizeof(r4), sizeof(r5), sizeof(r6),
|
|
|
|
sizeof(r7), sizeof(r8), sizeof(r9), sizeof(ra), sizeof(rb), sizeof(rc),
|
|
|
|
sizeof(rd), sizeof(re),
|
|
|
|
sizeof(f1), sizeof(f2), sizeof(f3), sizeof(f4), sizeof(f5), sizeof(f6),
|
|
|
|
sizeof(f7), sizeof(f8),
|
|
|
|
sizeof(c1), sizeof(c2)
|
|
|
|
};
|
|
|
|
SkPoint* tests[] = {
|
|
|
|
r1, r2, r3, r4, r5, r6, r7, r8, r9, ra, rb, rc, rd, re,
|
|
|
|
f1, f2, f3, f4, f5, f6, f7, f8,
|
|
|
|
c1, c2
|
|
|
|
};
|
|
|
|
SkPoint* lastPass = re;
|
|
|
|
SkPoint* lastClose = f8;
|
|
|
|
bool fail = false;
|
|
|
|
bool close = true;
|
|
|
|
const size_t testCount = sizeof(tests) / sizeof(tests[0]);
|
|
|
|
size_t index;
|
|
|
|
for (size_t testIndex = 0; testIndex < testCount; ++testIndex) {
|
|
|
|
SkPath path;
|
|
|
|
path.moveTo(tests[testIndex][0].fX, tests[testIndex][0].fY);
|
|
|
|
for (index = 1; index < testLen[testIndex] / sizeof(SkPoint); ++index) {
|
|
|
|
path.lineTo(tests[testIndex][index].fX, tests[testIndex][index].fY);
|
|
|
|
}
|
|
|
|
if (close) {
|
|
|
|
path.close();
|
|
|
|
}
|
|
|
|
REPORTER_ASSERT(reporter, fail ^ path.isRect(0));
|
|
|
|
if (tests[testIndex] == lastPass) {
|
|
|
|
fail = true;
|
|
|
|
}
|
|
|
|
if (tests[testIndex] == lastClose) {
|
|
|
|
close = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// fail, close then line
|
|
|
|
SkPath path1;
|
|
|
|
path1.moveTo(r1[0].fX, r1[0].fY);
|
|
|
|
for (index = 1; index < testLen[0] / sizeof(SkPoint); ++index) {
|
|
|
|
path1.lineTo(r1[index].fX, r1[index].fY);
|
|
|
|
}
|
|
|
|
path1.close();
|
|
|
|
path1.lineTo(1, 0);
|
|
|
|
REPORTER_ASSERT(reporter, fail ^ path1.isRect(0));
|
|
|
|
|
|
|
|
// fail, move in the middle
|
|
|
|
path1.reset();
|
|
|
|
path1.moveTo(r1[0].fX, r1[0].fY);
|
|
|
|
for (index = 1; index < testLen[0] / sizeof(SkPoint); ++index) {
|
|
|
|
if (index == 2) {
|
|
|
|
path1.moveTo(1, .5f);
|
|
|
|
}
|
|
|
|
path1.lineTo(r1[index].fX, r1[index].fY);
|
|
|
|
}
|
|
|
|
path1.close();
|
|
|
|
REPORTER_ASSERT(reporter, fail ^ path1.isRect(0));
|
|
|
|
|
|
|
|
// fail, move on the edge
|
|
|
|
path1.reset();
|
|
|
|
for (index = 1; index < testLen[0] / sizeof(SkPoint); ++index) {
|
|
|
|
path1.moveTo(r1[index - 1].fX, r1[index - 1].fY);
|
|
|
|
path1.lineTo(r1[index].fX, r1[index].fY);
|
|
|
|
}
|
|
|
|
path1.close();
|
|
|
|
REPORTER_ASSERT(reporter, fail ^ path1.isRect(0));
|
|
|
|
|
|
|
|
// fail, quad
|
|
|
|
path1.reset();
|
|
|
|
path1.moveTo(r1[0].fX, r1[0].fY);
|
|
|
|
for (index = 1; index < testLen[0] / sizeof(SkPoint); ++index) {
|
|
|
|
if (index == 2) {
|
|
|
|
path1.quadTo(1, .5f, 1, .5f);
|
|
|
|
}
|
|
|
|
path1.lineTo(r1[index].fX, r1[index].fY);
|
|
|
|
}
|
|
|
|
path1.close();
|
|
|
|
REPORTER_ASSERT(reporter, fail ^ path1.isRect(0));
|
|
|
|
|
|
|
|
// fail, cubic
|
|
|
|
path1.reset();
|
|
|
|
path1.moveTo(r1[0].fX, r1[0].fY);
|
|
|
|
for (index = 1; index < testLen[0] / sizeof(SkPoint); ++index) {
|
|
|
|
if (index == 2) {
|
|
|
|
path1.cubicTo(1, .5f, 1, .5f, 1, .5f);
|
|
|
|
}
|
|
|
|
path1.lineTo(r1[index].fX, r1[index].fY);
|
|
|
|
}
|
|
|
|
path1.close();
|
|
|
|
REPORTER_ASSERT(reporter, fail ^ path1.isRect(0));
|
|
|
|
}
|
|
|
|
|
2011-09-21 19:05:12 +00:00
|
|
|
static void test_flattening(skiatest::Reporter* reporter) {
|
|
|
|
SkPath p;
|
|
|
|
|
|
|
|
static const SkPoint pts[] = {
|
|
|
|
{ 0, 0 },
|
|
|
|
{ SkIntToScalar(10), SkIntToScalar(10) },
|
|
|
|
{ SkIntToScalar(20), SkIntToScalar(10) }, { SkIntToScalar(20), 0 },
|
|
|
|
{ 0, 0 }, { 0, SkIntToScalar(10) }, { SkIntToScalar(1), SkIntToScalar(10) }
|
|
|
|
};
|
|
|
|
p.moveTo(pts[0]);
|
|
|
|
p.lineTo(pts[1]);
|
|
|
|
p.quadTo(pts[2], pts[3]);
|
|
|
|
p.cubicTo(pts[4], pts[5], pts[6]);
|
|
|
|
|
|
|
|
SkWriter32 writer(100);
|
|
|
|
p.flatten(writer);
|
|
|
|
size_t size = writer.size();
|
|
|
|
SkAutoMalloc storage(size);
|
|
|
|
writer.flatten(storage.get());
|
|
|
|
SkReader32 reader(storage.get(), size);
|
|
|
|
|
|
|
|
SkPath p1;
|
|
|
|
REPORTER_ASSERT(reporter, p1 != p);
|
|
|
|
p1.unflatten(reader);
|
|
|
|
REPORTER_ASSERT(reporter, p1 == p);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_transform(skiatest::Reporter* reporter) {
|
|
|
|
SkPath p, p1;
|
|
|
|
|
|
|
|
static const SkPoint pts[] = {
|
|
|
|
{ 0, 0 },
|
|
|
|
{ SkIntToScalar(10), SkIntToScalar(10) },
|
|
|
|
{ SkIntToScalar(20), SkIntToScalar(10) }, { SkIntToScalar(20), 0 },
|
|
|
|
{ 0, 0 }, { 0, SkIntToScalar(10) }, { SkIntToScalar(1), SkIntToScalar(10) }
|
|
|
|
};
|
|
|
|
p.moveTo(pts[0]);
|
|
|
|
p.lineTo(pts[1]);
|
|
|
|
p.quadTo(pts[2], pts[3]);
|
|
|
|
p.cubicTo(pts[4], pts[5], pts[6]);
|
|
|
|
|
|
|
|
SkMatrix matrix;
|
|
|
|
matrix.reset();
|
|
|
|
p.transform(matrix, &p1);
|
|
|
|
REPORTER_ASSERT(reporter, p == p1);
|
|
|
|
|
|
|
|
matrix.setScale(SK_Scalar1 * 2, SK_Scalar1 * 3);
|
|
|
|
p.transform(matrix, &p1);
|
|
|
|
SkPoint pts1[7];
|
|
|
|
int count = p1.getPoints(pts1, 7);
|
|
|
|
REPORTER_ASSERT(reporter, 7 == count);
|
|
|
|
for (int i = 0; i < count; ++i) {
|
|
|
|
SkPoint newPt = SkPoint::Make(pts[i].fX * 2, pts[i].fY * 3);
|
|
|
|
REPORTER_ASSERT(reporter, newPt == pts1[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
static void test_zero_length_paths(skiatest::Reporter* reporter) {
|
|
|
|
SkPath p;
|
|
|
|
SkRect bounds;
|
|
|
|
|
|
|
|
// Lone moveTo case
|
|
|
|
p.moveTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
bounds.set(0, 0, 0, 0);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 1 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// MoveTo-MoveTo case
|
|
|
|
p.moveTo(SK_Scalar1*2, SK_Scalar1);
|
|
|
|
bounds.set(1, 1, 2, 1);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 2 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-close case
|
|
|
|
p.reset();
|
|
|
|
p.moveTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
p.close();
|
|
|
|
bounds.set(0, 0, 0, 0);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 1 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-close-moveTo-close case
|
|
|
|
p.moveTo(SK_Scalar1*2, SK_Scalar1);
|
|
|
|
p.close();
|
|
|
|
bounds.set(1, 1, 2, 1);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 2 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-line case
|
|
|
|
p.reset();
|
|
|
|
p.moveTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
p.lineTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
bounds.set(SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_Scalar1);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 2 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-lineTo-moveTo-lineTo case
|
|
|
|
p.moveTo(SK_Scalar1*2, SK_Scalar1);
|
|
|
|
p.lineTo(SK_Scalar1*2, SK_Scalar1);
|
|
|
|
bounds.set(SK_Scalar1, SK_Scalar1, SK_Scalar1*2, SK_Scalar1);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 4 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-line-close case
|
|
|
|
p.reset();
|
|
|
|
p.moveTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
p.lineTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
p.close();
|
|
|
|
bounds.set(SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_Scalar1);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 2 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-line-close-moveTo-line-close case
|
|
|
|
p.moveTo(SK_Scalar1*2, SK_Scalar1);
|
|
|
|
p.lineTo(SK_Scalar1*2, SK_Scalar1);
|
|
|
|
p.close();
|
|
|
|
bounds.set(SK_Scalar1, SK_Scalar1, SK_Scalar1*2, SK_Scalar1);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 4 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-quadTo case
|
|
|
|
p.reset();
|
|
|
|
p.moveTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
p.quadTo(SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_Scalar1);
|
|
|
|
bounds.set(SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_Scalar1);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 3 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-quadTo-close case
|
|
|
|
p.close();
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 3 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-quadTo-moveTo-quadTo case
|
|
|
|
p.reset();
|
|
|
|
p.moveTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
p.quadTo(SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_Scalar1);
|
|
|
|
p.moveTo(SK_Scalar1*2, SK_Scalar1);
|
|
|
|
p.quadTo(SK_Scalar1*2, SK_Scalar1, SK_Scalar1*2, SK_Scalar1);
|
|
|
|
bounds.set(SK_Scalar1, SK_Scalar1, SK_Scalar1*2, SK_Scalar1);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 6 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-cubicTo case
|
|
|
|
p.reset();
|
|
|
|
p.moveTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
p.cubicTo(SK_Scalar1, SK_Scalar1,
|
|
|
|
SK_Scalar1, SK_Scalar1,
|
|
|
|
SK_Scalar1, SK_Scalar1);
|
|
|
|
bounds.set(SK_Scalar1, SK_Scalar1, SK_Scalar1, SK_Scalar1);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 4 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-quadTo-close case
|
|
|
|
p.close();
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 4 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
|
|
|
|
// moveTo-quadTo-moveTo-quadTo case
|
|
|
|
p.reset();
|
|
|
|
p.moveTo(SK_Scalar1, SK_Scalar1);
|
|
|
|
p.cubicTo(SK_Scalar1, SK_Scalar1,
|
|
|
|
SK_Scalar1, SK_Scalar1,
|
|
|
|
SK_Scalar1, SK_Scalar1);
|
|
|
|
p.moveTo(SK_Scalar1*2, SK_Scalar1);
|
|
|
|
p.cubicTo(SK_Scalar1*2, SK_Scalar1,
|
|
|
|
SK_Scalar1*2, SK_Scalar1,
|
|
|
|
SK_Scalar1*2, SK_Scalar1);
|
|
|
|
bounds.set(SK_Scalar1, SK_Scalar1, SK_Scalar1*2, SK_Scalar1);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
|
|
|
REPORTER_ASSERT(reporter, 8 == p.countPoints());
|
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
|
|
|
}
|
|
|
|
|
|
|
|
struct SegmentInfo {
|
|
|
|
SkPath fPath;
|
|
|
|
int fPointCount;
|
|
|
|
};
|
|
|
|
|
2011-09-21 12:29:05 +00:00
|
|
|
#define kCurveSegmentMask (SkPath::kQuad_SegmentMask | SkPath::kCubic_SegmentMask)
|
|
|
|
|
2011-05-15 04:08:24 +00:00
|
|
|
void TestPath(skiatest::Reporter* reporter);
|
|
|
|
void TestPath(skiatest::Reporter* reporter) {
|
2010-02-11 11:09:39 +00:00
|
|
|
{
|
|
|
|
SkSize size;
|
|
|
|
size.fWidth = 3.4f;
|
|
|
|
size.width();
|
|
|
|
size = SkSize::Make(3,4);
|
|
|
|
SkISize isize = SkISize::Make(3,4);
|
|
|
|
}
|
|
|
|
|
|
|
|
SkTSize<SkScalar>::Make(3,4);
|
|
|
|
|
2009-03-02 05:36:20 +00:00
|
|
|
SkPath p, p2;
|
|
|
|
SkRect bounds, bounds2;
|
2009-04-02 16:59:40 +00:00
|
|
|
|
2009-03-02 05:36:20 +00:00
|
|
|
REPORTER_ASSERT(reporter, p.isEmpty());
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
REPORTER_ASSERT(reporter, 0 == p.countPoints());
|
2011-09-21 12:29:05 +00:00
|
|
|
REPORTER_ASSERT(reporter, 0 == p.getSegmentMasks());
|
2011-05-16 14:16:04 +00:00
|
|
|
REPORTER_ASSERT(reporter, p.isConvex());
|
2009-03-02 05:36:20 +00:00
|
|
|
REPORTER_ASSERT(reporter, p.getFillType() == SkPath::kWinding_FillType);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isInverseFillType());
|
|
|
|
REPORTER_ASSERT(reporter, p == p2);
|
|
|
|
REPORTER_ASSERT(reporter, !(p != p2));
|
|
|
|
|
2009-04-01 18:31:44 +00:00
|
|
|
REPORTER_ASSERT(reporter, p.getBounds().isEmpty());
|
2009-04-02 16:59:40 +00:00
|
|
|
|
2009-03-02 05:36:20 +00:00
|
|
|
bounds.set(0, 0, SK_Scalar1, SK_Scalar1);
|
2009-06-03 02:35:01 +00:00
|
|
|
|
|
|
|
p.addRoundRect(bounds, SK_Scalar1, SK_Scalar1);
|
|
|
|
check_convex_bounds(reporter, p, bounds);
|
2011-09-21 12:29:05 +00:00
|
|
|
// we have quads or cubics
|
|
|
|
REPORTER_ASSERT(reporter, p.getSegmentMasks() & kCurveSegmentMask);
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
2011-02-07 19:39:09 +00:00
|
|
|
|
2009-06-03 02:35:01 +00:00
|
|
|
p.reset();
|
2011-09-21 12:29:05 +00:00
|
|
|
REPORTER_ASSERT(reporter, 0 == p.getSegmentMasks());
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
REPORTER_ASSERT(reporter, p.isEmpty());
|
2011-09-21 12:29:05 +00:00
|
|
|
|
2009-06-03 02:35:01 +00:00
|
|
|
p.addOval(bounds);
|
|
|
|
check_convex_bounds(reporter, p, bounds);
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
2011-02-07 19:39:09 +00:00
|
|
|
|
2009-06-03 02:35:01 +00:00
|
|
|
p.reset();
|
2009-03-02 05:36:20 +00:00
|
|
|
p.addRect(bounds);
|
2009-06-03 02:35:01 +00:00
|
|
|
check_convex_bounds(reporter, p, bounds);
|
2011-09-21 12:29:05 +00:00
|
|
|
// we have only lines
|
|
|
|
REPORTER_ASSERT(reporter, SkPath::kLine_SegmentMask == p.getSegmentMasks());
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
2009-03-02 05:36:20 +00:00
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, p != p2);
|
|
|
|
REPORTER_ASSERT(reporter, !(p == p2));
|
|
|
|
|
|
|
|
// does getPoints return the right result
|
|
|
|
REPORTER_ASSERT(reporter, p.getPoints(NULL, 5) == 4);
|
|
|
|
SkPoint pts[4];
|
|
|
|
int count = p.getPoints(pts, 4);
|
|
|
|
REPORTER_ASSERT(reporter, count == 4);
|
|
|
|
bounds2.set(pts, 4);
|
|
|
|
REPORTER_ASSERT(reporter, bounds == bounds2);
|
2009-04-02 16:59:40 +00:00
|
|
|
|
2009-03-02 05:36:20 +00:00
|
|
|
bounds.offset(SK_Scalar1*3, SK_Scalar1*4);
|
|
|
|
p.offset(SK_Scalar1*3, SK_Scalar1*4);
|
2009-04-01 18:31:44 +00:00
|
|
|
REPORTER_ASSERT(reporter, bounds == p.getBounds());
|
2009-03-02 05:36:20 +00:00
|
|
|
|
|
|
|
REPORTER_ASSERT(reporter, p.isRect(NULL));
|
2011-07-26 19:54:45 +00:00
|
|
|
bounds2.setEmpty();
|
2009-03-02 05:36:20 +00:00
|
|
|
REPORTER_ASSERT(reporter, p.isRect(&bounds2));
|
|
|
|
REPORTER_ASSERT(reporter, bounds == bounds2);
|
2009-04-02 16:59:40 +00:00
|
|
|
|
2009-03-02 05:36:20 +00:00
|
|
|
// now force p to not be a rect
|
|
|
|
bounds.set(0, 0, SK_Scalar1/2, SK_Scalar1/2);
|
|
|
|
p.addRect(bounds);
|
|
|
|
REPORTER_ASSERT(reporter, !p.isRect(NULL));
|
2011-07-26 19:54:45 +00:00
|
|
|
test_isRect(reporter);
|
2009-03-02 05:36:20 +00:00
|
|
|
|
|
|
|
SkPoint pt;
|
|
|
|
|
|
|
|
p.moveTo(SK_Scalar1, 0);
|
|
|
|
p.getLastPt(&pt);
|
|
|
|
REPORTER_ASSERT(reporter, pt.fX == SK_Scalar1);
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
2011-02-07 19:39:09 +00:00
|
|
|
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
test_zero_length_paths(reporter);
|
2011-05-15 04:08:24 +00:00
|
|
|
test_convexity(reporter);
|
2011-05-15 04:38:34 +00:00
|
|
|
test_convexity2(reporter);
|
2011-07-13 17:44:36 +00:00
|
|
|
test_close(reporter);
|
2011-09-21 12:29:05 +00:00
|
|
|
|
|
|
|
p.reset();
|
|
|
|
p.moveTo(0, 0);
|
|
|
|
p.quadTo(100, 100, 200, 200);
|
|
|
|
REPORTER_ASSERT(reporter, SkPath::kQuad_SegmentMask == p.getSegmentMasks());
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
2011-09-21 12:29:05 +00:00
|
|
|
p.cubicTo(100, 100, 200, 200, 300, 300);
|
|
|
|
REPORTER_ASSERT(reporter, kCurveSegmentMask == p.getSegmentMasks());
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
2011-09-21 12:29:05 +00:00
|
|
|
p.reset();
|
|
|
|
p.moveTo(0, 0);
|
|
|
|
p.cubicTo(100, 100, 200, 200, 300, 300);
|
|
|
|
REPORTER_ASSERT(reporter, SkPath::kCubic_SegmentMask == p.getSegmentMasks());
|
Modifying SkPath to store all verbs provided by the user, and to give
correct results for all stroke and fill modes even on the various types
of degenerate paths.
The goals of this patch include:
1. Have Skia store all of the verbs implied by path construction methods, even
if those define degenerate paths. The SVG implementation in WebKit, which is
backed by Skia, needs to know about all elements of the path, even degenerate
ones, for the correct drawing of markers and line caps. For example, in SVG you
should be able to draw a scatter plot by specifying a marker for vertices and
then giving a sequence of moveTo commands. Skia will not store the moveTos,
requiring a different storage mechanism.
2. Assuming 1, maintain the current Skia behavior. That is, make Skia robust to
degenerate paths.
3. Fix an existing bug in Skia where a degenerate moveTo-lineTo pair spits out
warnings from rasterization and produces incorrect results in inverse-fill
renderings.
4. Adds extensive testing for degenerate paths and path rendering in general.
To meet these goals, the patch I am proposing will result in minor additional
storage for degenerate paths (a few bytes per degenerate path, only if the user
defines such paths). There is also some additional overhead in the iteration
code, with the path now cleaned to remove degenerate segments as part of the
iteration process. I suspect this will also fix issues with computing normal
vectors to degenerate segments. Benchmarking suggests that this change may
result in slightly (< 1%) slower path drawing due to the checks for
degeneracy. This overhead could be removed (in fact, a significant speedup
could occur) if the results of iterating to clean up the path were cached.
This would cost memory, of course, and quite a bit of it.
BUG=398
TEST=tests/PathTest.cpp
gm/cubicpaths.cpp
gm/degeneratesegments.cpp
gm/movepaths.cpp
gm/linepaths.cpp
gm/quadpaths.cpp
Review URL: http://codereview.appspot.com/5482051
git-svn-id: http://skia.googlecode.com/svn/trunk@2901 2bbb7eff-a529-9590-31e7-b0007b416f81
2011-12-20 15:14:18 +00:00
|
|
|
REPORTER_ASSERT(reporter, !p.isEmpty());
|
2011-09-21 19:05:12 +00:00
|
|
|
|
|
|
|
test_flattening(reporter);
|
|
|
|
test_transform(reporter);
|
2011-11-14 19:34:57 +00:00
|
|
|
test_bounds(reporter);
|
2009-03-02 05:36:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#include "TestClassDef.h"
|
|
|
|
DEFINE_TESTCLASS("Path", PathTestClass, TestPath)
|