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

Merge pull request #1083 from iconexperience/solve-cubic

Browse source 
Add check of value range in Curve.solveCubic to improve performance
This commit is contained in:
Jürg Lehni 2016-06-16 14:02:48 +02:00 committed by GitHub
commit fa0a474ec7
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/path/Curve.js
View file

@ -628,8 +628,13 @@ statics: /** @lends Curve */{
var p1 = v[coord],
c1 = v[coord + 2],
c2 = v[coord + 4],
p2 = v[coord + 6],
c = 3 * (c1 - p1),
p2 = v[coord + 6];
if (p1 < val && p2 < val && c1 < val && c2 < val
|| p1 > val && p2 > val && c1 > val && c2 > val) {
// If val is outside the curve values, no solution is possible.
return 0;
}
var c = 3 * (c1 - p1),
b = 3 * (c2 - c1) - c,
a = p2 - p1 - c - b;
return Numerical.solveCubic(a, b, c, p1 - val, roots, min, max);