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

Optimize handling of horizontal curves in Curve#_getWinding

Browse source
This commit is contained in:
hkrish 2013-12-29 12:38:59 +01:00
parent a8a4a6fd03
commit 0b4da28c1e
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/path/Curve.js
View file

@ -447,6 +447,8 @@ var Curve = Base.extend(/** @lends Curve# */{
/** /**
* Returns the winding contribution of this curve, to the parent path or * Returns the winding contribution of this curve, to the parent path or
* CompoundPath it is part of. * CompoundPath it is part of.
*
* DEBUG: Note: This method is inlined in PathItem#computeBoolean
*/ */
_getWinding: function() { _getWinding: function() {
var path = this.getPath(); var path = this.getPath();
@ -456,12 +458,17 @@ var Curve = Base.extend(/** @lends Curve# */{
return null; return null;
var v = this.getValues(), var v = this.getValues(),
point = Curve.evaluate(v, 0.5, 0), point = Curve.evaluate(v, 0.5, 0),
xDirection = path.isClockwise() ? v[0] > v[6] : v[0] < v[6], // Since we are using curves monotonic in Y direction, horizontal
isHorizontal = this.isLinear() && xDirection && // curves may report wrong winding contribution. See
Math.abs(v[1]-v[7]) < /*#=*/ Numerical.TOLERANCE; // PathItem#_getWinding for details on how we resolve this issue.
tolerance = /*#=*/ Numerical.TOLERANCE,
vDiff = Math.abs(v[1] - v[7]),
linear = Curve.isLinear(v) || Curve.isFlatEnough(v, tolerance),
horizontal = (linear && vDiff < tolerance) ||
(Curve.getLength(v) < 1 && vDiff < 0.01);
// Call the parent's _getWinding method // Call the parent's _getWinding method
return (path._parent instanceof CompoundPath ? path._parent return (path._parent instanceof CompoundPath ? path._parent
: path)._getWinding(point, isHorizontal); : path)._getWinding(point, horizontal);
}, },
// Mess with indentation in order to get more line-space below... // Mess with indentation in order to get more line-space below...