Skip to content

Commit

Permalink
Merge branch 'winding-fix' into develop
Browse files Browse the repository at this point in the history 
; Conflicts:
;	src/path/PathItem.Boolean.js
  • Loading branch information
@lehni
lehni committed Feb 5, 2016
2 parents fc4bdf4 + 55909b8 commit 5a46620
Show file tree
Hide file tree
Showing 2 changed files with 100 additions and 93 deletions.
79 changes: 42 additions & 37 deletions src/path/PathItem.Boolean.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,8 @@ PathItem.inject(new function() {
windRight = 0,
length = curves.length,
roots = [],
abs = Math.abs;
abs = Math.abs,
isOnCurve = false;
// Horizontal curves may return wrong results, since the curves are
// monotonic in y direction and this is an indeterminate state.
if (horizontal) {
Expand Down Expand Up @@ -360,57 +361,61 @@ PathItem.inject(new function() {
// non-zero winding.
// Retrieve and use it here (See _getMonoCurve()).
if (curve.last) {
// Get the values of to the end x coordinate and winding of
// the last non-horizontal curve, which will be the previous
// non-horizontal curve for the first curve of the loop.
// Get the end x coordinate and winding of the last
// non-horizontal curve, which will be the previous
// non-horizontal curve for the first curve in the loop.
prevWinding = curve.last.winding;
prevXEnd = curve.last.values[6];
}
// Since the curves are monotone in y direction, we can just
// compare the endpoints of the curve to determine if the
// ray from query point along +-x direction will intersect
// the monotone curve.
// Horizontal curves with winding == 0 will be completely
// ignored.
if (winding && (py >= yStart && py <= yEnd
|| py >= yEnd && py <= yStart)) {
// Calculate the x value for the ray's intersection.
var x = py === yStart ? values[0]
: py === yEnd ? values[6]
: Curve.solveCubic(values, 1, py, roots, 0, 1) === 1
if (py >= yStart && py <= yEnd || py >= yEnd && py <= yStart) {
if (winding) {
// Calculate the x value for the ray's intersection.
var x = py === yStart ? values[0]
: py === yEnd ? values[6]
: Curve.solveCubic(values, 1, py, roots, 0, 1) === 1
? Curve.getPoint(values, roots[0]).x
: null;
if (x != null) {
// Count the intersection of the ray with the
// monotonic curve if:
// - the crossing is not at the start of the curve
// - or the windings are opposite (intersect at a
// vertical extremum)
// - or the start of the current curve and the end
// of the prev curve are on opposite sides of px
var isWindingChange = winding === -prevWinding;
if (py !== yStart || isWindingChange
|| (x - px) * (prevXEnd - px) < 0) {
if (x < xBefore) {
windLeft += winding;
} else if (x > xAfter) {
windRight += winding;
} else if (py === yStart && isWindingChange) {
// The point is a vertical extremum of the
// path.
++windLeft;
++windRight;
if (x != null) {
// Test if the point is on the current mono-curve.
if (x >= xBefore && x <= xAfter) {
isOnCurve = true;
} else if (
// Count the intersection of the ray with the
// monotonic curve if the crossing is not the
// start of the curve, except if the winding
// changes...
(py !== yStart || winding !== prevWinding)
// ...and the point is not on the curve or on
// the horizontal connection between the last
// non-horizontal curve's end point and the
// current curve's start point.
&& !(py === yStart
&& (px - x) * (px - prevXEnd) < 0)) {
if (x < xBefore) {
windLeft += winding;
} else if (x > xAfter) {
windRight += winding;
}
}
}
// Update previous winding and end coordinate whenever
// the ray intersects a non-horizontal curve.
prevWinding = winding;
prevXEnd = values[6];
// Test if the point is on the horizontal curve
} else if ((px - values[0]) * (px - values[6]) <= 0) {
isOnCurve = true;
}
// Update previous winding and end coordinate whenever
// the ray intersects a non-horizontal curve.
prevWinding = winding;
prevXEnd = values[6];
}
}
}
return Math.max(abs(windLeft), abs(windRight));
// If the point was on a monotonic curve, we are on the path by
// definition. In this case ensure that the winding is at least 1.
return Math.max(abs(windLeft), abs(windRight), isOnCurve ? 1 : 0);
}

function propagateWinding(segment, path1, path2, monoCurves, operator) {
Expand Down
114 changes: 58 additions & 56 deletions test/tests/PathItem_Contains.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,67 +216,69 @@ test('Path#contains() (complex shape)', function() {


test('Path#contains() (straight curves with zero-winding)', function() {
var pathPoints = [
[140, 100],
[140, 10],
[100, 10],
[100, 20],
[120, 20],
[120, 40],
[100, 40],
[100, 60],
[200, 60],
[120, 60],
[120, 100],
[300, 100],
[50, 100]
var pointData = [
[[250, 230], true, true, false, true],
[[200, 230], true, true, true, true],
[[200, 280], false, true, false, true],
[[190, 280], true, false, false, true],
[[175, 270], true, true, false, true],
[[175, 220], true, true, true, true],
[[175, 270], true, true, false, true],
[[160, 280], false, true, false, true],
[[150, 280], true, false, false, true],
[[150, 220], true, false, true, true],
[[150, 200], true, true, true, true],
[[100, 200], true, false, false, true],
[[100, 190], true, true, true, true],
[[50, 190], true, false, false, false],
[[100, 190], true, true, true, true],
[[100, 180], true, false, true, false],
[[150, 180], true, true, true, true],
[[150, 160], true, false, true, true],
[[150, 100], true, false, true, false],
[[160, 100], false, true, true, false],
[[175, 110], true, true, true, false],
[[175, 160], true, true, true, true],
[[175, 110], true, true, true, false],
[[190, 100], true, false, true, false],
[[200, 100], false, true, true, false],
[[200, 150], true, true, true, true],
[[250, 150], true, true, true, false],
[[270, 120], false, false, true, true],
[[270, 90], false, false, true, false],
[[270, 120], false, false, true, true],
[[290, 150], false, true, true, false],
[[290, 180], true, true, true, true],
[[340, 180], false, true, true, false],
[[340, 190], true, true, true, true],
[[390, 190], false, true, false, false],
[[340, 190], true, true, true, true],
[[340, 200], false, true, false, true],
[[290, 200], true, true, true, true],
[[290, 230], false, true, false, true],
[[270, 260], false, false, true, true],
[[270, 290], false, false, false, true],
[[270, 260], false, false, true, true],
[[250, 230], true, true, false, true]
];

var path1 = new Path({
segments: pathPoints,
closed: true,
fillRule: 'evenodd'
});

var hitPoints = [
[[30,10], false],
[[110,10], true],
[[30,20], false],
[[110,20], true],
[[130,20], true],
[[170,20], false],
[[110,50], true],
[[30,60], false],
[[110,60], true],
[[130,60], true],
[[150,60], false],
[[230,60], false],
[[10,100], false],
[[60,100], false],
[[130,100], true],
[[170,100], false],
[[370,100], false]
];

for (var i = 0; i < hitPoints.length; i++) {
var entry = hitPoints[i];
testPoint(path1, new Point(entry[0]), entry[1]);
var points = [];
for (var i = 0; i < pointData.length; i++) {
points.push(pointData[i][0]);
}
var path = new paper.Path({segments: points, closed: true});
path.setWindingRule("evenodd");

// Now test the x-y-reversed shape

for (var i = 0; i < pathPoints.length; i++) {
pathPoints[i].reverse();
var offsetPoint = function(p, xOffs, yOffs) {
return new paper.Point(p.x + xOffs, p.y + yOffs);
}

var path1 = new Path({
segments: pathPoints,
closed: true,
fillRule: 'evenodd'
});

for (var i = 0; i < hitPoints.length; i++) {
var entry = hitPoints[i];
testPoint(path1, new Point(entry[0].reverse()), entry[1]);
for (var i = 0; i < pointData.length; i++) {
var p = new paper.Point(points[i]);
testPoint(path, p, true); // point is a segment of the path, must be inside
testPoint(path, offsetPoint(p, 10, 0), pointData[i][1]);
testPoint(path, offsetPoint(p, -10, 0), pointData[i][2]);
testPoint(path, offsetPoint(p, 0, 10), pointData[i][3]);
testPoint(path, offsetPoint(p, 0, -10), pointData[i][4]);
}
})

0 comments on commit 5a46620

Please sign in to comment.