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

Rename Curve.getCurvesIntersections() to Curve. getIntersections()

Browse source
This commit is contained in:
Jürg Lehni 2017-02-12 15:47:01 +01:00
parent bd98e067c3
commit 2ead16ca89
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/path/Curve.js
View file

@ -2090,7 +2090,7 @@ new function() { // Scope for bezier intersection using fat-line clipping
return locations; return locations;
} }
function getCurvesIntersections(curves1, curves2, include, matrix1, matrix2, function getIntersections(curves1, curves2, include, matrix1, matrix2,
_returnFirst) { _returnFirst) {
var self = !curves2; var self = !curves2;
if (self) if (self)
@ -2258,10 +2258,9 @@ new function() { // Scope for bezier intersection using fat-line clipping
}, },
statics: /** @lends Curve */{ statics: /** @lends Curve */{
getCurveIntersections: getCurveIntersections,
getCurvesIntersections: getCurvesIntersections,
getOverlaps: getOverlaps, getOverlaps: getOverlaps,
// Exposed for use in boolean offsetting // Exposed for use in boolean offsetting
getIntersections: getIntersections,
getCurveLineIntersections: getCurveLineIntersections getCurveLineIntersections: getCurveLineIntersections
} }
}; };

2
src/path/PathItem.js
View file

@ -331,7 +331,7 @@ var PathItem = Item.extend(/** @lends PathItem# */{
// First check the bounds of the two paths. If they don't intersect, // First check the bounds of the two paths. If they don't intersect,
// we don't need to iterate through their curves. // we don't need to iterate through their curves.
return self || this.getBounds(matrix1).touches(path.getBounds(matrix2)) return self || this.getBounds(matrix1).touches(path.getBounds(matrix2))
? Curve.getCurvesIntersections( ? Curve.getIntersections(
this.getCurves(), !self && path.getCurves(), include, this.getCurves(), !self && path.getCurves(), include,
matrix1, matrix2, _returnFirst) matrix1, matrix2, _returnFirst)
: []; : [];