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

Slightly improve documentation for #1235

Browse source
This commit is contained in:
Jürg Lehni 2017-01-11 15:16:22 +01:00
parent e7b53c8a22
commit fa43e28b7a
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

@ -162,7 +162,7 @@ var Curve = Base.extend(/** @lends Curve# */{
* @return {Object} the curve classification information as an object, see * @return {Object} the curve classification information as an object, see
* options * options
* @result info.type {String} the type of Bézier curve, possible values are: * @result info.type {String} the type of Bézier curve, possible values are:
* {@values 'line', 'quadratic', 'serpentine', 'cusp', 'loop'} * {@values 'line', 'quadratic', 'serpentine', 'cusp', 'loop', 'arch'}
* @result info.roots {Number[]} the curve-time parameters of the * @result info.roots {Number[]} the curve-time parameters of the
* associated points of inflection for serpentine curves, loops, cusps, * associated points of inflection for serpentine curves, loops, cusps,
etc etc
@ -1526,6 +1526,11 @@ new function() { // Scope for methods that require private functions
// 'serpentine' (d > 0) // 'serpentine' (d > 0)
// 'cusp' (d == 0) // 'cusp' (d == 0)
// 'loop' (d < 0) // 'loop' (d < 0)
// 'arch' (serpentine, cusp or loop with roots outside 0..1)
//
// NOTE: Roots for serpentine, cusp and loop curves are only
// considered if they are within 0..1. If the roots are outside,
// then we degrade the type of curve down to an 'arch'.
var x1 = v[0], y1 = v[1], var x1 = v[0], y1 = v[1],
x2 = v[2], y2 = v[3], x2 = v[2], y2 = v[3],
@ -1552,7 +1557,7 @@ new function() { // Scope for methods that require private functions
var hasRoots = t1 !== undefined, var hasRoots = t1 !== undefined,
t1Ok = hasRoots && t1 > 0 && t1 < 1, t1Ok = hasRoots && t1 > 0 && t1 < 1,
t2Ok = hasRoots && t2 > 0 && t2 < 1; t2Ok = hasRoots && t2 > 0 && t2 < 1;
// Degrade to arch for serpentine, cusp or loop ifno solutions // Degrade to arch for serpentine, cusp or loop if no solutions
// within 0..1 are found. loop requires 2 solutions to be valid. // within 0..1 are found. loop requires 2 solutions to be valid.
if (hasRoots && (!(t1Ok || t2Ok) if (hasRoots && (!(t1Ok || t2Ok)
|| type === 'loop' && !(t1Ok && t2Ok))) { || type === 'loop' && !(t1Ok && t2Ok))) {