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

Clean up code from previous merge.

Browse source
This commit is contained in:
Jürg Lehni 2013-10-29 16:09:35 +01:00
parent ef972949c8
commit de01ef1c21
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/path/Curve.js
View file

@ -1455,14 +1455,13 @@ new function() { // Scope for methods that require numerical integration
// happen with lines, in which case we should not be here.
for (var i = 0; i < count; i++) {
var tc = roots[i],
point = Curve.evaluate(vcr, tc, 0),
tl = Curve.getParameterOf(vl, point.x, point.y);
x = Curve.evaluate(vcr, tc, 0).x;
// We do have a point on the infinite line. Check if it falls on
// the line *segment*.
if (point.x >= 0 && point.x <= rl2x){
var tl = Curve.getParameterOf([0, 0, 0, 0, rl2x, 0, rl2x, 0], point.x, 0);
// Interpolate the parameter for the intersection on line.
var t1 = flip ? tl : tc,
if (x >= 0 && x <= rl2x) {
var tl = Curve.getParameterOf([0, 0, 0, 0, rl2x, 0, rl2x, 0],
x, 0),
t1 = flip ? tl : tc,
t2 = flip ? tc : tl;
addLocation(locations,
curve1, t1, Curve.evaluate(v1, t1, 0),