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

Rename monoCurves -> curves where full curves are dealt with now.

Browse source 
For better clarity. Relates to #1073, #1075
This commit is contained in:
Jürg Lehni 2016-06-16 11:15:27 +02:00
parent a328f5b04b
commit 1a392bb5db
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/path/Path.js
View file

@ -144,8 +144,7 @@ var Path = PathItem.extend(/** @lends Path# */{
if (flags & /*#=*/ChangeFlag.GEOMETRY) { if (flags & /*#=*/ChangeFlag.GEOMETRY) {
// Clockwise state becomes undefined as soon as geometry changes. // Clockwise state becomes undefined as soon as geometry changes.
// Also clear cached mono curves used for winding calculations. // Also clear cached mono curves used for winding calculations.
this._length = this._area = this._clockwise = this._monoCurves = this._length = this._area = this._clockwise = undefined;
undefined;
if (flags & /*#=*/ChangeFlag.SEGMENTS) { if (flags & /*#=*/ChangeFlag.SEGMENTS) {
this._version++; // See CurveLocation this._version++; // See CurveLocation
} else if (this._curves) { } else if (this._curves) {

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

@ -93,14 +93,14 @@ PathItem.inject(new function() {
var crossings = divideLocations( var crossings = divideLocations(
CurveLocation.expand(_path1.getCrossings(_path2))), CurveLocation.expand(_path1.getCrossings(_path2))),
segments = [], segments = [],
// Aggregate of all curves in both operands, monotonic in y. // Aggregate of all curves in both operands.
monoCurves = []; curves = [];
function collect(paths) { function collect(paths) {
for (var i = 0, l = paths.length; i < l; i++) { for (var i = 0, l = paths.length; i < l; i++) {
var path = paths[i]; var path = paths[i];
segments.push.apply(segments, path._segments); segments.push.apply(segments, path._segments);
monoCurves.push.apply(monoCurves, path._getCurves()); curves.push.apply(curves, path._getCurves());
// Keep track if there are valid intersections other than // Keep track if there are valid intersections other than
// overlaps in each path. // overlaps in each path.
path._overlapsOnly = path._validOverlapsOnly = true; path._overlapsOnly = path._validOverlapsOnly = true;
@ -116,7 +116,7 @@ PathItem.inject(new function() {
// First, propagate winding contributions for curve chains starting in // First, propagate winding contributions for curve chains starting in
// all crossings: // all crossings:
for (var i = 0, l = crossings.length; i < l; i++) { for (var i = 0, l = crossings.length; i < l; i++) {
propagateWinding(crossings[i]._segment, _path1, _path2, monoCurves, propagateWinding(crossings[i]._segment, _path1, _path2, curves,
operator); operator);
} }
// Now process the segments that are not part of any intersecting chains // Now process the segments that are not part of any intersecting chains
@ -124,7 +124,7 @@ PathItem.inject(new function() {
var segment = segments[i], var segment = segments[i],
inter = segment._intersection; inter = segment._intersection;
if (segment._winding == null) { if (segment._winding == null) {
propagateWinding(segment, _path1, _path2, monoCurves, operator); propagateWinding(segment, _path1, _path2, curves, operator);
} }
// See if there are any valid segments that aren't part of overlaps. // See if there are any valid segments that aren't part of overlaps.
// This information is used to determine where to start tracing the // This information is used to determine where to start tracing the
@ -472,7 +472,7 @@ PathItem.inject(new function() {
function propagateWinding(segment, path1, path2, monoCurves, operator) { function propagateWinding(segment, path1, path2, curves, operator) {
// Here we try to determine the most likely winding number contribution // Here we try to determine the most likely winding number contribution
// for the curve-chain starting with this segment. Once we have enough // for the curve-chain starting with this segment. Once we have enough
// confidence in the winding contribution, we can propagate it until the // confidence in the winding contribution, we can propagate it until the
@ -508,7 +508,7 @@ PathItem.inject(new function() {
winding = !(operator.subtract && path2 && ( winding = !(operator.subtract && path2 && (
path === path1 && path2._getWinding(pt, hor) || path === path1 && path2._getWinding(pt, hor) ||
path === path2 && !path1._getWinding(pt, hor))) path === path2 && !path1._getWinding(pt, hor)))
? getWinding(pt, monoCurves, hor) ? getWinding(pt, curves, hor)
: { winding: 0 }; : { winding: 0 };
break; break;
} }