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

Simplify isInRange() check a bit.

Browse source 
No need to check against ±180 as that condition will always be met.
This commit is contained in:
Jürg Lehni 2016-06-12 17:43:10 +02:00
parent 614c781f29
commit 7404485f96
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/path/CurveLocation.js
View file

@ -443,9 +443,9 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
function isInRange(angle, min, max) {
return min < max
? angle > min && angle < max
// The range wraps around -180 / 180 degrees:
: angle > min && angle <= 180 || angle >= -180 && angle < max;
? angle > min && angle < max
// min > max: the range wraps around -180 / 180 degrees
: angle > min || angle < max;
}
// Calculate angles for all four tangents at the intersection point,
@ -469,9 +469,9 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
a2 = v2.getAngle(),
a3 = v3.getAngle(),
a4 = v4.getAngle();
// Count how many times curve2 angles appear between the curve1 angles
// Count how many times curve2 angles appear between the curve1 angles.
// If each pair of angles split the other two, then the edges cross.
// Use t*Inside to decide which angle pair to check against.
// Use t1Inside to decide which angle pair to check against.
// If t1 is inside the curve, check against a3 & a4, othrwise a1 & a2.
return !!(t1Inside
? (isInRange(a1, a3, a4) ^ isInRange(a2, a3, a4)) &&