grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-04 03:09:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #578 from revarbat/revarbat_dev

Browse source 
Fix for issue #429
This commit is contained in:
Revar Desmera 2021-06-19 23:25:31 -07:00 committed by GitHub
commit f4d6d9f2b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
paths.scad
View file

@ -661,7 +661,7 @@ function path_self_intersections(path, closed=true, eps=EPSILON) =
path = cleanup_path(path, eps=eps), path = cleanup_path(path, eps=eps),
plen = len(path) plen = len(path)
) [ ) [
for (i = [0:1:plen-(closed?2:3)], j=[i+1:1:plen-(closed?1:2)]) let( for (i = [0:1:plen-(closed?2:3)], j=[i+2:1:plen-(closed?1:2)]) let(
a1 = path[i], a1 = path[i],
a2 = path[(i+1)%plen], a2 = path[(i+1)%plen],
b1 = path[j], b1 = path[j],
@ -675,15 +675,16 @@ function path_self_intersections(path, closed=true, eps=EPSILON) =
c = a1-a2, c = a1-a2,
d = b1-b2, d = b1-b2,
denom = (c.x*d.y)-(c.y*d.x) denom = (c.x*d.y)-(c.y*d.x)
) abs(denom)<eps? undef : let( ) abs(denom)<eps? undef :
let(
e = a1-b1, e = a1-b1,
t = ((e.x*d.y)-(e.y*d.x)) / denom, t = ((e.x*d.y)-(e.y*d.x)) / denom,
u = ((e.x*c.y)-(e.y*c.x)) / denom u = ((e.x*c.y)-(e.y*c.x)) / denom
) [a1+t*(a2-a1), t, u] ) [a1+t*(a2-a1), t, u]
) if ( ) if (
isect != undef && isect != undef &&
isect[1]>eps && isect[1]<=1+eps && isect[1]>=-eps && isect[1]<=1+eps &&
isect[2]>eps && isect[2]<=1+eps isect[2]>=-eps && isect[2]<=1+eps
) [isect[0], i, isect[1], j, isect[2]] ) [isect[0], i, isect[1], j, isect[2]]
]; ];