scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-06 04:42:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix some failing tests with PathItem#contains(), introduced by commit 6c6ad76c94

Browse source
This commit is contained in:
Jürg Lehni 2015-01-04 23:28:39 +01:00
parent 5d875f2d83
commit 5f3df1f5a1
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/path/PathItem.Boolean.js
View file

@ -307,22 +307,25 @@ PathItem.inject(new function() {
&& y >= values[1] && y <= values[7] && y >= values[1] && y <= values[7]
|| y >= values[7] && y <= values[1]) || y >= values[7] && y <= values[1])
&& Curve.solveCubic(values, 1, y, roots, 0, 1) === 1) { && Curve.solveCubic(values, 1, y, roots, 0, 1) === 1) {
var t = roots[0], var t = roots[0],
x0 = Curve.evaluate(values, t, 0).x, x0 = Curve.evaluate(values, t, 0).x,
slope = Curve.evaluate(values, t, 1).y; slope = Curve.evaluate(values, t, 1).y;
// Due to numerical precision issues, two consecutive curves // Due to numerical precision issues, two consecutive curves
// may register an intercept twice, at t = 1 and 0, if y is // may register an intercept twice, at t = 1 and 0, if y is
// almost equal to one of the endpoints of the curves. // almost equal to one of the endpoints of the curves.
if (!(lastT !== null && abs(lastX0 - x0) < tolerance if (!(lastT != null && abs(lastX0 - x0) < tolerance
&& (lastT <= tMin && t >= tMax && lastT > tMax && t < tMin)) {
|| t <= tMin && lastT >= tMax))) {
// Take care of cases where the curve and the preceding // Take care of cases where the curve and the preceding
// curve merely touches the ray towards +-x direction, // curve merely touches the ray towards +-x direction,
// but proceeds to the same side of the ray. // but proceeds to the same side of the ray.
// This essentially is not a crossing. // This essentially is not a crossing.
if (Numerical.isZero(slope) && !Curve.isLinear(values) if (Numerical.isZero(slope) && !Curve.isLinear(values)
// Does the slope over curve beginning change?
|| t < tMin && slope * Curve.evaluate( || t < tMin && slope * Curve.evaluate(
curve.previous.values, t, 1).y < 0) { curve.previous.values, 1, 1).y < 0
// Does the slope over curve end change?
|| t > tMax && slope * Curve.evaluate(
curve.next.values, 0, 1).y < 0) {
if (testContains && x0 >= xBefore && x0 <= xAfter) { if (testContains && x0 >= xBefore && x0 <= xAfter) {
++windLeft; ++windLeft;
++windRight; ++windRight;