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

More clean-up in computeBoolean() code.

Browse source
This commit is contained in:
Jürg Lehni 2014-02-20 19:10:46 +01:00
parent ec621eef81
commit 2a4696b865
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,32 +83,34 @@ PathItem.inject(new function() {
path2 = selfOp ? path1
: reorientPath(path2.clone(false).reduce().applyMatrix());
// Do operator specific calculations before we begin
// Make both paths at clockwise orientation, except when @subtract = true
// We need both paths at opposit orientation for subtraction
// Make both paths at clockwise orientation, except when subtract = true
// We need both paths at opposite orientation for subtraction.
if (!path1.isClockwise())
path1.reverse();
if (!selfOp && !(subtract ^ path2.isClockwise()))
path2.reverse();
// Split curves at intersections on both paths.
PathItem._splitPath(path1.getIntersections(path2, true));
var chain = [],
windings = [],
lengths = [],
paths = [],
segments = [],
// Aggregate of all curves in both operands, monotonic in y
monoCurves = [],
TOLERANCE = /*#=*/ Numerical.TOLERANCE,
intersections = path1.getIntersections(path2, true);
// Split curves at intersections on both paths.
PathItem._splitPath(intersections);
// Collect all sub paths and segments
paths.push.apply(paths, path1._children || [path1]);
if (!selfOp)
paths.push.apply(paths, path2._children || [path2]);
monoCurves = [];
for (var i = 0, l = paths.length; i < l; i++) {
segments.push.apply(segments, paths[i].getSegments());
monoCurves.push.apply(monoCurves, paths[i]._getMonoCurves());
function collect(paths) {
for (var i = 0, l = paths.length; i < l; i++) {
var path = paths[i];
segments.push.apply(segments, path._segments);
monoCurves.push.apply(monoCurves, path._getMonoCurves());
}
}
// Collect all segments and monotonic curves
collect(path1._children || [path1]);
if (!selfOp)
collect(path2._children || [path2]);
// Propagate the winding contribution. Winding contribution of curves
// does not change between two intersections.
// First, sort all segments with an intersection to the begining.
@ -159,7 +161,7 @@ PathItem.inject(new function() {
// the first operand.
windings[j] = subtract
&& (path === path1 && path2._getWinding(point, hor)
|| path === path2 && !path1._getWinding(point, hor))
|| path === path2 && !path1._getWinding(point, hor))
? 0
: PathItem._getWinding(point, monoCurves, hor);
}