scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-03-13 16:33:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix filtering of locations at ends of curves in addCurveLineIntersections()

Browse source 
Only occured when the line / curve had to be flipped.
This commit is contained in:
Jürg Lehni 2015-09-21 16:56:08 -04:00
parent 6a29f200e3
commit db1ecdddd5
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/path/Curve.js
View file

@ -1584,11 +1584,10 @@ new function() { // Scope for intersection using bezier fat-line clipping
x * cos - y * sin,
x * sin + y * cos);
}
// Solve it for y = 0
// Solve it for y = 0. We need to include t = 0, 1 and let addLocation()
// do the filtering, to catch important edge cases.
var roots = [],
tMin = /*#=*/Numerical.CURVETIME_EPSILON,
tMax = 1 - tMin;
count = Curve.solveCubic(rvc, 1, 0, roots, tMin, tMax);
count = Curve.solveCubic(rvc, 1, 0, roots, 0, 1);
// NOTE: count could be -1 for infinite solutions, but that should only
// happen with lines, in which case we should not be here.
for (var i = 0; i < count; i++) {
@ -1599,9 +1598,21 @@ new function() { // Scope for intersection using bezier fat-line clipping
tl = Curve.getParameterOf(vl, pc.x, pc.y);
if (tl !== null) {
var pl = Curve.getPoint(vl, tl);
// TODO: Consider passing these as actual arguments so flipping
// is less cumbersome:
var startConnected = param.startConnected,
endConnected = param.endConnected;
if (flip) {
param.endConnected = startConnected;
param.startConnected = endConnected;
}
addLocation(locations, param,
v1, c1, flip ? tl : tc, flip ? pl : pc,
v2, c2, flip ? tc : tl, flip ? pc : pl);
if (flip) {
param.endConnected = endConnected;
param.startConnected = startConnected;
}
}
}
}