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

Merge the two convergence checks to one.

Browse source
This commit is contained in:
Jürg Lehni 2013-05-24 21:11:10 -07:00
parent ec1ef905cf
commit 24f61c854a
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fatline/Intersect.js
View file

@ -141,23 +141,14 @@ function getCurveIntersections(v1, v2, curve1, curve2, locations,
// Check if one of the parameter range has converged completely to a // Check if one of the parameter range has converged completely to a
// point. Now things could get only worse if we iterate more for the // point. Now things could get only worse if we iterate more for the
// other curve to converge if it hasn't yet happened so. // other curve to converge if it hasn't yet happened so.
var span1 = Math.abs(range1[1] - range1[0]), var converged1 = Math.abs(range1[1] - range1[0]) < /*#=*/ Numerical.TOLERANCE,
span2 = Math.abs(range2[1] - range2[0]), converged2 = Math.abs(range2[1] - range2[0]) < /*#=*/ Numerical.TOLERANCE;
converged1 = span1 < /*#=*/ Numerical.EPSILON,
converged2 = span2 < /*#=*/ Numerical.EPSILON;
if (converged1 || converged2) { if (converged1 || converged2) {
addLocation(locations, curve1, null, converged1 addLocation(locations, curve1, null, converged1
? curve1.getPointAt(range1[0], true) ? curve1.getPointAt(range1[0], true)
: curve2.getPointAt(range2[0], true), curve2); : curve2.getPointAt(range2[0], true), curve2);
break; break;
} }
if (span1 <= /*#=*/ Numerical.TOLERANCE
&& span2 <= /*#=*/ Numerical.TOLERANCE) {
// Both parameter ranges have converged.
addLocation(locations, curve1, range1[0],
curve1.getPointAt(range1[0], true), curve2);
break;
}
// see if either or both of the curves are flat enough to be treated // see if either or both of the curves are flat enough to be treated
// as lines. // as lines.
var flat1 = Curve.isFlatEnough(part1, /*#=*/ Numerical.TOLERANCE), var flat1 = Curve.isFlatEnough(part1, /*#=*/ Numerical.TOLERANCE),