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

Clean up Path#curveTo() code.

Browse source
This commit is contained in:
Jürg Lehni 2011-04-28 13:12:21 +01:00
parent 7dce6f3a6c
commit 0d697403b5
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/path/Path.js
View file

@ -646,9 +646,9 @@ var Path = this.Path = PathItem.extend({
// and the cubic is A B C D,
// B = E + 1/3 (A - E)
// C = E + 1/3 (D - E)
var current = getCurrentSegment(this);
var current = getCurrentSegment(this)._point;
this.cubicCurveTo(
handle.add(current._point.subtract(handle).multiply(1/3)),
handle.add(current.subtract(handle).multiply(1/3)),
handle.add(to.subtract(handle).multiply(1/3)),
to
);
@ -657,15 +657,13 @@ var Path = this.Path = PathItem.extend({
curveTo: function(through, to, parameter) {
through = Point.read(arguments, 0, 1);
to = Point.read(arguments, 1, 1);
var t = parameter;
if (t == null)
t = 0.5;
var current = getCurrentSegment(this)._point;
// handle = (through - (1 - t)^2 * current - t^2 * to) /
// (2 * (1 - t) * t)
var t1 = 1 - t,
handle = through.subtract(current.multiply(t1 * t1)).subtract(
to.multiply(t * t)).divide(2 * t * t1);
var t = Base.pick(parameter, 0.5),
t1 = 1 - t,
current = getCurrentSegment(this)._point,
// handle = (through - (1 - t)^2 * current - t^2 * to) /
// (2 * (1 - t) * t)
handle = through.subtract(current.multiply(t1 * t1))
.subtract(to.multiply(t * t)).divide(2 * t * t1);
if (handle.isNaN())
throw new Error(
"Cannot put a curve through points with parameter=" + t);
@ -673,9 +671,9 @@ var Path = this.Path = PathItem.extend({
},
arcTo: function(to, clockwise) {
var through, to;
// Get the start point:
var current = getCurrentSegment(this);
var current = getCurrentSegment(this),
through;
if (arguments[1] && typeof arguments[1] != 'boolean') {
through = Point.read(arguments, 0, 1);
to = Point.read(arguments, 1, 1);