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

Fix remaining issues with curve location sorting.

Browse source 
Relates to #787
This commit is contained in:
Jürg Lehni 2015-09-16 10:44:41 +02:00
parent f8bd7a2005
commit 0980ad3fe9
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/path/CurveLocation.js
View file

@ -403,16 +403,22 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
if (path1 === path2) { if (path1 === path2) {
if (curve1 === curve2) { if (curve1 === curve2) {
var diff = l1._parameter - l2._parameter; var diff = l1._parameter - l2._parameter;
// TODO: Compare points instead of parameter like in
// equals? or curve time there too? Why was it changed?
if (Math.abs(diff) < /*#=*/Numerical.CURVETIME_EPSILON){ if (Math.abs(diff) < /*#=*/Numerical.CURVETIME_EPSILON){
var i1 = l1._intersection, var i1 = l1._intersection,
i2 = l2._intersection, i2 = l2._intersection,
curve21 = i1 && i1._curve, curve21 = i1 && i1._curve,
curve22 = i2 && l2._curve; curve22 = i2 && i2._curve,
path21 = curve21 && curve21._path,
path22 = curve22 && curve22._path;
res = curve21 === curve22 // equal or both null res = curve21 === curve22 // equal or both null
? i1 && i2 ? i1._parameter - i2._parameter : 0 ? i1 && i2 ? i1._parameter - i2._parameter : 0
: curve21 && curve22 : curve21 && curve22
? curve21.getIndex() - curve22.getIndex() ? path21 === path22
: curve21 ? 1 : -1; ? curve21.getIndex() - curve22.getIndex()
: curve21 ? 1 : -1
: path21._id - path22._id;
} else { } else {
res = diff; res = diff;
} }