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

Further clean up getParameter() code.

Browse source
This commit is contained in:
Jürg Lehni 2011-03-07 11:58:41 +00:00
parent 7956b50886
commit d9b8809f3c
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/path/Curve.js
View file

@ -171,10 +171,10 @@ var Curve = this.Curve = Base.extend({
&& this._segment2._handleIn.isZero(); && this._segment2._handleIn.isZero();
}, },
getParameter: function(length, t) { // TODO: Port support for start parameter back to Scriptographer
getParameter: function(length, start) {
var args = this.getCurveValues(); var args = this.getCurveValues();
args.push(length); args.push(length, start !== undefined ? start : length < 0 ? 1 : 0);
args.push(t === undefined ? length < 0 ? 1 : 0 : t);
return Curve.getParameter.apply(Curve, args); return Curve.getParameter.apply(Curve, args);
}, },
@ -326,17 +326,17 @@ var Curve = this.Curve = Base.extend({
}, },
getParameter: function(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y, getParameter: function(p1x, p1y, c1x, c1y, c2x, c2y, p2x, p2y,
length, t) { length, start) {
if (length == 0) { if (length == 0) {
return t; return start;
} }
if (p1x == c1x && p1y == c1y && p2x == c2x && p2y == c2y) { if (p1x == c1x && p1y == c1y && p2x == c2x && p2y == c2y) {
// Straight line, calculate directly // Straight line, calculate directly
// t = length / lineLength: // t = length / lineLength:
var dx = p2x - p1x, var dx = p2x - p1x,
dy = p2y - p1y; dy = p2y - p1y;
return Math.max(Math.min( return Math.max(Math.min(start
t + length / Math.sqrt(dx * dx + dy * dy), 0, 1)); + length / Math.sqrt(dx * dx + dy * dy), 0, 1));
} }
// Let's use the Van Wijngaarden–Dekker–Brent Method to find // Let's use the Van Wijngaarden–Dekker–Brent Method to find
// solutions more reliably than with False Position Method. // solutions more reliably than with False Position Method.
@ -350,7 +350,7 @@ var Curve = this.Curve = Base.extend({
// See if we're going forward or backward, and handle cases // See if we're going forward or backward, and handle cases
// differently // differently
if (forward) { // Normal way if (forward) { // Normal way
a = t; a = start;
b = 1; b = 1;
// We're moving b to the right to find root for length // We're moving b to the right to find root for length
f = function(t) { f = function(t) {
@ -358,7 +358,7 @@ var Curve = this.Curve = Base.extend({
} }
} else { // Going backwards } else { // Going backwards
a = 0; a = 0;
b = t; b = start;
length = -length; length = -length;
// We're moving a to the left to find root for length // We're moving a to the left to find root for length
f = function(t) { f = function(t) {