grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2024-12-29 16:29:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better codes for _closest_s

Browse source
This commit is contained in:
RonaldoCMP 2021-06-25 14:43:38 +01:00
parent e63c1680a6
commit 83f7ec499e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
geometry.scad
View file

@ -1778,7 +1778,7 @@ function circle_line_intersection(c,r,d,line,bounded=false,eps=EPSILON) =
function noncollinear_triple(points,error=true,eps=EPSILON) = function noncollinear_triple(points,error=true,eps=EPSILON) =
assert( is_path(points), "Invalid input points." ) assert( is_path(points), "Invalid input points." )
assert( is_finite(eps) && (eps>=0), "The tolerance should be a non-negative value." ) assert( is_finite(eps) && (eps>=0), "The tolerance should be a non-negative value." )
len(pts)<3 ? [] : len(points)<3 ? [] :
let( let(
pa = points[0], pa = points[0],
b = furthest_point(pa, points), b = furthest_point(pa, points),
@ -2493,7 +2493,7 @@ function _closest_simplex(s,eps=EPSILON) =
len(s)==2 ? _closest_s1(s,eps) : len(s)==2 ? _closest_s1(s,eps) :
len(s)==3 ? _closest_s2(s,eps) : len(s)==3 ? _closest_s2(s,eps) :
len(s)==4 ? _closest_s3(s,eps) : len(s)==4 ? _closest_s3(s,eps) :
assert(false, "Internal error."); assert(false, "Internal error.");
// find the point of a 1-simplex closest to the origin // find the point of a 1-simplex closest to the origin
@ -2517,7 +2517,7 @@ function _closest_s2(s, eps=EPSILON) =
// outcomes are s, [s[0],s[2]] and [s[1],s[2]] // outcomes are s, [s[0],s[2]] and [s[1],s[2]]
let( let(
area = cross(s[2]-s[0], s[1]-s[0]), area = cross(s[2]-s[0], s[1]-s[0]),
area2 = area*area // tri area squared area2 = area*area // tri area squared
) )
area2<=eps*max([for(si=s) pow(si*si,2)]) // degenerate tri area2<=eps*max([for(si=s) pow(si*si,2)]) // degenerate tri
? norm(s[2]-s[0]) < norm(s[2]-s[1]) ? norm(s[2]-s[0]) < norm(s[2]-s[1])