scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-05 20:32:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change the way we determine the winding in getWinding(). Now the windings only get counted if the point is not on any of the y-monotonic curves. If the point is on a curve, the winding will be made odd at the very end.

Browse source
This commit is contained in:
iconexperience 2016-02-03 11:29:43 +01:00
parent 96d617a5ff
commit aed9d05bfc
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/path/PathItem.Boolean.js
View file

@ -349,7 +349,8 @@ PathItem.inject(new function() {
var xBefore = px - epsilon, var xBefore = px - epsilon,
xAfter = px + epsilon, xAfter = px + epsilon,
prevWinding, prevWinding,
prevXEnd; prevXEnd,
isOnCurve;
for (var i = 0; i < length; i++) { for (var i = 0; i < length; i++) {
var curve = curves[i], var curve = curves[i],
winding = curve.winding, winding = curve.winding,
@ -360,9 +361,9 @@ PathItem.inject(new function() {
// non-zero winding. // non-zero winding.
// Retrieve and use it here (See _getMonoCurve()). // Retrieve and use it here (See _getMonoCurve()).
if (curve.last) { if (curve.last) {
// Get the values of to the end x coordinate and winding of // Get the end x coordinate and winding of the last
// the last non-horizontal curve, which will be the previous // non-horizontal curve, which will be the previous
// non-horizontal curve for the first curve of the loop. // non-horizontal curve for first curve in the loop.
prevWinding = curve.last.winding; prevWinding = curve.last.winding;
prevXEnd = curve.last.values[6]; prevXEnd = curve.last.values[6];
} }
@ -373,33 +374,33 @@ PathItem.inject(new function() {
// Horizontal curves with winding == 0 will be completely // Horizontal curves with winding == 0 will be completely
// ignored. // ignored.
if (winding && (py >= yStart && py <= yEnd if (winding && (py >= yStart && py <= yEnd
|| py >= yEnd && py <= yStart)) { || py >= yEnd && py <= yStart)) {
// Calculate the x value for the ray's intersection. // Calculate the x value for the ray's intersection.
var x = py === yStart ? values[0] var x = py === yStart ? values[0]
: py === yEnd ? values[6] : py === yEnd ? values[6]
: Curve.solveCubic(values, 1, py, roots, 0, 1) === 1 : Curve.solveCubic(values, 1, py, roots, 0, 1) === 1
? Curve.getPoint(values, roots[0]).x ? Curve.getPoint(values, roots[0]).x
: null; : null;
if (x != null) { if (x != null) {
// If the point is between the curve's start point and
// the previous curve's end point, it must be on a
// horizontal curve inbetween.
var isOnHorizontal =
(py === yStart && (px - x) * (px - prevXEnd) < 0);
// Test if the point is on a y-monotonic curve
if ((x >= xBefore && x <= xAfter) || isOnHorizontal)
isOnCurve = true;
// Count the intersection of the ray with the // Count the intersection of the ray with the
// monotonic curve if: // y-monotonic curve if:
// - the crossing is not at the start of the curve // - the crossing is not the start or end of the curve
// - or the windings are opposite (intersect at a // - or the crossing is at the start of the curve and
// vertical extremum) // the winding did not change between curves
// - or the start of the current curve and the end if (py != yEnd
// of the prev curve are on opposite sides of px && (py != yStart || winding === prevWinding)) {
var isWindingChange = winding === -prevWinding;
if (py !== yStart || isWindingChange
|| (x - px) * (prevXEnd - px) < 0) {
if (x < xBefore) { if (x < xBefore) {
windLeft += winding; windLeft += winding;
} else if (x > xAfter) { } else if (x > xAfter) {
windRight += winding; windRight += winding;
} else if (py === yStart && isWindingChange) {
// The point is a vertical extremum of the
// path.
++windLeft;
++windRight;
} }
} }
} }
@ -410,7 +411,8 @@ PathItem.inject(new function() {
} }
} }
} }
return Math.max(abs(windLeft), abs(windRight)); // If the point was on a monocurve, ensure that the winding is odd.
return Math.max(abs(windLeft), abs(windRight)) | (isOnCurve ? 1 : 0 );
} }
function propagateWinding(segment, path1, path2, monoCurves, operator) { function propagateWinding(segment, path1, path2, monoCurves, operator) {