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

Some code optimizations in PathFitter.

Browse source
This commit is contained in:
Jürg Lehni 2017-01-16 17:47:28 +01:00
parent 12f12da21b
commit 13accee9fd
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/path/PathFitter.js
View file

@ -145,7 +145,8 @@ var PathFitter = Base.extend({
// Compute the determinants of C and X // Compute the determinants of C and X
var detC0C1 = C[0][0] * C[1][1] - C[1][0] * C[0][1], var detC0C1 = C[0][0] * C[1][1] - C[1][0] * C[0][1],
alpha1, alpha2; alpha1,
alpha2;
if (abs(detC0C1) > epsilon) { if (abs(detC0C1) > epsilon) {
// Kramer's rule // Kramer's rule
var detC0X = C[0][0] * X[1] - C[1][0] * X[0], var detC0X = C[0][0] * X[1] - C[1][0] * X[0],
@ -157,14 +158,9 @@ var PathFitter = Base.extend({
// Matrix is under-determined, try assuming alpha1 == alpha2 // Matrix is under-determined, try assuming alpha1 == alpha2
var c0 = C[0][0] + C[0][1], var c0 = C[0][0] + C[0][1],
c1 = C[1][0] + C[1][1]; c1 = C[1][0] + C[1][1];
if (abs(c0) > epsilon) { alpha1 = alpha2 = abs(c0) > epsilon ? X[0] / c0
alpha1 = alpha2 = X[0] / c0; : abs(c1) > epsilon ? X[1] / c1
} else if (abs(c1) > epsilon) { : 0;
alpha1 = alpha2 = X[1] / c1;
} else {
// Handle below
alpha1 = alpha2 = 0;
}
} }
// If alpha negative, use the Wu/Barsky heuristic (see text) // If alpha negative, use the Wu/Barsky heuristic (see text)
@ -234,11 +230,8 @@ var PathFitter = Base.extend({
pt2 = this.evaluate(1, curve2, u), pt2 = this.evaluate(1, curve2, u),
diff = pt.subtract(point), diff = pt.subtract(point),
df = pt1.dot(pt1) + diff.dot(pt2); df = pt1.dot(pt1) + diff.dot(pt2);
// Compute f(u) / f'(u)
if (Math.abs(df) < /*#=*/Numerical.TOLERANCE)
return u;
// u = u - f(u) / f'(u) // u = u - f(u) / f'(u)
return u - diff.dot(pt1) / df; return Numerical.isZero(df) ? u : u - diff.dot(pt1) / df;
}, },
// Evaluate a bezier curve at a particular parameter value // Evaluate a bezier curve at a particular parameter value