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

Some more code and comments clean-up.

Browse source
This commit is contained in:
Jürg Lehni 2014-02-20 18:00:56 +01:00
parent bdcfb60a9a
commit b48321e78d
1 changed files with 5 additions and 3 deletions

8
src/path/PathItem.js
View file

@ -95,14 +95,17 @@ var PathItem = Item.extend(/** @lends PathItem# */{
// property. // property.
if (new Line(seg1._point.subtract(h1), h1, true).intersect( if (new Line(seg1._point.subtract(h1), h1, true).intersect(
new Line(seg2._point.subtract(h2), h2, true), false)) { new Line(seg2._point.subtract(h2), h2, true), false)) {
// Self intersectin is found by dividng the curve in two and
// and then applying the normal curve intersection code.
var parts = Curve.subdivide(values1), var parts = Curve.subdivide(values1),
before = locations.length; before = locations.length;
Curve.getIntersections(parts[0], parts[1], curve1, curve1, Curve.getIntersections(parts[0], parts[1], curve1, curve1,
locations, 0, ONE); // tMax locations, 0, ONE); // tMax
// Check if a location was added by comparing length before. // Check if a location was added by comparing length before.
// Self-intersection can only lead to 0 or 1 intersections.
if (locations.length > before) { if (locations.length > before) {
var loc = locations[before]; var loc = locations[before];
// Since the curve has split itself, we need to adjust // Since the curve was split above, we need to adjust
// the parameters for both locations. // the parameters for both locations.
loc._parameter /= 2; loc._parameter /= 2;
loc._parameter2 = 0.5 + loc._parameter2 / 2; loc._parameter2 = 0.5 + loc._parameter2 / 2;
@ -155,8 +158,7 @@ var PathItem = Item.extend(/** @lends PathItem# */{
locations.sort(compare); locations.sort(compare);
// Filter out duplicate locations // Filter out duplicate locations
for (var i = last; i >= 0; i--) { for (var i = last; i >= 0; i--) {
if (locations[i].equals(i === 0 if (locations[i].equals(locations[i === 0 ? last : i - 1])) {
? locations[last] : locations[i - 1])) {
locations.splice(i, 1); locations.splice(i, 1);
last--; last--;
} }