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

Handle tiny handles correctly In Curve's evaluate()

Browse source 
If the curve handles are almost zero, reset the control points to the anchors.

Closes #838
This commit is contained in:
Jürg Lehni 2016-01-06 15:03:35 +01:00
parent b9c76f44e8
commit 8cec4f972d
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/path/Curve.js
View file

@ -708,12 +708,6 @@ statics: {
: v; : v;
}, },
hasHandles: function(v) {
var isZero = Numerical.isZero;
return !(isZero(v[0] - v[2]) && isZero(v[1] - v[3])
&& isZero(v[4] - v[6]) && isZero(v[5] - v[7]));
},
isFlatEnough: function(v, tolerance) { isFlatEnough: function(v, tolerance) {
// Thanks to Kaspar Fischer and Roger Willcocks for the following: // Thanks to Kaspar Fischer and Roger Willcocks for the following:
// http://hcklbrrfnn.files.wordpress.com/2012/08/bez.pdf // http://hcklbrrfnn.files.wordpress.com/2012/08/bez.pdf
@ -1221,13 +1215,23 @@ new function() { // Scope for methods that require private functions
p2x = v[6], p2y = v[7], p2x = v[6], p2y = v[7],
tMin = /*#=*/Numerical.CURVETIME_EPSILON, tMin = /*#=*/Numerical.CURVETIME_EPSILON,
tMax = 1 - tMin, tMax = 1 - tMin,
isZero = Numerical.isZero,
x, y; x, y;
// If the curve handles are almost zero, reset the control points to the
// anchors.
if (isZero(c1x - p1x) && isZero(c1y - p1y)) {
c1x = p1x;
c1y = p1y;
}
if (isZero(c2x - p2x) && isZero(c2y - p2y)) {
c2x = p2x;
c2y = p2y;
}
// Handle special case at beginning / end of curve // Handle special case at beginning / end of curve
if (type === 0 && (t < tMin || t > tMax)) { if (type === 0 && (t < tMin || t > tMax)) {
var isZero = t < tMin; var zero = t < tMin;
x = isZero ? p1x : p2x; x = zero ? p1x : p2x;
y = isZero ? p1y : p2y; y = zero ? p1y : p2y;
} else { } else {
// Calculate the polynomial coefficients. // Calculate the polynomial coefficients.
var cx = 3 * (c1x - p1x), var cx = 3 * (c1x - p1x),