Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add explicit random jitter to intersection checks. #18

Merged
merged 2 commits into from
Mar 13, 2021
Merged

Add explicit random jitter to intersection checks. #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0767c82
Add explicit random jitter to intersection checks.
samhocevar Mar 5, 2021
842f362
Make getPathDirection() more robust.
samhocevar Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions raphael.boolean.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,11 @@
var point = Raphael.findDotsAtSegment(seg[0], seg[1], seg[2], seg[3], seg[4], seg[5], seg[6], seg[7], 0.5);

//is point inside of given path
return Raphael.isPointInsidePath(path, point.x, point.y);
var bbox = Raphael.pathBBox(path);
var dx = bbox.width * 1.1;
var dy = bbox.height * Math.random() / 100;
return Raphael.isPointInsideBBox(bbox, point.x, point.y) &&
Raphael.pathIntersectionNumber(path, [["M", point.x, point.y], ["l", dx, dy]], 1) % 2 == 1;
};

/**
Expand Down Expand Up @@ -427,9 +431,11 @@
var path = pathSegsToStr(pathSegArr);
var box = Raphael.pathBBox(path);

//"draw" a horizontal line from left to right at half height of path's bbox
//"draw" a horizontal line from left to right at half height of path's bbox,
//with some jitter to avoid intersecting at exact vertices.
var lineY = box.y + box.height / 2;
var line = ("M" + box.x + "," + lineY + "L" + box.x2 + "," + lineY);
var line = ("M" + box.x + "," + (lineY - box.height * Math.random() / 100)
+ "L" + box.x2 + "," + (lineY + box.height * Math.random() / 100));

//get intersections of line and path
var inters = Raphael.pathIntersection(line, path);
Expand All @@ -445,13 +451,11 @@
}

//decide, if path is clockwise (1) or counter clockwise (-1)
if (startY < lineY && inters[minT].segment2 >= inters[maxT].segment2 || startY > lineY && inters[minT].segment2 <= inters[maxT].segment2) {
if ((startY < lineY) == (inters[minT].segment2 >= inters[maxT].segment2)) {
//for path with only one segment compare t
if (inters[minT].segment2 == inters[maxT].segment2) {
if (startY < lineY && inters[minT].t2 >= inters[maxT].t2 || startY > lineY && inters[minT].t2 <= inters[maxT].t2) {
dir = 1;
}
} else {
if (inters[minT].segment2 != inters[maxT].segment2) {
dir = 1;
} else if ((startY < lineY) == (inters[minT].t2 >= inters[maxT].t2)) {
dir = 1;
}
}
Expand Down