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

Revert "One more simplification."

Browse source 
This reverts commit 0ce825f8c9.
This commit is contained in:
Jürg Lehni 2015-10-13 09:35:08 +02:00
parent 0ce825f8c9
commit b5c59c881c
1 changed files with 5 additions and 4 deletions

9
src/path/CurveLocation.js
View file

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