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

Minor intersection refactoring clean up.

Browse source
This commit is contained in:
Jürg Lehni 2015-09-10 05:18:56 +02:00
parent 04452730dd
commit 4770cfe2f8
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/path/CurveLocation.js
View file

@ -65,9 +65,9 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
this._distance = _distance; this._distance = _distance;
this._overlap = _overlap; this._overlap = _overlap;
this._intersection = _intersection; this._intersection = _intersection;
this._other = false;
if (_intersection) { if (_intersection) {
_intersection._intersection = this; _intersection._intersection = this;
// TODO: Remove this once debug logging is removed.
_intersection._other = true; _intersection._other = true;
} }
// Also store references to segment1 and segment2, in case path // Also store references to segment1 and segment2, in case path
@ -325,6 +325,9 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
res; res;
// Sort by path-id, curve, parameter, curve2, parameter2 so we // Sort by path-id, curve, parameter, curve2, parameter2 so we
// can easily remove duplicates with calls to equals() after. // can easily remove duplicates with calls to equals() after.
// NOTE: We don't call getCurve() / getParameter() here, since
// this code is used internally in boolean operations where all
// this information remains valid during processing.
if (path1 === path2) { if (path1 === path2) {
if (curve1 === curve2) { if (curve1 === curve2) {
var diff = l1._parameter - l2._parameter; var diff = l1._parameter - l2._parameter;
@ -334,7 +337,7 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
curve21 = i1 && i1._curve, curve21 = i1 && i1._curve,
curve22 = i2 && l2._curve; curve22 = i2 && l2._curve;
res = curve21 === curve22 // equal or both null res = curve21 === curve22 // equal or both null
? (i1 ? i1._parameter : 0) - (i2 ? i2._parameter : 0) ? i1 && i2 ? i1._parameter - i2._parameter : 0
: curve21 && curve22 : curve21 && curve22
? curve21.getIndex() - curve22.getIndex() ? curve21.getIndex() - curve22.getIndex()
: curve21 ? 1 : -1; : curve21 ? 1 : -1;

4
src/path/PathItem.js
View file

@ -106,8 +106,8 @@ var PathItem = Item.extend(/** @lends PathItem# */{
var parts = Curve.subdivide(values1); var parts = Curve.subdivide(values1);
Curve._getIntersections(parts[0], parts[1], curve1, curve1, Curve._getIntersections(parts[0], parts[1], curve1, curve1,
locations, { locations, {
// Only possible if there is only one curve: // Only possible if there is only one closed curve:
startConnected: length1 === 1, startConnected: length1 === 1 && p1.equals(p2),
// After splitting, the end is always connected: // After splitting, the end is always connected:
endConnected: true, endConnected: true,
reparametrize: function(t1, t2) { reparametrize: function(t1, t2) {