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

Improve handling of boolean debug options.

Browse source
This commit is contained in:
Jürg Lehni 2015-10-11 16:57:43 +02:00
parent 6cdead0e8c
commit 61db3d9d01
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -71,7 +71,7 @@ PathItem.inject(new function() {
return result; return result;
} }
var scaleFactor = 0.1; var scaleFactor = 1;
var textAngle = 0; var textAngle = 0;
var fontSize = 5; var fontSize = 5;
@ -85,15 +85,29 @@ PathItem.inject(new function() {
// for each curve in the graph after curves in the operands are // for each curve in the graph after curves in the operands are
// split at intersections. // split at intersections.
function computeBoolean(path1, path2, operation) { function computeBoolean(path1, path2, operation) {
scaleFactor = Base.pick(window.scaleFactor, scaleFactor);
textAngle = Base.pick(window.textAngle, 0);
segmentOffset = {}; segmentOffset = {};
pathIndices = {}; pathIndices = {};
var reportSegments = window.reportSegments;
var reportWindings = window.reportWindings;
var reportIntersections = window.reportIntersections;
if (path2) {
window.reportSegments = false;
window.reportWindings = false;
window.reportIntersections = false;
}
// We do not modify the operands themselves, but create copies instead, // We do not modify the operands themselves, but create copies instead,
// fas produced by the calls to preparePath(). // fas produced by the calls to preparePath().
// Note that the result paths might not belong to the same type // Note that the result paths 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.
var _path1 = preparePath(path1), var _path1 = preparePath(path1),
_path2 = path2 && path1 !== path2 && preparePath(path2); _path2 = path2 && path1 !== path2 && preparePath(path2);
window.reportSegments = reportSegments;
window.reportWindings = reportWindings;
window.reportIntersections = reportIntersections;
// Give both paths the same orientation except for subtraction // Give both paths the same orientation except for subtraction
// and exclusion, where we need them at opposite orientation. // and exclusion, where we need them at opposite orientation.
if (_path2 && /^(subtract|exclude)$/.test(operation) if (_path2 && /^(subtract|exclude)$/.test(operation)
@ -941,31 +955,17 @@ PathItem.inject(new function() {
}, },
resolveCrossings: function() { resolveCrossings: function() {
var reportSegments = window.reportSegments;
var reportWindings = window.reportWindings;
var reportIntersections = window.reportIntersections;
window.reportSegments = false;
window.reportWindings = false;
window.reportIntersections = false;
var crossings = this.getCrossings(); var crossings = this.getCrossings();
if (!crossings.length) { if (!crossings.length)
window.reportSegments = reportSegments;
window.reportWindings = reportWindings;
window.reportIntersections = reportIntersections;
return this.reorient(); return this.reorient();
}
splitPath(CurveLocation.expand(crossings)); splitPath(CurveLocation.expand(crossings));
var paths = this._children || [this], var paths = this._children || [this],
segments = []; segments = [];
for (var i = 0, l = paths.length; i < l; i++) { for (var i = 0, l = paths.length; i < l; i++) {
segments.push.apply(segments, paths[i]._segments); segments.push.apply(segments, paths[i]._segments);
} }
var res = finishBoolean(CompoundPath, tracePaths(segments), return finishBoolean(CompoundPath, tracePaths(segments),
this, null, false).reorient(); this, null, false).reorient();
window.reportSegments = reportSegments;
window.reportWindings = reportWindings;
window.reportIntersections = reportIntersections;
return res;
} }
}; };
}); });