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

Boolean: handle linear segments correctly.

Browse source 
Earlier implementation was unfinished and did not reset some handles to
linear, this caused the winding to be miscalculated.

Conflicts:
	src/path/PathItem.Boolean.js
This commit is contained in:
hkrish 2014-05-05 18:46:39 +02:00 committed by Jürg Lehni
parent afc14b9634
commit 718af4527f
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -192,17 +192,16 @@ PathItem.inject(new function() {
*/
function splitPath(intersections) {
var tolerance = /*#=*/Numerical.TOLERANCE,
linearSegments;
linearHandles;
function resetLinear() {
// Reset linear segments if they were part of a linear curve
// and if we are done with the entire curve.
for (var i = 0, l = linearSegments.length; i < l; i++) {
var segment = linearSegments[i];
for (var i = 0, l = linearHandles.length; i < l; i++) {
var handle = linearHandles[i];
// FIXME: Don't reset the appropriate handle if the intersection
// was on t == 0 && t == 1.
segment._handleOut.set(0, 0);
segment._handleIn.set(0, 0);
handle.set(0, 0);
}
}
@ -216,10 +215,14 @@ PathItem.inject(new function() {
// Scale parameter after previous split.
t /= prevLoc._parameter;
} else {
if (linearSegments)
if (linearHandles)
resetLinear();
curve = loc._curve;
linearSegments = curve.isLinear() && [];
linearHandles = curve.isLinear() && [];
if (linearHandles) {
linearHandles.push(curve._segment1._handleOut);
linearHandles.push(curve._segment2._handleIn);
}
}
var newCurve,
segment;
@ -227,6 +230,10 @@ PathItem.inject(new function() {
if (newCurve = curve.divide(t, true, true)) {
segment = newCurve._segment1;
curve = newCurve.getPrevious();
if (linearHandles) {
linearHandles.push(segment._handleOut);
linearHandles.push(segment._handleIn);
}
} else {
segment = t < tolerance
? curve._segment1
@ -239,11 +246,9 @@ PathItem.inject(new function() {
// Link the new segment with the intersection on the other curve
segment._intersection = loc.getIntersection();
loc._segment = segment;
if (linearSegments)
linearSegments.push(segment);
prevLoc = loc;
}
if (linearSegments)
if (linearHandles)
resetLinear();
}