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

Some more work on comments.

Browse source
This commit is contained in:
Jürg Lehni 2013-10-29 21:20:19 +01:00
parent 1871e2f7c4
commit 4e34a27da4
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/Curve.js
View file

@ -1431,18 +1431,18 @@ new function() { // Scope for methods that require numerical integration
vl = flip ? v1 : v2, vl = flip ? v1 : v2,
lx1 = vl[0], ly1 = vl[1], lx1 = vl[0], ly1 = vl[1],
lx2 = vl[6], ly2 = vl[7], lx2 = vl[6], ly2 = vl[7],
// Rotate both curve and line around l1 so that line is on x axis // Rotate both curve and line around l1 so that line is on x axis.
ldx = lx2 - lx1, ldx = lx2 - lx1,
ldy = ly2 - ly1, ldy = ly2 - ly1,
// Angle with x axis (1, 0) // Calculate angle to the x-axis (1, 0).
angle = Math.atan2(-ldy, ldx), angle = Math.atan2(-ldy, ldx),
sin = Math.sin(angle), sin = Math.sin(angle),
cos = Math.cos(angle), cos = Math.cos(angle),
// (rlx1, rly1) = (0, 0) // (rlx1, rly1) = (0, 0)
rlx2 = ldx * cos - ldy * sin, rlx2 = ldx * cos - ldy * sin,
// The curve values for the rotated line // The curve values for the rotated line.
rvl = [0, 0, 0, 0, rlx2, 0, rlx2, 0], rvl = [0, 0, 0, 0, rlx2, 0, rlx2, 0],
// Now calculate the rotated curve // Calculate the curve values of the rotated curve.
rvc = []; rvc = [];
for(var i = 0; i < 8; i += 2) { for(var i = 0; i < 8; i += 2) {
var x = vc[i] - lx1, var x = vc[i] - lx1,
@ -1461,7 +1461,7 @@ new function() { // Scope for methods that require numerical integration
// We do have a point on the infinite line. Check if it falls on // We do have a point on the infinite line. Check if it falls on
// the line *segment*. // the line *segment*.
if (x >= 0 && x <= rlx2) { if (x >= 0 && x <= rlx2) {
// Find the parameter of the intersection on the rotated line // Find the parameter of the intersection on the rotated line.
var tl = Curve.getParameterOf(rvl, x, 0), var tl = Curve.getParameterOf(rvl, x, 0),
t1 = flip ? tl : tc, t1 = flip ? tl : tc,
t2 = flip ? tc : tl; t2 = flip ? tc : tl;