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

Fix Path#arcBy(to, boolean)

Browse source
This commit is contained in:
Jürg Lehni 2013-11-25 01:04:51 +01:00
parent 02f46b7ac2
commit d079e179ac
2 changed files with 40 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/path/Path.js
View file

@ -2283,25 +2283,23 @@ var Path = PathItem.extend(/** @lends Path# */{
this.quadraticCurveTo(handle, to);
},
arcTo: function(to, clockwise /* | through, to */) {
arcTo: function(/* to, clockwise | through, to */) {
// Get the start point:
var current = getCurrentSegment(this),
from = current._point,
through,
point = Point.read(arguments),
to = Point.read(arguments),
// Peek at next value to see if it's clockwise,
// with true as default value.
next = Base.pick(Base.peek(arguments), true);
if (typeof next === 'boolean') {
clockwise = Base.pick(Base.peek(arguments), true);
if (typeof clockwise === 'boolean') {
// arcTo(to, clockwise)
to = point;
clockwise = next;
var middle = from.add(to).divide(2),
through = middle.add(middle.subtract(from).rotate(
clockwise ? -90 : 90));
} else {
// arcTo(through, to)
through = point;
through = to;
to = Point.read(arguments);
}
// Construct the two perpendicular middle lines to (from, through)
@ -2393,11 +2391,17 @@ var Path = PathItem.extend(/** @lends Path# */{
this.quadraticCurveTo(current.add(handle), current.add(to));
},
arcBy: function(/* through, to */) {
var through = Point.read(arguments),
to = Point.read(arguments),
current = getCurrentSegment(this)._point;
this.arcTo(current.add(through), current.add(to));
arcBy: function(/* to, clockwise | through, to */) {
var current = getCurrentSegment(this)._point,
point = current.add(Point.read(arguments)),
// Peek at next value to see if it's clockwise, with true as
// default value.
clockwise = Base.pick(Base.peek(arguments), true);
if (typeof clockwise === 'boolean') {
this.arcTo(point, clockwise);
} else {
this.arcTo(point, current.add(Point.read(arguments)));
}
},
closePath: function() {

40
src/path/PathItem.js
View file

@ -520,28 +520,36 @@ var PathItem = Item.extend(/** @lends PathItem# */{
* @param {Number} [parameter=0.5]
*/
// DOCS: Document Path#cubicCurveBy()
/**
* @name PathItem#cubicCurveBy
* @function
* @param {Point} handle1
* @param {Point} handle2
* @param {Point} to
*/
// DOCS: Document Path#cubicCurveBy()
/**
* @name PathItem#cubicCurveBy
* @function
* @param {Point} handle1
* @param {Point} handle2
* @param {Point} to
*/
// DOCS: Document Path#quadraticCurveBy()
/**
* @name PathItem#quadraticCurveBy
* @function
* @param {Point} handle
* @param {Point} to
*/
// DOCS: Document Path#quadraticCurveBy()
/**
* @name PathItem#quadraticCurveBy
* @function
* @param {Point} handle
* @param {Point} to
*/
// DOCS: Document Path#arcBy()
// DOCS: Document Path#arcBy(through, to)
/**
* @name PathItem#arcBy
* @function
* @param {Point} through
* @param {Point} to
*/
// DOCS: Document Path#arcBy(to, clockwise)
/**
* @name PathItem#arcBy
* @function
* @param {Point} to
* @param {Boolean} [clockwise=true]
*/
});