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

Improve CurveLocation.sort() to handle more edge cases.

Browse source 
Relates to #648
This commit is contained in:
Jürg Lehni 2015-08-28 16:17:54 +02:00
parent da0d01ee09
commit 0e26b53053
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/path/CurveLocation.js
View file

@ -55,6 +55,8 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
this._point = point || curve.getPointAt(parameter, true); this._point = point || curve.getPointAt(parameter, true);
this._curve2 = _curve2; this._curve2 = _curve2;
this._parameter2 = _parameter2; this._parameter2 = _parameter2;
if (_parameter2 == 0.19410221115440937)
debugger;
this._point2 = _point2; this._point2 = _point2;
this._distance = _distance; this._distance = _distance;
// Also store references to segment1 and segment2, in case path // Also store references to segment1 and segment2, in case path
@ -217,6 +219,7 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
this._parameter2, this._point2 || this._point); this._parameter2, this._point2 || this._point);
intersection._overlap = this._overlap; intersection._overlap = this._overlap;
intersection._intersection = this; intersection._intersection = this;
intersection._other = true;
} }
return intersection; return intersection;
}, },
@ -320,19 +323,32 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
var curve1 = l1._curve, var curve1 = l1._curve,
curve2 = l2._curve, curve2 = l2._curve,
path1 = curve1._path, path1 = curve1._path,
path2 = curve2._path; path2 = curve2._path,
res;
// Sort by path-id, curve, parameter, curve2, parameter2 so we // Sort by path-id, curve, parameter, curve2, parameter2 so we
// can easily remove duplicates with calls to equals() after. // can easily remove duplicates with calls to equals() after.
return path1 === path2 if (path1 === path2) {
? curve1 === curve2 if (curve1 === curve2) {
? Math.abs(l1._parameter - l2._parameter) < tolerance var diff = l1._parameter - l2._parameter;
? l1._curve2 === l2._curve2 if (Math.abs(diff) < tolerance) {
var curve21 = l1._curve2,
curve22 = l2._curve2;
res = curve21 === curve22 // equal or both null
? l1._parameter2 - l2._parameter2 ? l1._parameter2 - l2._parameter2
: l1._curve2.getIndex() - l2._curve2.getIndex() : curve21 && curve22
: l1._parameter - l2._parameter ? curve21.getIndex() - curve22.getIndex()
: curve1.getIndex() - curve2.getIndex() : curve21 ? 1 : -1;
} else {
res = diff;
}
} else {
res = curve1.getIndex() - curve2.getIndex();
}
} else {
// Sort by path id to group all locs on the same path. // Sort by path id to group all locs on the same path.
: path1._id - path2._id; res = path1._id - path2._id;
}
return res;
}); });
} }
} }