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

Remove need for __segment property and further simplify computeBoolean() code.

Browse source
This commit is contained in:
Jürg Lehni 2013-05-04 02:50:18 -07:00
parent a5d00e64cf
commit 9aafb46e6c
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/path/CurveLocation.js
View file

@ -57,14 +57,14 @@ var CurveLocation = this.CurveLocation = Base.extend(/** @lends CurveLocation# *
* @type Segment
* @bean
*/
getSegment: function() {
getSegment: function(/* preferFirst */) {
if (!this._segment) {
var curve = this.getCurve(),
parameter = this.getParameter();
if (parameter === 0) {
this._segment = curve._segment1;
} else if (parameter === 1) {
if (parameter === 1) {
this._segment = curve._segment2;
} else if (parameter === 0 || arguments[0]) {
this._segment = curve._segment1;
} else if (parameter == null) {
return null;
} else {

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

@ -57,7 +57,6 @@ PathItem.inject(new function() {
segment = curve && curve.getSegment1() || loc.getSegment();
if (others)
others.push(other);
other.__segment = segment;
segment._ixPair = other;
}
return others;
@ -168,22 +167,18 @@ PathItem.inject(new function() {
continue;
var path = node.path,
nuPath = new Path(),
firstNode = node,
intersectNode = null;
end = node._ixPair && node._ixPair.getSegment(true);
if (node.getPrevious()._INVALID) {
node.setHandleIn(node._ixPair
? node._ixPair.getIntersection().__segment._handleIn
? node._ixPair.getSegment(true)._handleIn
: Point.create(0, 0));
}
while (node && !node._visited && node !== intersectNode) {
do {
node._visited = true;
intersectNode = intersectNode || firstNode._ixPair
&& firstNode._ixPair.getIntersection().__segment;
// node._ixPair is this node's intersection CurveLocation object
// node._ixPair.getIntersection() is the other CurveLocation object this node intersects with
if (node._ixPair) {
var nextNode = node._INVALID
? node._ixPair.getIntersection().__segment
? node._ixPair.getSegment(true)
: node;
nuPath.add(new Segment(node._point, node._handleIn,
nextNode._handleOut));
@ -193,7 +188,7 @@ PathItem.inject(new function() {
nuPath.add(node);
}
node = node.getNext();
}
} while (node && !node._visited && node !== end);
// Avoid stray segments and incomplete paths
if (nuPath._segments.length > 2) {
nuPath.setClosed(true);