mirror of
https://github.com/scratchfoundation/paper.js.git
synced 2025-01-06 04:42:15 -05:00
Further simplify code a bit.
This commit is contained in:
parent
d984a2cd87
commit
e9d2c6cfd4
1 changed files with 4 additions and 6 deletions
|
@ -1226,15 +1226,13 @@ new function() { // Scope for methods that require numerical integration
|
||||||
}
|
}
|
||||||
} else if (Math.max(uMax - uMin, tMaxNew - tMinNew) < tolerance) {
|
} else if (Math.max(uMax - uMin, tMaxNew - tMinNew) < tolerance) {
|
||||||
// We have isolated the intersection with sufficient precision
|
// We have isolated the intersection with sufficient precision
|
||||||
|
var t1 = tMinNew + (tMaxNew - tMinNew) / 2,
|
||||||
|
t2 = uMin + (uMax - uMin) / 2;
|
||||||
if (reverse) {
|
if (reverse) {
|
||||||
var t1 = uMin + (uMax - uMin) / 2,
|
|
||||||
t2 = tMinNew + (tMaxNew - tMinNew) / 2;
|
|
||||||
addLocation(locations,
|
addLocation(locations,
|
||||||
curve2, t1, Curve.evaluate(v2, t1, 0),
|
curve2, t2, Curve.evaluate(v2, t2, 0),
|
||||||
curve1, t2, Curve.evaluate(v1, t2, 0));
|
curve1, t1, Curve.evaluate(v1, t1, 0));
|
||||||
} else {
|
} else {
|
||||||
var t1 = tMinNew + (tMaxNew - tMinNew) / 2,
|
|
||||||
t2 = uMin + (uMax - uMin) / 2;
|
|
||||||
addLocation(locations,
|
addLocation(locations,
|
||||||
curve1, t1, Curve.evaluate(v1, t1, 0),
|
curve1, t1, Curve.evaluate(v1, t1, 0),
|
||||||
curve2, t2, Curve.evaluate(v2, t2, 0));
|
curve2, t2, Curve.evaluate(v2, t2, 0));
|
||||||
|
|
Loading…
Reference in a new issue