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

Bugfix and optimization for find_noncollinear_points(). Optimized points_are_collinear()

Browse source
This commit is contained in:
Revar Desmera 2020-04-02 18:15:43 -07:00
parent 0524194391
commit 975185e262
3 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
geometry.scad
View file

@ -818,8 +818,10 @@ function polygon_line_intersection(poly, line, bounded=false, eps=EPSILON) =
function points_are_collinear(points, eps=EPSILON) = function points_are_collinear(points, eps=EPSILON) =
let( let(
a = furthest_point(points[0], points), a = furthest_point(points[0], points),
b = furthest_point(points[a], points) b = furthest_point(points[a], points),
) all([for (pt = points) collinear(points[a], points[b], pt, eps=eps)]); pa = points[a],
pb = points[b]
) all([for (pt = points) collinear(pa, pb, pt, eps=eps)]);
// Function: coplanar() // Function: coplanar()
@ -1028,12 +1030,17 @@ function find_noncollinear_points(points) =
let( let(
a = 0, a = 0,
b = furthest_point(points[a], points), b = furthest_point(points[a], points),
pa = points[a],
pb = points[b],
c = max_index([ c = max_index([
for (p=points) for (p=points)
(approx(p,pa) || approx(p,pb))? 0 :
sin(vector_angle(points[a]-p,points[b]-p)) * sin(vector_angle(points[a]-p,points[b]-p)) *
norm(p-points[a]) * norm(p-points[b]) norm(p-points[a]) * norm(p-points[b])
]) ])
) [a, b, c]; )
assert(c!=a && c!=b, "Cannot find three noncollinear points in pointlist.")
[a, b, c];
// Function: pointlist_bounds() // Function: pointlist_bounds()

31
vectors.scad
View file

@ -143,20 +143,23 @@ function unit(v) = norm(v)<=EPSILON? v : v/norm(v);
// vector_angle([10,10], [0,0], [10,-10]); // Returns: 90 // vector_angle([10,10], [0,0], [10,-10]); // Returns: 90
// vector_angle([10,0,10], [0,0,0], [-10,10,0]); // Returns: 120 // vector_angle([10,0,10], [0,0,0], [-10,10,0]); // Returns: 120
// vector_angle([[10,0,10], [0,0,0], [-10,10,0]]); // Returns: 120 // vector_angle([[10,0,10], [0,0,0], [-10,10,0]]); // Returns: 120
function vector_angle(v1,v2=undef,v3=undef) = function vector_angle(v1,v2,v3) =
(is_list(v1) && is_list(v1[0]) && is_undef(v2) && is_undef(v3))? ( let(
assert(is_vector(v1.x)) vecs = !is_undef(v3)? [v1-v2,v3-v2] :
assert(is_vector(v1.y)) !is_undef(v2)? [v1,v2] :
len(v1)==3? assert(is_vector(v1.z)) vector_angle(v1.x, v1.y, v1.z) : len(v1) == 3? [v1[0]-v1[1],v1[2]-v1[1]] :
len(v1)==2? vector_angle(v1.x, v1.y) : len(v1) == 2? v1 :
assert(false, "Bad arguments.") assert(false, "Bad arguments to vector_angle()"),
) : is_valid = is_vector(vecs[0]) && is_vector(vecs[1]) && vecs[0]*0 == vecs[1]*0
(is_vector(v1) && is_vector(v2) && is_vector(v3))? vector_angle(v1-v2, v3-v2) : )
(is_vector(v1) && is_vector(v2) && is_undef(v3))? ( assert(is_valid, "Bad arguments to vector_angle()")
assert(len(v1)==len(v2)) let(
// NOTE: constrain() corrects crazy FP rounding errors that exceed acos()'s domain. norm0 = norm(vecs[0]),
acos(constrain((v1*v2)/(norm(v1)*norm(v2)), -1, 1)) norm1 = norm(vecs[1])
) : assert(false, "Bad arguments."); )
assert(norm0>0 && norm1>0,"Zero length vector given to vector_angle()")
// NOTE: constrain() corrects crazy FP rounding errors that exceed acos()'s domain.
acos(constrain((vecs[0]*vecs[1])/(norm0*norm1), -1, 1));
// Function: vector_axis() // Function: vector_axis()

2
version.scad
View file

@ -8,7 +8,7 @@
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
BOSL_VERSION = [2,0,252]; BOSL_VERSION = [2,0,253];
// Section: BOSL Library Version Functions // Section: BOSL Library Version Functions