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

Improve comments.

Browse source
This commit is contained in:
Jürg Lehni 2017-01-24 08:22:03 -05:00
parent 1806b5959e
commit 4833c588e5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/path/CurveLocation.js
View file

@ -433,21 +433,19 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
// - If the intersection is on a segment, step away at equal offsets on // - If the intersection is on a segment, step away at equal offsets on
// each curve, to calculate unambiguous angles. The vector from the // each curve, to calculate unambiguous angles. The vector from the
// intersection to this new location is used to determine the angle. // intersection to this new location is used to determine the angle.
// The offset is determined by the taking the shortest distance on all
// involved curves that is unambiguous. We do this by determining the
// largest offsets of unambiguous direction on each curve by finding
// their inflections points and "peaks", and then use half of that.
var offsets = []; var offsets = [];
function addOffsets(curve, end) { function addOffsets(curve, end) {
// Find the largest offset of unambiguous direction on the curve by
// finding their inflections points and "peaks".
var v = curve.getValues(), var v = curve.getValues(),
info = Curve.classify(v), roots = Curve.classify(v).roots || getPeaks(v),
roots = info.roots || getPeaks(v),
count = roots.length, count = roots.length,
t = end && count > 1 ? roots[count - 1] t = end && count > 1 ? roots[count - 1]
: count > 0 ? roots[0] : count > 0 ? roots[0]
: 0.5; : 0.5;
// Then use half of the offset, for extra measure.
offsets.push(Curve.getLength(v, end ? t : 0, end ? 1 : t) / 2); offsets.push(Curve.getLength(v, end ? t : 0, end ? 1 : t) / 2);
} }
@ -492,6 +490,8 @@ var CurveLocation = Base.extend(/** @lends CurveLocation# */{
addOffsets(c4, false); addOffsets(c4, false);
} }
var pt = this.getPoint(), var pt = this.getPoint(),
// Determined the shared unambiguous offset by the taking the
// shortest offsets on all involved curves that are unambiguous.
offset = Math.min.apply(Math, offsets), offset = Math.min.apply(Math, offsets),
v2 = t1Inside ? c2.getTangentAtTime(t1) v2 = t1Inside ? c2.getTangentAtTime(t1)
: c2.getPointAt(offset).subtract(pt), : c2.getPointAt(offset).subtract(pt),