scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-23 05:52:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Make sure chirality of subtracted path is correct. Sort pieces by area so that we check for holes in most nested pieces first. This breaks if paths cross themselves.

Browse source
This commit is contained in:
DD 2017-10-27 13:30:22 -04:00
parent 819215786f
commit 85d7090ad0
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/helper/blob-tools/blob.js
View file

@ -290,6 +290,7 @@ class Blobbiness {
lastPath.remove(); lastPath.remove();
continue; continue;
} }
// Erase // Erase
const newPath = items[i].subtract(lastPath); const newPath = items[i].subtract(lastPath);
newPath.insertBelow(items[i]); newPath.insertBelow(items[i]);
@ -329,6 +330,9 @@ class Blobbiness {
} }
separateCompoundPath (compoundPath) { separateCompoundPath (compoundPath) {
if (!compoundPath.isClockwise()) {
compoundPath.reverse();
}
// Divide topologically separate shapes into their own compound paths, instead of // Divide topologically separate shapes into their own compound paths, instead of
// everything being stuck together. // everything being stuck together.
// Assume that result of erase operation returns clockwise paths for positive shapes // Assume that result of erase operation returns clockwise paths for positive shapes
@ -342,6 +346,11 @@ class Blobbiness {
ccwChildren.push(child); ccwChildren.push(child);
} }
} }
// Sort by area smallest to largest
clockwiseChildren.sort((a, b) => a.area - b.area);
ccwChildren.sort((a, b) => Math.abs(a.area) - Math.abs(b.area));
// Go smallest to largest non-hole, so larger non-holes don't get the smaller pieces' holes
for (let j = 0; j < clockwiseChildren.length; j++) { for (let j = 0; j < clockwiseChildren.length; j++) {
const cw = clockwiseChildren[j]; const cw = clockwiseChildren[j];
cw.copyAttributes(compoundPath); cw.copyAttributes(compoundPath);
@ -350,7 +359,7 @@ class Blobbiness {
cw.strokeWidth = compoundPath.strokeWidth; cw.strokeWidth = compoundPath.strokeWidth;
cw.insertAbove(compoundPath); cw.insertAbove(compoundPath);
// Go backward since we are deleting elements // Go backward since we are deleting elements. Backwards is largest to smallest hole.
let newCw = cw; let newCw = cw;
for (let k = ccwChildren.length - 1; k >= 0; k--) { for (let k = ccwChildren.length - 1; k >= 0; k--) {
const ccw = ccwChildren[k]; const ccw = ccwChildren[k];