mirror of
https://github.com/scratchfoundation/paper.js.git
synced 2025-01-22 07:19:57 -05:00
Revert bdcfb60a9a
Since it broke the last example of BooleanOperations.html
This commit is contained in:
parent
5dd26f5b9f
commit
daa4c12b46
1 changed files with 6 additions and 3 deletions
|
@ -119,13 +119,16 @@ var PathItem = Item.extend(/** @lends PathItem# */{
|
||||||
// Check for intersections with other curves. For self intersection,
|
// Check for intersections with other curves. For self intersection,
|
||||||
// we can start at i + 1 instead of 0
|
// we can start at i + 1 instead of 0
|
||||||
for (var j = path ? 0 : i + 1; j < length2; j++) {
|
for (var j = path ? 0 : i + 1; j < length2; j++) {
|
||||||
|
// Avoid end point intersections on consecutive curves whe self
|
||||||
|
// intersecting.
|
||||||
|
var excludeEnds = !path
|
||||||
|
&& (j === i + 1 || j === length2 - 1 && i === 0);
|
||||||
Curve.getIntersections(values1, values2[j], curve1,
|
Curve.getIntersections(values1, values2[j], curve1,
|
||||||
curves2[j], locations,
|
curves2[j], locations,
|
||||||
// Avoid end point intersections on consecutive curves
|
// Avoid end point intersections on consecutive curves
|
||||||
// when self intersecting.
|
// when self intersecting.
|
||||||
!path && (j === i + 1 || j === length2 - 1 && i === 0)
|
excludeEnds ? ZERO : 0, // tMin
|
||||||
? ZERO : 0, // tMin
|
excludeEnds ? ONE : 1); // tMax
|
||||||
ONE); // tMax
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Now filter the locations and process _expand:
|
// Now filter the locations and process _expand:
|
||||||
|
|
Loading…
Reference in a new issue