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

Increase readability of convex-hull check in self-intersection code.

Browse source
This commit is contained in:
Jürg Lehni 2015-09-09 08:12:03 +02:00
parent 70f8f1912f
commit 155442e706
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/path/PathItem.js
View file

@ -90,15 +90,17 @@ var PathItem = Item.extend(/** @lends PathItem# */{
// First check for self-intersections within the same curve // First check for self-intersections within the same curve
var seg1 = curve1.getSegment1(), var seg1 = curve1.getSegment1(),
seg2 = curve1.getSegment2(), seg2 = curve1.getSegment2(),
p1 = seg1._point,
p2 = seg2._point,
h1 = seg1._handleOut, h1 = seg1._handleOut,
h2 = seg2._handleIn; h2 = seg2._handleIn,
l1 = new Line(p1.subtract(h1), p1.add(h1)),
l2 = new Line(p2.subtract(h2), p1.add(h2));
// Check if extended handles of endpoints of this curve // Check if extended handles of endpoints of this curve
// intersects each other. We cannot have a self intersection // intersects each other. We cannot have a self intersection
// within this curve if they don't intersect due to convex-hull // within this curve if they don't intersect due to convex-hull
// property. // property.
if (new Line(seg1._point.subtract(h1), h1.multiply(2), true) if (l1.intersect(l2, false)) {
.intersect(new Line(seg2._point.subtract(h2),
h2.multiply(2), true), false)) {
// Self intersecting is found by dividing the curve in two // Self intersecting is found by dividing the curve in two
// and and then applying the normal curve intersection code. // and and then applying the normal curve intersection code.
var parts = Curve.subdivide(values1); var parts = Curve.subdivide(values1);