#endif
};
-bool AlmostEqualUlps(float A, float B, int maxUlpsDiff)
+bool AlmostEqualUlps(float A, float B)
{
Float_t uA(A);
Float_t uB(B);
// Find the difference in ULPs.
int ulpsDiff = abs(uA.i - uB.i);
- return ulpsDiff <= maxUlpsDiff;
+ return ulpsDiff <= UlpsEpsilon;
}
+// FIXME: obsolete, delete
+#if 1
int UlpsDiff(float A, float B)
{
Float_t uA(A);
Float_t uA(A);
return uA.i;
}
-
+#endif
#include <strings.h>
#include <sys/types.h>
-bool AlmostEqualUlps(float A, float B, int maxUlpsDiff);
+extern bool AlmostEqualUlps(float A, float B);
+// FIXME: delete
int UlpsDiff(float A, float B);
int FloatAsInt(float A);
-#define USE_EPSILON 0
-
-#if USE_EPSILON
-extern const double PointEpsilon;
-extern const double SquaredEpsilon;
-
-inline bool approximately_equal(double x, double y) {
- return fabs(x - y) < PointEpsilon;
-}
-
-inline bool approximately_equal_squared(double x, double y) {
- return fabs(x - y) < SquaredEpsilon;
-}
-
-inline bool approximately_greater(double x, double y) {
- return x > y - PointEpsilon;
-}
-
-inline bool approximately_lesser(double x, double y) {
- return x < y + PointEpsilon;
-}
-
-inline bool approximately_zero(double x) {
- return fabs(x) < PointEpsilon;
-}
-
-inline bool approximately_zero_squared(double x) {
- return fabs(x) < SquaredEpsilon;
-}
-
-inline bool approximately_negative(double x) {
- return x < PointEpsilon;
-}
-#else
-extern const int UlpsEpsilon;
-
#if defined(IN_TEST)
// FIXME: move to test-only header
const double PointEpsilon = 0.000001;
}
inline bool approximately_equal(double x, double y) {
- if (approximately_zero(x - y)) {
- return true;
- }
- // FIXME: since no other function uses ULPS, this one shouldn't either
- return AlmostEqualUlps((float) x, (float) y, UlpsEpsilon);
+ return approximately_zero(x - y);
}
inline bool approximately_equal_squared(double x, double y) {
return (a - b) * (c - b) <= 0;
}
-#endif
-
struct _Point {
double x;
double y;
return a.x!= b.x || a.y != b.y;
}
+ // note: this can not be implemented with
+ // return approximately_equal(a.y, y) && approximately_equal(a.x, x);
+ // because that will not take the magnitude of the values
bool approximatelyEqual(const _Point& a) const {
- return approximately_equal(a.y, y) && approximately_equal(a.x, x);
+ return AlmostEqualUlps((float) x, (float) a.x)
+ && AlmostEqualUlps((float) y, (float) a.y);
}
};
}
static void tryRonco(const SkPath& path) {
- int divMax = 17;
+ int divMax = 64;
int divMin = 1;
int xDivMin = 0;
int yDivMin = 0;
bool allYs = true;
bool allXs = true;
if (1) {
- divMax = divMin = 3;
- xDivMin = 0;
+ divMax = divMin = 64;
+ xDivMin = 11;
yDivMin = 0;
allXs = true;
allYs = true;
}
- for (int divs = divMax; divs >= divMin; divs -= 2) {
+ for (int divs = divMax; divs >= divMin; divs /= 2) {
SkDebugf("divs=%d\n",divs);
const SkRect& overall = path.getBounds();
SkScalar cellWidth = overall.width() / divs * 2;
for (int mask = 0; mask < 1 << testStrLen; ++mask) {
char maskStr[testStrLen];
#if 1
- mask = 3;
+ mask = 12;
oneShot = true;
#endif
SkDebugf("mask=%d\n", mask);
}
#endif
paint.getPosTextPath(testStr, testStrLen, textPos, &path);
-#if 1
+#if 0
tryRonco(path);
SkDebugf("RoncoDone!\n");
#endif
SkSampleView() {
this->setVisibleP(true);
this->setClipToBounds(false);
- useOld = true;
+ useOld = false;
};
protected:
virtual void onDraw(SkCanvas* canvas) {
- static int step = 9658; // 17909 ; // drawLetters first error
- // drawStars triggers error at 23275
+ static int step = 17907; // 17907 drawLetters first error
+ // drawStars triggers error at 33348
// drawStars error not easy to debug last time I checked
static double seconds;
if (step == -1) {
canvas->drawColor(SK_ColorWHITE);
if (DrawEdgeDemo(canvas, step, useOld)) {
++step;
- if (step == 23270) {
+ if (step == -1) {
timeval t;
gettimeofday(&t, NULL);
double last = seconds;
void Intersection_Tests() {
int testsRun = 0;
SimplifyNew_Test();
+ QuadraticIntersection_Test();
LineQuadraticIntersection_Test();
MiniSimplify_Test();
- QuadraticIntersection_Test();
SimplifyAngle_Test();
QuarticRoot_Test();
- // QuadraticIntersection_Test();
Simplify4x4QuadraticsThreaded_Test(testsRun);
QuadLineIntersectThreaded_Test(testsRun);
Simplify4x4RectsThreaded_Test(testsRun);
return result;
}
+static struct oneLineQuad {
+ Quadratic quad;
+ _Line line;
+} oneOffs[] = {
+ {{{369.848602,145.680267}, {382.360413,121.298294}, {406.207703,121.298294}},
+ {{406.207703,121.298294}, {348.781738,123.864815}}}
+ };
+
+static size_t oneOffs_count = sizeof(oneOffs) / sizeof(oneOffs[0]);
+
+
+static void testOneOffs() {
+ Intersections intersections;
+ bool flipped = false;
+ for (size_t index = 0; index < oneOffs_count; ++index) {
+ const Quadratic& quad = oneOffs[index].quad;
+ const _Line& line = oneOffs[index].line;
+ int result = doIntersect(intersections, quad, line, flipped);
+ for (int inner = 0; inner < result; ++inner) {
+ double quadT = intersections.fT[0][inner];
+ double quadX, quadY;
+ xy_at_t(quad, quadT, quadX, quadY);
+ double lineT = intersections.fT[1][inner];
+ double lineX, lineY;
+ xy_at_t(line, lineT, lineX, lineY);
+ assert(approximately_equal(quadX, lineX)
+ && approximately_equal(quadY, lineY));
+ }
+ }
+}
+
void LineQuadraticIntersection_Test() {
+ if (1) {
+ testOneOffs();
+ }
for (size_t index = firstLineQuadIntersectionTest; index < lineQuadTests_count; ++index) {
const Quadratic& quad = lineQuadTests[index].quad;
const _Line& line = lineQuadTests[index].line;
assert(rootCount == rootCount2);
addValidRoots(roots1, rootCount, 0, i);
addValidRoots(roots2, rootCount, 1, i);
+ if (i.insertBalanced() && i.fUsed <= 1) {
+ if (i.fUsed == 1) {
+ _Point xy1, xy2;
+ xy_at_t(q1, i.fT[0][0], xy1.x, xy1.y);
+ xy_at_t(q2, i.fT[1][0], xy2.x, xy2.y);
+ if (!xy1.approximatelyEqual(xy2)) {
+ --i.fUsed;
+ --i.fUsed2;
+ }
+ }
+ return i.intersected();
+ }
_Point pts[4];
bool matches[4];
int flipCheck[4];
+ int closest[4];
+ double dist[4];
int index, ndex2;
int flipIndex = 0;
for (ndex2 = 0; ndex2 < i.fUsed2; ++ndex2) {
xy_at_t(q2, i.fT[1][ndex2], pts[ndex2].x, pts[ndex2].y);
matches[ndex2] = false;
}
- for (index = 0; index < i.fUsed; ) {
+ for (index = 0; index < i.fUsed; ++index) {
_Point xy;
xy_at_t(q1, i.fT[0][index], xy.x, xy.y);
+ dist[index] = DBL_MAX;
+ closest[index] = -1;
+ for (ndex2 = 0; ndex2 < i.fUsed2; ++ndex2) {
+ if (!pts[ndex2].approximatelyEqual(xy)) {
+ continue;
+ }
+ double dx = pts[ndex2].x - xy.x;
+ double dy = pts[ndex2].y - xy.y;
+ double distance = dx * dx + dy * dy;
+ if (dist[index] <= distance) {
+ continue;
+ }
+ for (int outer = 0; outer < index; ++outer) {
+ if (closest[outer] != ndex2) {
+ continue;
+ }
+ if (dist[outer] < distance) {
+ goto next;
+ }
+ closest[outer] = -1;
+ }
+ dist[index] = distance;
+ closest[index] = ndex2;
+ next:
+ ;
+ }
+ }
+ for (index = 0; index < i.fUsed; ) {
for (ndex2 = 0; ndex2 < i.fUsed2; ++ndex2) {
- if (approximately_equal(pts[ndex2].x, xy.x) && approximately_equal(pts[ndex2].y, xy.y)) {
+ if (closest[index] == ndex2) {
assert(flipIndex < 4);
flipCheck[flipIndex++] = ndex2;
matches[ndex2] = true;
- goto next;
+ goto next2;
}
}
if (--i.fUsed > index) {
memmove(&i.fT[0][index], &i.fT[0][index + 1], (i.fUsed - index) * sizeof(i.fT[0][0]));
+ memmove(&closest[index], &closest[index + 1], (i.fUsed - index) * sizeof(closest[0]));
continue;
}
- next:
+ next2:
++index;
}
for (ndex2 = 0; ndex2 < i.fUsed2; ) {
}
static const Quadratic testSet[] = {
+{{369.848602,145.680267}, {382.360413,121.298294}, {406.207703,121.298294}},
+{{369.961151,137.980698}, {383.970093,121.298294}, {406.213287,121.298294}},
+{{353.2948,194.351074}, {353.2948,173.767563}, {364.167572,160.819855}},
+{{360.416077,166.795715}, {370.126831,147.872162}, {388.635406,147.872162}},
+{{406.236359,121.254936}, {409.445679,121.254936}, {412.975952,121.789818}},
+{{406.235992,121.254936}, {425.705902,121.254936}, {439.71994,137.087616}},
{{369.8543701171875, 145.66734313964844}, {382.36788940429688, 121.28203582763672}, {406.21844482421875, 121.28203582763672}},
{{369.96469116210938, 137.96672058105469}, {383.97555541992188, 121.28203582763672}, {406.2218017578125, 121.28203582763672}},
for (int pt = 0; pt < intersections2.coincidentUsed(); ++pt) {
double tt1 = intersections2.fT[0][pt];
double tt2 = intersections2.fT[1][pt];
- // SkASSERT(approximately_equal(intersections.fT[0][pt], tt1));
- // SkASSERT(approximately_equal(intersections.fT[1][pt], tt2));
+ SkASSERT(approximately_equal(1, tt1) || approximately_zero(tt1));
+ SkASSERT(approximately_equal(1, tt2) || approximately_zero(tt2));
}
}
}
double r;
double* roots = s;
- if (R2MinusQ3 > -FLT_EPSILON / 10 && R2MinusQ3 < FLT_EPSILON / 10 ) {
+ if (approximately_zero_squared(R2MinusQ3)) {
if (approximately_zero(R)) {/* one triple solution */
*roots++ = -adiv3;
} else { /* one single and one double solution */
s[num++] = 0;
return num;
}
- if (approximately_zero(A + B + C + D + E)) { // 1 is one root
+ if (approximately_zero_squared(A + B + C + D + E)) { // 1 is one root
num = cubicRootsX(A, A + B, -(D + E), -E, s); // note that -C==A+B+D+E
for (i = 0; i < num; ++i) {
if (approximately_equal(s[i], 1)) {
#define PRECISE_T_SORT 1
#define SORTABLE_CONTOURS 0 // set to 1 for old code that works most of the time
#define PIN_ADD_T 0
+#define TRY_ROTATE 1
#define DEBUG_UNUSED 0 // set to expose unused functions
#define FORCE_RELEASE 0
&& xyAtT(&span[-1]) == xyAtT(span)) {
span[-1].fTiny = true;
span[-1].fDone = true;
- span[-1].fUnsortableStart = approximately_negative(newT - span[-1].fT)
- && approximately_greater_than_one(newT);
+ if (approximately_negative(newT - span[-1].fT)) {
+ if (approximately_greater_than_one(newT)) {
+ span[-1].fUnsortableStart = true;
+ span[-2].fUnsortableEnd = true;
+ }
+ if (approximately_less_than_zero(span[-1].fT)) {
+ span->fUnsortableStart = true;
+ span[-1].fUnsortableEnd = true;
+ }
+ }
++fDoneSpans;
}
if (fTs.end() - span > 1 && !span->fDone
&& xyAtT(&span[1]) == xyAtT(span)) {
span->fTiny = true;
span->fDone = true;
- span->fUnsortableEnd = approximately_negative(span[1].fT - newT)
- && approximately_less_than_zero(newT);
+ if (approximately_negative(span[1].fT - newT)) {
+ if (approximately_greater_than_one(span[1].fT)) {
+ span->fUnsortableStart = true;
+ span[-1].fUnsortableEnd = true;
+ }
+ if (approximately_less_than_zero(newT)) {
+ span[1].fUnsortableStart = true;
+ span->fUnsortableEnd = true;
+ }
+ }
++fDoneSpans;
}
return insertedAt;
const Work& wn, const double wtTs[2], const double wnTs[2]) {
if (!pts) {
SkDebugf("%s no intersect (%1.9g,%1.9g %1.9g,%1.9g %1.9g,%1.9g)"
- " (%1.9g,%1.9g %1.9g,%1.9g %1.9g,%1.9g)\n",
+ " (%1.9g,%1.9g %1.9g,%1.9g)\n",
__FUNCTION__, wt.pts()[0].fX, wt.pts()[0].fY,
wt.pts()[1].fX, wt.pts()[1].fY, wt.pts()[2].fX, wt.pts()[2].fY,
- wn.pts()[0].fX, wn.pts()[0].fY, wn.pts()[1].fX, wn.pts()[1].fY,
- wt.pts()[2].fX, wt.pts()[2].fY );
+ wn.pts()[0].fX, wn.pts()[0].fY, wn.pts()[1].fX, wn.pts()[1].fY);
return;
}
SkPoint wtOutPt, wnOutPt;
wt.pts()[1].fX, wt.pts()[1].fY, wt.pts()[2].fX, wt.pts()[2].fY,
wtOutPt.fX, wtOutPt.fY);
if (pts == 2) {
- SkDebugf(" wtTs[1]=%1.9g", wtTs[1]);
+ QuadXYAtT(wt.pts(), wtTs[1], &wtOutPt);
+ SkDebugf(" wtTs[1]=%1.9g (%1.9g,%1.9g)", wtTs[1], wtOutPt.fX, wtOutPt.fY);
}
SkDebugf(" wnTs[0]=%g (%1.9g,%1.9g %1.9g,%1.9g) (%1.9g,%1.9g)",
wnTs[0], wn.pts()[0].fX, wn.pts()[0].fY,
wn.pts()[1].fX, wn.pts()[1].fY, wnOutPt.fX, wnOutPt.fY);
if (pts == 2) {
- SkDebugf(" wnTs[1]=%1.9g", wnTs[1]);
+ LineXYAtT(wn.pts(), wnTs[1], &wnOutPt);
+ SkDebugf(" wnTs[1]=%1.9g (%1.9g,%1.9g)", wnTs[1], wnOutPt.fX, wnOutPt.fY);
}
SkDebugf("\n");
}
__FUNCTION__, wt.pts()[0].fX, wt.pts()[0].fY,
wt.pts()[1].fX, wt.pts()[1].fY, wt.pts()[2].fX, wt.pts()[2].fY,
wn.pts()[0].fX, wn.pts()[0].fY, wn.pts()[1].fX, wn.pts()[1].fY,
- wt.pts()[2].fX, wt.pts()[2].fY );
+ wn.pts()[2].fX, wn.pts()[2].fY );
return;
}
SkPoint wtOutPt, wnOutPt;
case Work::kQuad_Segment: {
swap = true;
pts = QuadLineIntersect(wn.pts(), wt.pts(), ts);
- debugShowQuadLineIntersection(pts, wt, wn,
- ts.fT[1], ts.fT[0]);
+ debugShowQuadLineIntersection(pts, wn, wt,
+ ts.fT[0], ts.fT[1]);
break;
}
case Work::kCubic_Segment: {
case Work::kLine_Segment: {
pts = QuadLineIntersect(wt.pts(), wn.pts(), ts);
debugShowQuadLineIntersection(pts, wt, wn,
- ts.fT[1], ts.fT[0]);
+ ts.fT[0], ts.fT[1]);
break;
}
case Work::kQuad_Segment: {
pts = QuadIntersect(wt.pts(), wn.pts(), ts);
debugShowQuadIntersection(pts, wt, wn,
- ts.fT[1], ts.fT[0]);
+ ts.fT[0], ts.fT[1]);
break;
}
case Work::kCubic_Segment: {
static Segment* findChase(SkTDArray<Span*>& chase, int& tIndex, int& endIndex,
int contourWinding) {
while (chase.count()) {
- Span* span = chase[chase.count() - 1];
+ Span* span;
+ chase.pop(&span);
const Span& backPtr = span->fOther->span(span->fOtherIndex);
Segment* segment = backPtr.fOther;
tIndex = backPtr.fOtherIndex;
Angle* last = angles.end() - 1;
tIndex = last->start();
endIndex = last->end();
+ #if TRY_ROTATE
+ *chase.insert(0) = span;
+ #else
+ *chase.append() = span;
+ #endif
return last->segment();
}
if (done == angles.count()) {
- chase.pop(&span);
continue;
}
SkTDArray<Angle*> sorted;
sorted[0]->segment()->debugShowSort(__FUNCTION__, sorted, 0, 0);
#endif
if (!sortable) {
- chase.pop(&span);
continue;
}
// find first angle, initialize winding to computed fWindSum
break;
}
} while (++nextIndex != lastIndex);
+ #if TRY_ROTATE
+ *chase.insert(0) = span;
+ #else
+ *chase.append() = span;
+ #endif
return segment;
}
return NULL;
Segment* next = current->findNextWinding(chaseArray, active,
nextStart, nextEnd, winding, spanWinding, unsortable);
if (!next) {
- if (active && simple.hasMove()
+ if (active && !unsortable && simple.hasMove()
&& current->verb() != SkPath::kLine_Verb
&& !simple.isClosed()) {
current->addCurveTo(index, endIndex, simple, true);
int min = SkMin32(index, endIndex);
if (!current->done(min)) {
current->addCurveTo(index, endIndex, simple, true);
- current->markDone(SkMin32(index, endIndex), spanWinding);
+ current->markDone(SkMin32(index, endIndex), winding ? winding : spanWinding);
}
closable = false;
}
}
static bool approximatelyEqual(const SkPoint& a, const SkPoint& b) {
- return approximately_equal(a.fX, b.fX) && approximately_equal(a.fY, b.fY);
+ return AlmostEqualUlps(a.fX, b.fX) && AlmostEqualUlps(a.fY, b.fY);
}
/*
EdgeBuilder builder(path, contours);
builder.finish();
int count = contours.count();
- int oIndex;
+ int outer;
SkTDArray<int> runs; // indices of partial contours
- for (oIndex = 0; oIndex < count; ++oIndex) {
- const Contour& eContour = contours[oIndex];
+ for (outer = 0; outer < count; ++outer) {
+ const Contour& eContour = contours[outer];
const SkPoint& eStart = eContour.start();
const SkPoint& eEnd = eContour.end();
if (approximatelyEqual(eStart, eEnd)) {
eContour.toPath(simple);
continue;
}
- *runs.append() = oIndex;
+ *runs.append() = outer;
}
count = runs.count();
+ if (count == 0) {
+ return;
+ }
SkTDArray<int> sLink, eLink;
sLink.setCount(count);
eLink.setCount(count);
+ SkTDArray<double> sBest, eBest;
+ sBest.setCount(count);
+ eBest.setCount(count);
int rIndex;
for (rIndex = 0; rIndex < count; ++rIndex) {
- sLink[rIndex] = eLink[rIndex] = INT_MAX;
+ outer = runs[rIndex];
+ const Contour& oContour = contours[outer];
+ const SkPoint& oStart = oContour.start();
+ const SkPoint& oEnd = oContour.end();
+ double dx = oEnd.fX - oStart.fX;
+ double dy = oEnd.fY - oStart.fY;
+ double dist = dx * dx + dy * dy;
+ sBest[rIndex] = eBest[rIndex] = dist;
+ sLink[rIndex] = eLink[rIndex] = rIndex;
}
for (rIndex = 0; rIndex < count - 1; ++rIndex) {
- oIndex = runs[rIndex];
- const Contour& oContour = contours[oIndex];
+ outer = runs[rIndex];
+ const Contour& oContour = contours[outer];
const SkPoint& oStart = oContour.start();
const SkPoint& oEnd = oContour.end();
- for (int inner = rIndex + 1; inner < count; ++inner) {
- int iIndex = runs[inner];
- const Contour& iContour = contours[iIndex];
+ double bestStartDist = sBest[rIndex];
+ double bestEndDist = eBest[rIndex];
+ for (int iIndex = rIndex + 1; iIndex < count; ++iIndex) {
+ int inner = runs[iIndex];
+ const Contour& iContour = contours[inner];
const SkPoint& iStart = iContour.start();
const SkPoint& iEnd = iContour.end();
- if (approximatelyEqual(oStart, iStart)) {
- SkASSERT(sLink[rIndex] == INT_MAX);
+ double dx = iStart.fX - oStart.fX;
+ double dy = iStart.fY - oStart.fY;
+ double dist = dx * dx + dy * dy;
+ if (bestStartDist > dist) {
+ bestStartDist = dist;
sLink[rIndex] = ~iIndex;
- SkASSERT(sLink[iIndex] == INT_MAX);
sLink[iIndex] = ~rIndex;
- } else if (approximatelyEqual(oStart, iEnd)) {
- SkASSERT(sLink[rIndex] == INT_MAX);
+ }
+ dx = iEnd.fX - oStart.fX;
+ dy = iEnd.fY - oStart.fY;
+ dist = dx * dx + dy * dy;
+ if (bestStartDist > dist) {
+ bestStartDist = dist;
sLink[rIndex] = iIndex;
- SkASSERT(eLink[iIndex] == INT_MAX);
eLink[iIndex] = rIndex;
}
- if (approximatelyEqual(oEnd, iStart)) {
- SkASSERT(eLink[rIndex] == INT_MAX);
- eLink[rIndex] = iIndex;
- SkASSERT(sLink[iIndex] == INT_MAX);
+ dx = iStart.fX - oEnd.fX;
+ dy = iStart.fY - oEnd.fY;
+ dist = dx * dx + dy * dy;
+ if (bestEndDist > dist) {
+ bestEndDist = dist;
sLink[iIndex] = rIndex;
- } else if (approximatelyEqual(oEnd, iEnd)) {
- SkASSERT(eLink[rIndex] == INT_MAX);
- eLink[rIndex] = ~iIndex;
- SkASSERT(eLink[iIndex] == INT_MAX);
+ eLink[rIndex] = iIndex;
+ }
+ dx = iEnd.fX - oEnd.fX;
+ dy = iEnd.fY - oEnd.fY;
+ dist = dx * dx + dy * dy;
+ if (bestEndDist > dist) {
+ bestEndDist = dist;
eLink[iIndex] = ~rIndex;
+ eLink[rIndex] = ~iIndex;
}
- }
+ }
}
rIndex = 0;
bool forward = true;
bool first = true;
const SkPoint* startPtr;
int sIndex = sLink[rIndex];
+ SkASSERT(sIndex != INT_MAX);
+ sLink[rIndex] = INT_MAX;
+ int eIndex;
if (sIndex < 0) {
- SkASSERT(sLink[~sIndex] != INT_MAX);
+ eIndex = sLink[~sIndex];
sLink[~sIndex] = INT_MAX;
} else {
- SkASSERT(eLink[sIndex] != INT_MAX);
+ eIndex = eLink[sIndex];
eLink[sIndex] = INT_MAX;
}
- SkASSERT(sLink[rIndex] != INT_MAX);
- sLink[rIndex] = INT_MAX;
+ SkASSERT(eIndex != INT_MAX);
do {
do {
- oIndex = runs[rIndex];
- const Contour& contour = contours[oIndex];
+ outer = runs[rIndex];
+ const Contour& contour = contours[outer];
if (first) {
startPtr = &contour.start();
first = false;
contour.toPartialBackward(simple);
endPtr = &contour.start();
}
- if (approximatelyEqual(*startPtr, *endPtr)) {
+ if (sIndex == eIndex) {
simple.close();
first = forward = true;
break;
}
- int newRIndex;
if (forward) {
- newRIndex = eLink[rIndex];
- SkASSERT(newRIndex != INT_MAX);
- SkASSERT(eLink[rIndex] != INT_MAX);
+ eIndex = eLink[rIndex];
+ SkASSERT(eIndex != INT_MAX);
eLink[rIndex] = INT_MAX;
- if (newRIndex >= 0) {
- SkASSERT(sLink[newRIndex] == rIndex);
- sLink[newRIndex] = INT_MAX;
+ if (eIndex >= 0) {
+ SkASSERT(sLink[eIndex] == rIndex);
+ sLink[eIndex] = INT_MAX;
} else {
- SkASSERT(eLink[~newRIndex] == ~rIndex);
- eLink[~newRIndex] = INT_MAX;
+ SkASSERT(eLink[~eIndex] == ~rIndex);
+ eLink[~eIndex] = INT_MAX;
}
} else {
- newRIndex = sLink[rIndex];
- SkASSERT(newRIndex != INT_MAX);
- SkASSERT(sLink[rIndex] != INT_MAX);
+ eIndex = sLink[rIndex];
+ SkASSERT(eIndex != INT_MAX);
sLink[rIndex] = INT_MAX;
- if (newRIndex >= 0) {
- SkASSERT(eLink[newRIndex] == rIndex);
- eLink[newRIndex] = INT_MAX;
+ if (eIndex >= 0) {
+ SkASSERT(eLink[eIndex] == rIndex);
+ eLink[eIndex] = INT_MAX;
} else {
- SkASSERT(sLink[~newRIndex] == ~rIndex);
- sLink[~newRIndex] = INT_MAX;
+ SkASSERT(sLink[~eIndex] == ~rIndex);
+ sLink[~eIndex] = INT_MAX;
}
}
- rIndex = newRIndex;
+ rIndex = eIndex;
if (rIndex < 0) {
forward ^= 1;
rIndex = ~rIndex;
fixOtherTIndex(contourList);
#if !SORTABLE_CONTOURS
sortSegments(contourList);
+#endif
+#if DEBUG_ACTIVE_SPANS
+ debugShowActiveSpans(contourList);
#endif
// construct closed contours
if (builder.xorMask() == kWinding_Mask
debugShowActiveSpans id=21 (343.709442,175.778046 328.570923,175.778046 326.837006,195.984955) t=0 (343.709442,175.778046) other=20 otherT=1 otherIndex=3 windSum=? windValue=1
</div>
+<div id="quad59">
+debugShowQuadIntersection wtTs[0]=0 (369.863983,145.645813 382.380371,121.254936 406.236359,121.254936) (369.863983,145.645813) wnTs[0]=1 (406.236359,121.254936 409.445679,121.254936 412.975952,121.789818) (412.975952,121.789818)
+debugShowQuadLineIntersection wtTs[0]=1 (369.863983,145.645813 382.380371,121.254936 406.236359,121.254936) (406.236359,121.254936) wnTs[0]=0 (412.975952,121.789818 369.863983,145.645813) (412.975952,121.789818)
+debugShowQuadLineIntersection wtTs[0]=0 (406.236359,121.254936 409.445679,121.254936 412.975952,121.789818) (406.236359,121.254936) wnTs[0]=1 (412.975952,121.789818 369.863983,145.645813) (369.863983,145.645813)
+debugShowQuadIntersection no intersect (369.863983,145.645813 382.380371,121.254936 406.236359,121.254936) (369.970581,137.94342 383.98465,121.254936 406.235992,121.254936)
+debugShowQuadIntersection no intersect (369.863983,145.645813 382.380371,121.254936 406.236359,121.254936) (406.235992,121.254936 425.705902,121.254936 439.71994,137.087616)
+debugShowQuadLineIntersection wtTs[0]=0.934062756 (369.863983,145.645813 382.380371,121.254936 406.236359,121.254936) (403.139679,121.360977) wnTs[0]=0.17423 (439.71994,137.087616 369.970581,137.94342) (427.567535,137.236725)
+debugShowQuadIntersection wtTs[0]=9.61225644e-05 (406.236359,121.254936 409.445679,121.254936 412.975952,121.789818) (406.236969,121.254936) wnTs[0]=0.000495996 (406.235992,121.254936 425.705902,121.254936 439.71994,137.087616) (406.25531,121.254944)
+debugShowQuadLineIntersection no intersect (369.970581,137.94342 383.98465,121.254936 406.235992,121.254936) (412.975952,121.789818 369.863983,145.645813)
+debugShowQuadLineIntersection no intersect (406.235992,121.254936 425.705902,121.254936 439.71994,137.087616) (412.975952,121.789818 369.863983,145.645813)
+debugShowQuadIntersection wtTs[0]=0 (369.970581,137.94342 383.98465,121.254936 406.235992,121.254936) (369.970581,137.94342) wnTs[0]=1 (406.235992,121.254936 425.705902,121.254936 439.71994,137.087616) (439.71994,137.087616)
+debugShowQuadLineIntersection wtTs[0]=1 (369.970581,137.94342 383.98465,121.254936 406.235992,121.254936) (406.235992,121.254936) wnTs[0]=0 (439.71994,137.087616 369.970581,137.94342) (439.71994,137.087616)
+debugShowQuadLineIntersection wtTs[0]=0 (406.235992,121.254936 425.705902,121.254936 439.71994,137.087616) (406.235992,121.254936) wnTs[0]=1 (439.71994,137.087616 369.970581,137.94342) (369.970581,137.94342)
+</div>
+
+<div id="quad59b">
+debugShowActiveSpans id=1 (369.863983,145.645813 382.380371,121.254936 406.236359,121.254936) t=0 (369.863983,145.645813) other=3 otherT=1 otherIndex=2 windSum=? windValue=1
+debugShowActiveSpans id=1 (369.863983,145.645813 382.380371,121.254936 406.236359,121.254936) t=0.174229721 (374.569672,137.886993) other=6 otherT=0.934062756 otherIndex=2 windSum=? windValue=1
+debugShowActiveSpans id=2 (406.236359,121.254936 409.445679,121.254936 412.975952,121.789818) t=0 (406.236359,121.254936) other=1 otherT=1 otherIndex=2 windSum=? windValue=1
+debugShowActiveSpans id=2 (406.236359,121.254936 409.445679,121.254936 412.975952,121.789818) t=0.000495995847 (406.239532,121.254936) other=5 otherT=9.61225644e-05 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=3 (412.975952,121.789818 369.863983,145.645813) t=0 (412.975952,121.789818) other=2 otherT=1 otherIndex=2 windSum=? windValue=1
+debugShowActiveSpans id=3 (412.975952,121.789818 369.863983,145.645813) t=0.669864243 (384.096771,137.770096) other=6 otherT=0.797471908 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=4 (369.970581,137.94342 383.98465,121.254936 406.235992,121.254936) t=0 (369.970581,137.94342) other=6 otherT=1 otherIndex=3 windSum=? windValue=1
+debugShowActiveSpans id=5 (406.235992,121.254936 425.705902,121.254936 439.71994,137.087616) t=0 (406.235992,121.254936) other=4 otherT=1 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=5 (406.235992,121.254936 425.705902,121.254936 439.71994,137.087616) t=9.61225644e-05 (406.239746,121.254936) other=2 otherT=0.000495995847 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=6 (439.71994,137.087616 369.970581,137.94342) t=0 (439.71994,137.087616) other=5 otherT=1 otherIndex=2 windSum=? windValue=1
+debugShowActiveSpans id=6 (439.71994,137.087616 369.970581,137.94342) t=0.797471908 (384.096771,137.770096) other=3 otherT=0.669864243 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=6 (439.71994,137.087616 369.970581,137.94342) t=0.934062756 (374.569672,137.886993) other=1 otherT=0.174229721 otherIndex=1 windSum=? windValue=1
+</div>
+
+<div id="quad60">
+debugShowActiveSpans id=1 (360.416077,166.795715 370.126831,147.872162 388.635406,147.872162) t=0 (360.416077,166.795715) other=2 otherT=1 otherIndex=2 windSum=? windValue=1
+debugShowActiveSpans id=2 (388.635406,147.872162 360.416077,166.795715) t=0 (388.635406,147.872162) other=1 otherT=1 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=2 (388.635406,147.872162 360.416077,166.795715) t=0.00925761141 (388.374176,148.047348) other=4 otherT=0.883679938 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=3 (353.2948,194.351074 353.2948,173.767563 364.167572,160.819855) t=0 (353.2948,194.351074) other=5 otherT=1 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=4 (364.167572,160.819855 375.040314,147.872162 392.303894,147.872162) t=0 (364.167572,160.819855) other=3 otherT=1 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=4 (364.167572,160.819855 375.040314,147.872162 392.303894,147.872162) t=0.883679938 (388.374176,148.047348) other=2 otherT=0.00925761141 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=5 (392.303894,147.872162 353.2948,194.351074) t=0 (392.303894,147.872162) other=4 otherT=1 otherIndex=2 windSum=? windValue=1
+</div>
+
+<div id="quad61">
+debugShowActiveSpans id=1 (348.781738,123.864815 369.848602,123.864815) t=0 (348.781738,123.864815) other=4 otherT=1 otherIndex=4 windSum=? windValue=1
+debugShowActiveSpans id=2 (369.848602,123.864815 369.848602,145.680267) t=0 (369.848602,123.864815) other=1 otherT=1 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=3 (369.848602,145.680267 382.360413,121.298294 406.207703,121.298294) t=0 (369.848602,145.680267) other=2 otherT=1 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=3 (369.848602,145.680267 382.360413,121.298294 406.207703,121.298294) t=0.258355433 (377.070221,134.709274) other=6 otherT=0.8038997 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=3 (369.848602,145.680267 382.360413,121.298294 406.207703,121.298294) t=0.914354357 (402.206024,121.477142) other=4 otherT=0.0696842495 otherIndex=2 windSum=? windValue=1
+debugShowActiveSpans id=3 (369.848602,145.680267 382.360413,121.298294 406.207703,121.298294) t=0.999082394 (406.16394,121.298317) other=5 otherT=0.998890674 otherIndex=2 windSum=? windValue=1
+debugShowActiveSpans id=4 (406.207703,121.298294 348.781738,123.864815) t=1.0265934e-07 (406.207703,121.298294) other=5 otherT=0.999874327 otherIndex=3 windSum=? windValue=1
+debugShowActiveSpans id=4 (406.207703,121.298294 348.781738,123.864815) t=0.0696842495 (402.206024,121.477142) other=3 otherT=0.914354357 otherIndex=2 windSum=? windValue=1
+debugShowActiveSpans id=4 (406.207703,121.298294 348.781738,123.864815) t=0.0881931013 (401.143127,121.524643) other=5 otherT=0.883517581 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=5 (369.961151,137.980698 383.970093,121.298294 406.213287,121.298294) t=0 (369.961151,137.980698) other=6 otherT=1 otherIndex=2 windSum=? windValue=1
+debugShowActiveSpans id=5 (369.961151,137.980698 383.970093,121.298294 406.213287,121.298294) t=0.883517581 (401.143127,121.524643) other=4 otherT=0.0881931013 otherIndex=3 windSum=? windValue=1
+debugShowActiveSpans id=5 (369.961151,137.980698 383.970093,121.298294 406.213287,121.298294) t=0.998890674 (406.16394,121.298317) other=3 otherT=0.999082394 otherIndex=3 windSum=? windValue=1
+debugShowActiveSpans id=5 (369.961151,137.980698 383.970093,121.298294 406.213287,121.298294) t=0.999874327 (406.207703,121.298294) other=4 otherT=1.0265934e-07 otherIndex=1 windSum=? windValue=1
+debugShowActiveSpans id=6 (406.213287,121.298294 369.961151,137.980698) t=0 (406.213287,121.298294) other=5 otherT=1 otherIndex=4 windSum=? windValue=1
+debugShowActiveSpans id=6 (406.213287,121.298294 369.961151,137.980698) t=0.8038997 (377.070221,134.709274) other=3 otherT=0.258355433 otherIndex=1 windSum=? windValue=1
+</div>
+
+<div id="quad61b">
+debugShowQuadLineIntersection wtTs[0]=0.914354357 (369.848602,145.680267 382.360413,121.298294 406.207703,121.298294) (402.206024,121.477142) wtTs[1]=1 (406.207703,121.298294) wnTs[0]=0.0696842 (406.207703,121.298294 348.781738,123.864815) (402.206024,121.477142) wnTs[1]=0 (406.207703,121.298294)
+debugShowQuadIntersection wtTs[0]=0.999082394 (369.848602,145.680267 382.360413,121.298294 406.207703,121.298294) (406.16394,121.298317) wnTs[0]=0.998891 (369.961151,137.980698 383.970093,121.298294 406.213287,121.298294) (406.16394,121.298317)
+debugShowQuadLineIntersection wtTs[0]=0.258355433 (369.848602,145.680267 382.360413,121.298294 406.207703,121.298294) (377.070221,134.709274) wnTs[0]=0.8039 (406.213287,121.298294 369.961151,137.980698) (377.070221,134.709274)
+debugShowQuadLineIntersection wtTs[0]=0.883517581 (369.961151,137.980698 383.970093,121.298294 406.213287,121.298294) (401.143127,121.524643) wtTs[1]=0.999874327 (406.207703,121.298294) wnTs[0]=0.0881931 (406.207703,121.298294 348.781738,123.864815) (401.143127,121.524643) wnTs[1]=1.0265934e-07 (406.207703,121.298294)
+debugShowQuadLineIntersection wtTs[0]=0 (369.961151,137.980698 383.970093,121.298294 406.213287,121.298294) (369.961151,137.980698) wtTs[1]=1 (406.213287,121.298294) wnTs[0]=1 (406.213287,121.298294 369.961151,137.980698) (369.961151,137.980698) wnTs[1]=0 (406.213287,121.298294)
+</div>
+
+<div id="quad61c">
+debugShowActiveSpans id=3 (369.848602,145.680267 382.360413,121.298294 406.207703,121.298294) t=0.914354357 (402.206024,121.477142) other=4 otherT=0.0696842495 otherIndex=2 windSum=-1 windValue=1
+debugShowActiveSpans id=4 (406.207703,121.298294 348.781738,123.864815) t=1.0265934e-07 (406.207703,121.298294) other=5 otherT=0.999874327 otherIndex=3 windSum=-1 windValue=1
+debugShowActiveSpans id=5 (369.961151,137.980698 383.970093,121.298294 406.213287,121.298294) t=0.998890674 (406.16394,121.298317) other=3 otherT=0.999082394 otherIndex=3 windSum=-1 windValue=1
+</div>
+
</div>
<script type="text/javascript">
var testDivs = [
+ quad61,
+ quad61b,
+ quad61c,
+ quad60,
+ quad59b,
+ quad59,
quad58b,
quad58a,
quad57c,
var srcLeft, srcTop;
var srcWidth, srcHeight;
var screenWidth, screenHeight;
-var drawnPts;
+var drawnPts, drawnLines, drawnQuads, deferredLines, deferredQuads;
var ptLabels = true;
var digit_mode = false;
var SPAN_Q_SUM = 14;
var SPAN_Q_VAL = 15;
-var Q_LENGTH = 18;
+var ACTIVE_LINE_SPAN = 1;
+var ACTIVE_QUAD_SPAN = 2;
+var INTERSECT_QUAD_LINE = 3;
+var INTERSECT_QUAD_LINE_2 = 4;
+var INTERSECT_QUAD_LINE_NO = 5;
+var INTERSECT_QUAD = 6;
+var INTERSECT_QUAD_2 = 7;
+var INTERSECT_QUAD_NO = 8;
function strs_to_nums(strs) {
var result = [];
return result;
}
+function construct_regexp(pattern) {
+ var escape = pattern.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+ escape = escape.replace(/PT_VAL/g, "(\\d+\\.?\\d*),(\\d+\\.?\\d*)");
+ escape = escape.replace(/T_VAL/g, "(\\d+\\.?\\d*e?-?\\d*)");
+ escape = escape.replace(/IDX/g, "(\\d+)");
+ escape = escape.replace(/OPT/g, "(\\?|-?\\d+)");
+ return new RegExp(escape, 'i');
+}
+
function parse_debugShowActiveSpans(test, title) {
- var re_quad = / id=(\d+) \((\d+\.?\d*),(\d+\.?\d*) (\d+\.?\d*),(\d+\.?\d*) (\d+\.?\d*),(\d+\.?\d*)\) t=(\d+\.?\d*) \((\d+\.?\d*),(\d+\.?\d*)\) other=(\d+) otherT=(\d+\.?\d*) otherIndex=(\d+) windSum=(\?|-?\d+) windValue=(\d+)/;
- var re_line = / id=(\d+) \((\d+\.?\d*),(\d+\.?\d*) (\d+\.?\d*),(\d+\.?\d*)\) t=(\d+\.?\d*) \((\d+\.?\d*),(\d+\.?\d*)\) other=(\d+) otherT=(\d+\.?\d*) otherIndex=(\d+) windSum=(\?|-?\d+) windValue=(\d+)/;
+ var re_quad = construct_regexp(" id=IDX (PT_VAL PT_VAL PT_VAL) t=T_VAL (PT_VAL) other=IDX otherT=T_VAL otherIndex=IDX windSum=OPT windValue=IDX");
+ var re_line = construct_regexp(" id=IDX (PT_VAL PT_VAL) t=T_VAL (PT_VAL) other=IDX otherT=T_VAL otherIndex=IDX windSum=OPT windValue=IDX");
var strs = test.split("debugShowActiveSpans");
if (strs.length == 1)
if (re_line.test(str)) {
var lineStrs = re_line.exec(str);
var line = strs_to_nums(lineStrs);
+ spans.push(ACTIVE_LINE_SPAN);
spans.push(line);
} else if (re_quad.test(str)) {
var quadStrs = re_quad.exec(str);
var quad = strs_to_nums(quadStrs);
+ spans.push(ACTIVE_QUAD_SPAN);
spans.push(quad);
}
}
}
}
+function filter_str_by(id, str, regex, array) {
+ if (regex.test(str)) {
+ var strs = regex.exec(str);
+ var result = strs_to_nums(strs);
+ array.push(id);
+ array.push(result);
+ }
+}
+
+function parse_intersections(test, title) {
+ var re_quad_line = construct_regexp(" wtTs[0]=T_VAL (PT_VAL PT_VAL PT_VAL) (PT_VAL) wnTs[0]=T_VAL (PT_VAL PT_VAL) (PT_VAL)");
+ var re_quad_line_2 = construct_regexp(" wtTs[0]=T_VAL (PT_VAL PT_VAL PT_VAL) (PT_VAL) wtTs[1]=T_VAL (PT_VAL) wnTs[0]=T_VAL (PT_VAL PT_VAL) (PT_VAL) wnTs[1]=T_VAL (PT_VAL)");
+ var re_quad_line_no_intersect = construct_regexp(" no intersect (PT_VAL PT_VAL PT_VAL) (PT_VAL PT_VAL)");
+ var re_quad = construct_regexp(" wtTs[0]=T_VAL (PT_VAL PT_VAL PT_VAL) (PT_VAL) wnTs[0]=T_VAL (PT_VAL PT_VAL PT_VAL) (PT_VAL)");
+ var re_quad_2 = construct_regexp(" wtTs[0]=T_VAL (PT_VAL PT_VAL PT_VAL) (PT_VAL) wtTs[1]=T_VAL wnTs[0]=T_VAL (PT_VAL PT_VAL PT_VAL) (PT_VAL) wnTs[1]=T_VAL");
+ var re_quad_no_intersect = construct_regexp(" no intersect (PT_VAL PT_VAL PT_VAL) (PT_VAL PT_VAL PT_VAL)");
+
+ var strs = test.split(/debugShow[A-Za-z]+Intersection/);
+ if (strs.length == 1)
+ return;
+ var spans = [];
+ for (var s in strs) {
+ var str = strs[s];
+ if (str == "\n") {
+ continue;
+ }
+ filter_str_by(INTERSECT_QUAD_LINE, str, re_quad_line, spans);
+ filter_str_by(INTERSECT_QUAD_LINE_2, str, re_quad_line_2, spans);
+ filter_str_by(INTERSECT_QUAD_LINE_NO, str, re_quad_line_no_intersect, spans);
+ filter_str_by(INTERSECT_QUAD, str, re_quad, spans);
+ filter_str_by(INTERSECT_QUAD_2, str, re_quad_2, spans);
+ filter_str_by(INTERSECT_QUAD_NO, str, re_quad_no_intersect, spans);
+ }
+ if (spans.length >= 1) {
+ tests.push(spans);
+ testTitles.push(title);
+ }
+}
+
function init(test) {
var canvas = document.getElementById('canvas');
if (!canvas.getContext) return;
var xmax = -Infinity;
ymin = Infinity;
var ymax = -Infinity;
- for (var scans in test) {
+ var scanType = -1;
+ for (var scansStr in test) {
+ var scans = parseInt(scansStr);
var scan = test[scans];
- var last = scan.length >= Q_LENGTH ? SPAN_X3 : SPAN_X2;
- for (var idx = SPAN_X1; idx <= last; idx += 2) {
- xmin = Math.min(xmin, scan[idx]);
- xmax = Math.max(xmax, scan[idx]);
- ymin = Math.min(ymin, scan[idx + 1]);
- ymax = Math.max(ymax, scan[idx + 1]);
+ if (scanType == -1) {
+ scanType = scan;
+ continue;
+ }
+ if (scanType == ACTIVE_LINE_SPAN || scanType == ACTIVE_QUAD_SPAN) {
+ var last = scanType == ACTIVE_QUAD_SPAN ? SPAN_X3 : SPAN_X2;
+ for (var idx = SPAN_X1; idx <= last; idx += 2) {
+ xmin = Math.min(xmin, scan[idx]);
+ xmax = Math.max(xmax, scan[idx]);
+ ymin = Math.min(ymin, scan[idx + 1]);
+ ymax = Math.max(ymax, scan[idx + 1]);
+ }
+ } else {
+ var start = 1;
+ if (scanType != INTERSECT_QUAD_LINE_NO && scanType != INTERSECT_QUAD_NO) {
+ start = 2;
+ }
+ for (var idx = start; idx < start + 6; idx += 2) {
+ xmin = Math.min(xmin, scan[idx]);
+ xmax = Math.max(xmax, scan[idx]);
+ ymin = Math.min(ymin, scan[idx + 1]);
+ ymax = Math.max(ymax, scan[idx + 1]);
+ }
+ start = start + 6;
+ if (scanType == INTERSECT_QUAD_LINE || scanType == INTERSECT_QUAD) {
+ start += 3;
+ }
+ if (scanType == INTERSECT_QUAD_LINE_2) {
+ start += 6;
+ }
+ if (scanType == INTERSECT_QUAD_2) {
+ start += 4;
+ }
+ var end = start + 4;
+ if (scanType == INTERSECT_QUAD || scanType == INTERSECT_QUAD_2 || scanType == INTERSECT_QUAD_NO) {
+ end += 2;
+ }
+ for (var idx = start; idx < end; idx += 2) {
+ xmin = Math.min(xmin, scan[idx]);
+ xmax = Math.max(xmax, scan[idx]);
+ ymin = Math.min(ymin, scan[idx + 1]);
+ ymax = Math.max(ymax, scan[idx + 1]);
+ }
}
+ scanType = -1;
}
srcWidth = xmax - xmin;
srcHeight = ymax - ymin;
ctx.fillText(label, _px + 5, _py);
}
+function drawLine(x1, y1, x2, y2, selected) {
+ for (var pts = 0; pts < drawnLines.length; pts += 4) {
+ if (x1 == drawnLines[pts] && y1 == drawnLines[pts + 1]) {
+ return;
+ }
+ if (x2 == drawnLines[pts + 2] && x2 == drawnLines[pts + 3]) {
+ return;
+ }
+ }
+ if (selected) {
+ drawnLines.push(x1);
+ drawnLines.push(y1);
+ drawnLines.push(x2);
+ drawnLines.push(y2);
+ ctx.beginPath();
+ ctx.moveTo((x1 - srcLeft) * scale,
+ (y1 - srcTop) * scale);
+ ctx.lineTo((x2 - srcLeft) * scale,
+ (y2 - srcTop) * scale);
+ ctx.stroke();
+ return;
+ }
+ deferredLines.push(x1);
+ deferredLines.push(y1);
+ deferredLines.push(x2);
+ deferredLines.push(y2);
+}
+
+function drawQuad(x1, y1, x2, y2, x3, y3, selected) {
+ for (var pts = 0; pts < drawnQuads.length; pts += 6) {
+ if (x1 == drawnQuads[pts] && y1 == drawnQuads[pts + 1]) {
+ return;
+ }
+ if (x2 == drawnQuads[pts + 2] && x2 == drawnQuads[pts + 3]) {
+ return;
+ }
+ if (x2 == drawnQuads[pts + 4] && x2 == drawnQuads[pts + 5]) {
+ return;
+ }
+ }
+ if (selected) {
+ drawnQuads.push(x1);
+ drawnQuads.push(y1);
+ drawnQuads.push(x2);
+ drawnQuads.push(y2);
+ drawnQuads.push(x3);
+ drawnQuads.push(y3);
+ ctx.beginPath();
+ ctx.moveTo((x1 - srcLeft) * scale,
+ (y1 - srcTop) * scale);
+ ctx.quadraticCurveTo((x2 - srcLeft) * scale,
+ (y2 - srcTop) * scale,
+ (x3 - srcLeft) * scale,
+ (y3 - srcTop) * scale);
+ ctx.stroke();
+ return;
+ }
+ deferredQuads.push(x1);
+ deferredQuads.push(y1);
+ deferredQuads.push(x2);
+ deferredQuads.push(y2);
+ deferredQuads.push(x3);
+ deferredQuads.push(y3);
+}
+
+function drawDeferred() {
+ for (var pts = 0; pts < deferredQuads.length; pts += 6) {
+ drawQuad(deferredQuads[pts], deferredQuads[pts + 1],
+ deferredQuads[pts + 2], deferredQuads[pts + 3],
+ deferredQuads[pts + 4], deferredQuads[pts + 5], true);
+ }
+ for (var pts = 0; pts < deferredLines.length; pts += 4) {
+ drawLine(deferredLines[pts], deferredLines[pts + 1],
+ deferredLines[pts + 2], deferredLines[pts + 3], true);
+ }
+}
+
function draw(test, title) {
ctx.fillStyle = "rgba(0,0,0, 0.1)";
ctx.font = "normal 50px Arial";
ctx.fillText(title, 50, 50);
ctx.font = "normal 10px Arial";
ctx.lineWidth = "1.001"; "0.999";
- var id = -1;
+ var curId = -1;
var firstIdx;
var lastIdx;
var index_tst = -1;
drawnPts = [];
+ drawnLines = [];
+ drawnQuads = [];
+ deferredLines = [];
+ deferredQuads = [];
+ var scanType = -1;
+ var partIndex = 0;
for (var scansStr in test) {
var scans = parseInt(scansStr);
var scan = test[scans];
- var isQuad = scan.length >= Q_LENGTH;
- if (id != scan[SPAN_ID]) {
- id = scan[SPAN_ID];
- firstIdx = lastIdx = scans;
- ++index_tst;
+ if (scanType == -1) {
+ scanType = scan;
+ continue;
+ }
+ partIndex++;
+ var hasId = scanType == ACTIVE_LINE_SPAN || scanType == ACTIVE_QUAD_SPAN ? SPAN_ID : -1;
+ if (hasId >= 0 && curId != scan[hasId]) {
+ curId = hasId;
+ firstIdx = lastIdx = partIndex;
+ index_tst++;
var nextIdx = lastIdx + 1;
- while (nextIdx < test.length && test[nextIdx][SPAN_ID] == id) {
+ while (nextIdx * 2 < test.length && test[nextIdx * 2][hasId] == curId) {
lastIdx = nextIdx++;
}
+ } else if (hasId < 0) {
+ firstIdx = lastIdx = partIndex;
+ index_tst++;
}
- var seq = sequence % test.length;
- var selected = sequence >= 0 ? seq == scans
- : (index_bits & (1 << index_tst)) != 0 && scans == firstIdx;
+ var seq = sequence % (test.length / 2);
+ var selected = sequence >= 0 ? seq == partIndex
+ : (index_bits & (1 << index_tst)) != 0 && partIndex == firstIdx;
var skippable = (sequence >= 0 && seq >= firstIdx && seq <= lastIdx)
- || scans != firstIdx;
+ || partIndex != firstIdx;
if (skippable && !selected) {
+ scanType = -1;
continue;
}
- ctx.strokeStyle = selected ? "red" : "rgba(0,0,0, 0.2)";
- ctx.beginPath();
- ctx.moveTo((scan[SPAN_X1] - srcLeft)* scale,
- (scan[SPAN_Y1] - srcTop) * scale);
- if (isQuad) {
- ctx.quadraticCurveTo((scan[SPAN_X2] - srcLeft) * scale,
- (scan[SPAN_Y2] - srcTop) * scale,
- (scan[SPAN_X3] - srcLeft) * scale,
- (scan[SPAN_Y3] - srcTop) * scale);
+ var types = [scanType == ACTIVE_LINE_SPAN ? 0 : 1];
+ var pts = [];
+ if (scanType == ACTIVE_LINE_SPAN || scanType == ACTIVE_QUAD_SPAN) {
+ pts.push(SPAN_X1);
} else {
- ctx.lineTo((scan[SPAN_X2] - srcLeft)* scale,
- (scan[SPAN_Y2] - srcTop) * scale);
+ pts.push(scanType != INTERSECT_QUAD_NO && scanType != INTERSECT_QUAD_LINE_NO ? 2 : 1);
+ types.push(scanType == INTERSECT_QUAD_NO || scanType == INTERSECT_QUAD || scanType == INTERSECT_QUAD_2 ? 1 : 0);
+ pts.push(scanType == INTERSECT_QUAD_LINE || scanType == INTERSECT_QUAD ? 11
+ : scanType == INTERSECT_QUAD_LINE_2 ? 14 : scanType == INTERSECT_QUAD_2 ? 12 : 7);
+ }
+ ctx.strokeStyle = "red";
+ for (var typeIndex = 0; typeIndex < types.length; ++typeIndex) {
+ var type = types[typeIndex];
+ var index = pts[typeIndex];
+ if (type == 1) {
+ drawQuad(scan[index + 0], scan[index + 1], scan[index + 2], scan[index + 3],
+ scan[index + 4], scan[index + 5], selected);
+ } else {
+ drawLine(scan[index + 0], scan[index + 1], scan[index + 2], scan[index + 3],
+ selected);
+ }
}
- ctx.stroke();
if (debug_xy && selected) {
var debugText = "";
- for (var idx = SPAN_X1; idx <= (isQuad ? SPAN_X3 : SPAN_X2); idx += 2) {
- var screenX = (scan[idx] - srcLeft) * scale;
- var screenY = (scan[idx + 1] - srcTop) * scale;
- debugText += screenX.toFixed(decimal_places) + ", ";
- debugText += screenY.toFixed(decimal_places) + " ";
+ for (var typeIndex = 0; typeIndex < types.length; ++typeIndex) {
+ var type = types[typeIndex];
+ var index = pts[typeIndex];
+ for (var idx = pts[typeIndex]; idx < (type == 1 ? pts[typeIndex] + 6 : pts[typeIndex] + 4); idx += 2) {
+ var screenX = (scan[idx] - srcLeft) * scale;
+ var screenY = (scan[idx + 1] - srcTop) * scale;
+ debugText += screenX.toFixed(decimal_places) + ", ";
+ debugText += screenY.toFixed(decimal_places) + " ";
+ }
}
ctx.fillStyle="blue";
- ctx.fillText(debugText, 50, scans * 50 + 100);
+ ctx.fillText(debugText, 50, partIndex * 50 + 100);
}
if (ptLabels && selected) {
ctx.fillStyle="blue";
- drawPoint(scan[SPAN_X1], scan[SPAN_Y1]);
- drawPoint(scan[SPAN_X2], scan[SPAN_Y2]);
- if (scan.length >= Q_LENGTH) {
- drawPoint(scan[SPAN_X3], scan[SPAN_Y3]);
+ for (var typeIndex = 0; typeIndex < types.length; ++typeIndex) {
+ var type = types[typeIndex];
+ var index = pts[typeIndex];
+ for (var idx = pts[typeIndex]; idx < (type == 1 ? pts[typeIndex] + 6 : pts[typeIndex] + 4); idx += 2) {
+ drawPoint(scan[idx], scan[idx + 1]);
+ }
}
}
+ var infoText = "";
if (info_mode && selected) {
- var infoText = "id=" + scan[SPAN_ID];
+ infoText += hasId >= 0 ? "id=" + scan[hasId] : partIndex;
+ }
+ if (intersect_mode && selected) {
+ if (scanType == ACTIVE_QUAD_SPAN) {
+ infoText += " t=" + scan[SPAN_Q_T];
+ } else if (scanType == ACTIVE_LINE_SPAN) {
+ infoText += " t=" + scan[SPAN_L_T];
+ } else if (scanType == INTERSECT_QUAD_LINE ||scanType == INTERSECT_QUAD) {
+ infoText += " t0[0]=" + scan[1] + " t1[0]=" + scan[10];
+ } else if (scanType == INTERSECT_QUAD_LINE_2 || scanType == INTERSECT_QUAD_2) {
+ infoText += " t0[0]=" + scan[1] + " t0[1]=" + scan[10] + " t1[0]=" + scan[13];
+ if (scanType == INTERSECT_QUAD_LINE_2) {
+ infoText += " t1[1]=" + scan[18];
+ } else {
+ infoText += " t0[1]=" + scan[20];
+ }
+ }
+ }
+ if (infoText.length > 0) {
ctx.fillStyle="green";
- ctx.fillText(infoText, 10, scans * 50 + 100);
+ ctx.fillText(infoText, 10, (hasId >= 0 && sequence >= 0
+ ? hasId : partIndex) * 30 + 50);
}
if (intersect_mode && selected) {
ctx.fillStyle="rgba(50,100,200, 1.0)";
- if (isQuad) {
+ if (scanType == ACTIVE_QUAD_SPAN) {
drawPoint(scan[SPAN_Q_TX], scan[SPAN_Q_TY]);
- } else {
+ } else if (scanType == ACTIVE_LINE_SPAN) {
drawPoint(scan[SPAN_L_TX], scan[SPAN_L_TY]);
+ } else if (scanType != INTERSECT_QUAD_NO && scanType != INTERSECT_QUAD_LINE_NO) {
+ drawPoint(scan[8], scan[9]);
+ if (scanType == INTERSECT_QUAD_LINE_2 || scanType == INTERSECT_QUAD_2) {
+ drawPoint(scan[11], scan[12]);
+ }
}
}
+ ctx.strokeStyle = "rgba(0,0,0, 0.2)";
+ scanType = -1;
}
+ drawDeferred();
}
function drawTop() {
break;
case 's':
sequence++;
- drawTop();
+ redraw();
+ break;
+ case 'S':
+ sequence--;
+ if (sequence < 0) {
+ sequence = 0;
+ }
+ redraw();
break;
case 't':
intersect_mode ^= true;
var title = testDivs[i].id.toString();
var str = testDivs[i].firstChild.data;
parse_debugShowActiveSpans(str, title);
+ parse_intersections(str, title);
}
drawTop();
window.addEventListener('keypress', doKeyPress, true);
path.close();
</div>
+<div id="testQuadratic59o">
+path.moveTo(369.863983, 145.645813);
+path.quadTo(382.380371, 121.254936, 406.236359, 121.254936);
+path.quadTo(409.445679, 121.254936, 412.975952, 121.789818);
+path.lineTo(369.863983, 145.645813);
+path.close();
+path.moveTo(369.970581, 137.94342);
+path.quadTo(383.98465, 121.254936, 406.235992, 121.254936);
+path.quadTo(425.705902, 121.254936, 439.71994, 137.087616);
+path.lineTo(369.970581, 137.94342);
+path.close();
+</div>
+
+<div id="testQuadratic59s">
+path.moveTo(369.970581,137.94342);
+path.quadTo(383.98465,121.254936, 406.235992,121.254936);
+path.quadTo(406.237854,121.254936, 406.239746,121.254936);
+path.lineTo(406.239532,121.254936);
+path.quadTo(409.447418,121.255203, 412.975952,121.789818);
+</div>
+
+<div id="testQuadratic60">
+path.moveTo(360.416077, 166.795715);
+path.quadTo(370.126831, 147.872162, 388.635406, 147.872162);
+path.lineTo(360.416077, 166.795715);
+path.close();
+path.moveTo(353.2948, 194.351074);
+path.quadTo(353.2948, 173.767563, 364.167572, 160.819855);
+path.quadTo(375.040314, 147.872162, 392.303894, 147.872162);
+path.lineTo(353.2948, 194.351074);
+path.close();
+</div>
+
+<div id="testQuadratic61">
+path.moveTo(348.781738, 123.864815);
+path.lineTo(369.848602, 123.864815);
+path.lineTo(369.848602, 145.680267);
+path.quadTo(382.360413, 121.298294, 406.207703, 121.298294);
+path.lineTo(348.781738, 123.864815);
+path.close();
+path.moveTo(369.961151, 137.980698);
+path.quadTo(383.970093, 121.298294, 406.213287, 121.298294);
+path.lineTo(369.961151, 137.980698);
+path.close();
+</div>
+
</div>
<script type="text/javascript">
var testDivs = [
+ testQuadratic61,
+ testQuadratic60,
+ testQuadratic59o,
+ testQuadratic59s,
testQuadratic58o,
testQuadratic58a,
testQuadratic58s,
projects / platform / upstream / libSkiaSharp.git / commitdiff