scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-08 05:42:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve selfIntersections if both operands to a boolean op is the same path

Browse source
This commit is contained in:
hkrish 2014-02-16 19:02:07 +01:00
parent e88ae54a22
commit 92c13ae48b
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/path/PathItem.Boolean.js
View file

@ -76,14 +76,16 @@ PathItem.inject(new function() { // FIXME: Is new necessary?
// The result might not belong to the same type // The result might not belong to the same type
// i.e. subtraction(A:Path, B:Path):CompoundPath etc. // i.e. subtraction(A:Path, B:Path):CompoundPath etc.
// Also apply matrices to both paths in case they were transformed. // Also apply matrices to both paths in case they were transformed.
var singlePathOp = path1 === path2;
path1 = reorientPath(path1.clone(false).applyMatrix()); path1 = reorientPath(path1.clone(false).applyMatrix());
if (!singlePathOp)
path2 = reorientPath(path2.clone(false).applyMatrix()); path2 = reorientPath(path2.clone(false).applyMatrix());
// Do operator specific calculations before we begin // Do operator specific calculations before we begin
// Make both paths at clockwise orientation, except when @subtract = true // Make both paths at clockwise orientation, except when @subtract = true
// We need both paths at opposit orientation for subtraction // We need both paths at opposit orientation for subtraction
if (!path1.isClockwise()) if (!path1.isClockwise())
path1.reverse(); path1.reverse();
if (!(subtract ^ path2.isClockwise())) if (!singlePathOp && !(subtract ^ path2.isClockwise()))
path2.reverse(); path2.reverse();
var intersections, i, j, l, lj, segment, wind, var intersections, i, j, l, lj, segment, wind,
point, startSeg, crv, length, parent, v, horizontal, point, startSeg, crv, length, parent, v, horizontal,
@ -101,10 +103,12 @@ PathItem.inject(new function() { // FIXME: Is new necessary?
tolerance = Numerical.TOLERANCE, tolerance = Numerical.TOLERANCE,
getWindingNumber = PathItem._getWindingNumber; getWindingNumber = PathItem._getWindingNumber;
// Split curves at intersections on both paths. // Split curves at intersections on both paths.
intersections = path1.getIntersections(path2, true); intersections = singlePathOp ? path1.getSelfIntersections(true)
: path1.getIntersections(path2, true);
PathItem._splitPath(intersections); PathItem._splitPath(intersections);
// Collect all sub paths and segments // Collect all sub paths and segments
paths.push.apply(paths, path1._children || [path1]); paths.push.apply(paths, path1._children || [path1]);
if (!singlePathOp)
paths.push.apply(paths, path2._children || [path2]); paths.push.apply(paths, path2._children || [path2]);
for (i = 0, l = paths.length; i < l; i++){ for (i = 0, l = paths.length; i < l; i++){
@ -186,6 +190,7 @@ PathItem.inject(new function() { // FIXME: Is new necessary?
result.addChild(paths[i], true); result.addChild(paths[i], true);
// Delete the proxies // Delete the proxies
path1.remove(); path1.remove();
if (!singlePathOp)
path2.remove(); path2.remove();
// And then, we are done. // And then, we are done.
return result.reduce(); return result.reduce();