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

One more simplification.

Browse source
This commit is contained in:
Jürg Lehni 2015-10-13 08:34:48 +02:00
parent 2bb3df3314
commit 0ce825f8c9
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/path/CurveLocation.js
View file

@ -482,12 +482,11 @@ new function() { // Scope for statics
l = 0, l = 0,
r = length - 1; r = length - 1;
function check(index, dir) { function check(index) {
// If we reach the beginning/end of the list, compare with the // If we reach the beginning/end of the list, compare with the
// location at the other end, as paths are circular lists. // location at the other end, as paths are circular lists.
var i = index + dir, var loc2 = locations[index >= 0 && index < length
loc2 = locations[i >= 0 && i < length ? index : (index < 0 ? length - 1 : 0)];
? i : (i < 0 ? length - 1 : 0)];
return loc.equals(loc2) ? loc2 : null; return loc.equals(loc2) ? loc2 : null;
} }
@ -498,7 +497,7 @@ new function() { // Scope for statics
// See if the two locations are actually the same, and merge if // See if the two locations are actually the same, and merge if
// they are. If they aren't, check the neighbors through check() // they are. If they aren't, check the neighbors through check()
if (merge && (found = loc.equals(loc2) ? loc2 if (merge && (found = loc.equals(loc2) ? loc2
: (check(m, -1) || check(m, 1)))) { : (check(m - 1) || check(m + 1)))) {
// We're done, don't insert, merge with the found location // We're done, don't insert, merge with the found location
// instead, and carry over overlap: // instead, and carry over overlap:
if (loc._overlap) { if (loc._overlap) {