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

Minor clean-up in fat-line code.

Browse source
This commit is contained in:
Jürg Lehni 2015-08-30 19:59:13 +02:00
parent 0651eee0c2
commit 20222be5c6
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/path/Curve.js
View file

@ -1251,7 +1251,7 @@ new function() { // Scope for methods that require private functions
// below when determining which curve converges the least. He also // below when determining which curve converges the least. He also
// recommended a threshold of 0.5 instead of the initial 0.8 // recommended a threshold of 0.5 instead of the initial 0.8
// See: https://github.com/paperjs/paper.js/issues/565 // See: https://github.com/paperjs/paper.js/issues/565
if (recursion > 32) if (++recursion >= 32)
return; return;
// Let P be the first curve and Q be the second // Let P be the first curve and Q be the second
var q0x = v2[0], q0y = v2[1], q3x = v2[6], q3y = v2[7], var q0x = v2[0], q0y = v2[1], q3x = v2[6], q3y = v2[7],
@ -1272,8 +1272,8 @@ new function() { // Scope for methods that require private functions
dp2 = getSignedDistance(q0x, q0y, q3x, q3y, v1[4], v1[5]), dp2 = getSignedDistance(q0x, q0y, q3x, q3y, v1[4], v1[5]),
dp3 = getSignedDistance(q0x, q0y, q3x, q3y, v1[6], v1[7]), dp3 = getSignedDistance(q0x, q0y, q3x, q3y, v1[6], v1[7]),
tMinNew, tMaxNew, tDiff; tMinNew, tMaxNew, tDiff;
if (q0x === q3x && uMax - uMin < tolerance && recursion > 3) { if (q0x === q3x && uMax - uMin < tolerance && recursion >= 3) {
// The fatline of Q has converged to a point, the clipping is not // The fat-line of Q has converged to a point, the clipping is not
// reliable. Return the value we have even though we will miss the // reliable. Return the value we have even though we will miss the
// precision. // precision.
tMaxNew = tMinNew = (tMax + tMin) / 2; tMaxNew = tMinNew = (tMax + tMin) / 2;
@ -1292,7 +1292,7 @@ new function() { // Scope for methods that require private functions
// No intersections if one of the tvalues are null or 'undefined' // No intersections if one of the tvalues are null or 'undefined'
if (tMinClip == null || tMaxClip == null) if (tMinClip == null || tMaxClip == null)
return; return;
// Clip P with the fatline for Q // Clip P with the fat-line for Q
v1 = Curve.getPart(v1, tMinClip, tMaxClip); v1 = Curve.getPart(v1, tMinClip, tMaxClip);
tDiff = tMaxClip - tMinClip; tDiff = tMaxClip - tMinClip;
// tMin and tMax are within the range (0, 1). We need to project it // tMin and tMax are within the range (0, 1). We need to project it
@ -1308,7 +1308,7 @@ new function() { // Scope for methods that require private functions
t = tMinNew + (tMaxNew - tMinNew) / 2; t = tMinNew + (tMaxNew - tMinNew) / 2;
addCurveIntersections( addCurveIntersections(
v2, parts[0], curve2, curve1, locations, include, v2, parts[0], curve2, curve1, locations, include,
uMin, uMax, tMinNew, t, tDiff, !reverse, ++recursion); uMin, uMax, tMinNew, t, tDiff, !reverse, recursion);
addCurveIntersections( addCurveIntersections(
v2, parts[1], curve2, curve1, locations, include, v2, parts[1], curve2, curve1, locations, include,
uMin, uMax, t, tMaxNew, tDiff, !reverse, recursion); uMin, uMax, t, tMaxNew, tDiff, !reverse, recursion);
@ -1317,7 +1317,7 @@ new function() { // Scope for methods that require private functions
t = uMin + (uMax - uMin) / 2; t = uMin + (uMax - uMin) / 2;
addCurveIntersections( addCurveIntersections(
parts[0], v1, curve2, curve1, locations, include, parts[0], v1, curve2, curve1, locations, include,
uMin, t, tMinNew, tMaxNew, tDiff, !reverse, ++recursion); uMin, t, tMinNew, tMaxNew, tDiff, !reverse, recursion);
addCurveIntersections( addCurveIntersections(
parts[1], v1, curve2, curve1, locations, include, parts[1], v1, curve2, curve1, locations, include,
t, uMax, tMinNew, tMaxNew, tDiff, !reverse, recursion); t, uMax, tMinNew, tMaxNew, tDiff, !reverse, recursion);
@ -1337,7 +1337,7 @@ new function() { // Scope for methods that require private functions
} }
} else if (tDiff > /*#=*/Numerical.EPSILON) { // Iterate } else if (tDiff > /*#=*/Numerical.EPSILON) { // Iterate
addCurveIntersections(v2, v1, curve2, curve1, locations, include, addCurveIntersections(v2, v1, curve2, curve1, locations, include,
uMin, uMax, tMinNew, tMaxNew, tDiff, !reverse, ++recursion); uMin, uMax, tMinNew, tMaxNew, tDiff, !reverse, recursion);
} }
} }