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

Improve handling of new segments in CurveLocation#divide() and #split()

Browse source
This commit is contained in:
Jürg Lehni 2017-02-21 22:16:55 +01:00
parent f16b91e0fe
commit f089c3c620
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/path/Curve.js
View file

@ -525,7 +525,8 @@ var Curve = Base.extend(/** @lends Curve# */{
* @see Path#splitAt(offset) * @see Path#splitAt(offset)
*/ */
splitAt: function(location) { splitAt: function(location) {
return this._path ? this._path.splitAt(location) : null; var path = this._path;
return path ? path.splitAt(location) : null;
}, },
/** /**
@ -538,8 +539,8 @@ var Curve = Base.extend(/** @lends Curve# */{
* @return {Path} the newly created path after splitting, if any * @return {Path} the newly created path after splitting, if any
* @see Path#splitAt(offset) * @see Path#splitAt(offset)
*/ */
splitAtTime: function(t) { splitAtTime: function(time) {
return this.splitAt(this.getLocationAtTime(t)); return this.splitAt(this.getLocationAtTime(time));
}, },
// TODO: Remove in 1.0.0? (deprecated January 2016): // TODO: Remove in 1.0.0? (deprecated January 2016):

14
src/path/CurveLocation.js
View file

@ -289,17 +289,23 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
divide: function() { divide: function() {
var curve = this.getCurve(), var curve = this.getCurve(),
res = null; res = curve && curve.divideAtTime(this.getTime());
// Change to the newly inserted segment, also adjusts _time. // Change to the newly inserted segment, also adjusts _time.
if (curve && (res = curve.divideAtTime(this.getTime()))) { if (res) {
this._setSegment(res._segment1); this._setSegment(res._segment1);
} }
return res; return res;
}, },
split: function() { split: function() {
var curve = this.getCurve(); var curve = this.getCurve(),
return curve ? curve.splitAtTime(this.getTime()) : null; path = curve._path,
res = curve && curve.splitAtTime(this.getTime());
if (res) {
// Set the segment to the end-segment of the path after splitting.
this._setSegment(path.getLastSegment());
}
return res;
}, },
/** /**