Skip to content

Commit

Permalink
fix intersectsSelf
Browse files Browse the repository at this point in the history
  • Loading branch information
@foo123
foo123 committed Dec 12, 2022
1 parent d4f894c commit dc54592
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions build/Geometrize.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
* Geometrize
* computational geometry and rendering library for JavaScript
*
* @version 0.9.0 (2022-12-12 19:36:15)
* @version 0.9.0 (2022-12-12 23:14:40)
* https://github.com/foo123/Geometrize
*
**//**
* Geometrize
* computational geometry and rendering library for JavaScript
*
* @version 0.9.0 (2022-12-12 19:36:15)
* @version 0.9.0 (2022-12-12 23:14:40)
* https://github.com/foo123/Geometrize
*
**/
Expand Down Expand Up @@ -1968,8 +1968,8 @@ var CompositeCurve = makeClass(Curve, {
p2 = c[j]._points[c[j]._points.length-1];
p3 = c[k]._points[0];
p4 = c[k]._points[c[k]._points.length-1];
if (p_eq(p1, p3) || p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
if (p_eq(p2, p3) || p_eq(p2, p4)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
if ((j === 0) && (k === n-1) && p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
else if ((k === j+1) && p_eq(p2, p3)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
i.push.apply(i, ii);
}
}
Expand Down Expand Up @@ -2496,8 +2496,8 @@ var Polyline = makeClass(Curve, {
ii = line_segments_intersection(p1, p2, p3, p4);
if (ii)
{
if (p_eq(p1, p3) || p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
if (p_eq(p2, p3) || p_eq(p2, p4)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
if ((j === 0) && (k === n-1) && p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
else if ((k === j+1) && p_eq(p2, p3)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
i.push.apply(i, ii);
}
}
Expand Down Expand Up @@ -3588,8 +3588,8 @@ var Polygon = makeClass(Curve, {
ii = line_segments_intersection(p1, p2, p3, p4);
if (ii)
{
if (p_eq(p1, p3) || p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
if (p_eq(p2, p3) || p_eq(p2, p4)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
if ((j === 0) && (k === n-1) && p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
else if ((k === j+1) && p_eq(p2, p3)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
i.push.apply(i, ii);
}
}
Expand Down
4 changes: 2 additions & 2 deletions build/Geometrize.min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/Curve.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,8 +542,8 @@ var CompositeCurve = makeClass(Curve, {
p2 = c[j]._points[c[j]._points.length-1];
p3 = c[k]._points[0];
p4 = c[k]._points[c[k]._points.length-1];
if (p_eq(p1, p3) || p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
if (p_eq(p2, p3) || p_eq(p2, p4)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
if ((j === 0) && (k === n-1) && p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
else if ((k === j+1) && p_eq(p2, p3)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
i.push.apply(i, ii);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Polygon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ var Polygon = makeClass(Curve, {
ii = line_segments_intersection(p1, p2, p3, p4);
if (ii)
{
if (p_eq(p1, p3) || p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
if (p_eq(p2, p3) || p_eq(p2, p4)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
if ((j === 0) && (k === n-1) && p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
else if ((k === j+1) && p_eq(p2, p3)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
i.push.apply(i, ii);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Polyline.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ var Polyline = makeClass(Curve, {
ii = line_segments_intersection(p1, p2, p3, p4);
if (ii)
{
if (p_eq(p1, p3) || p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
if (p_eq(p2, p3) || p_eq(p2, p4)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
if ((j === 0) && (k === n-1) && p_eq(p1, p4)) ii = ii.filter(function(p) {return !p_eq(p, p1);});
else if ((k === j+1) && p_eq(p2, p3)) ii = ii.filter(function(p) {return !p_eq(p, p2);});
i.push.apply(i, ii);
}
}
Expand Down

0 comments on commit dc54592

Please sign in to comment.