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

Fix parameter sequence for circle_line_intersection

Browse source 
Add sphere_line_intersection
This commit is contained in:
Adrian Mariano 2022-01-27 14:53:06 -05:00
parent 600175f205
commit 5a4e9f0514
1 changed files with 37 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
geometry.scad
View file

@ -1048,15 +1048,20 @@ function _is_point_above_plane(plane, point) =
// Arguments: // Arguments:
// c = center of circle // c = center of circle
// r = radius of circle // r = radius of circle
// ---
// d = diameter of circle
// line = two points defining the line // line = two points defining the line
// bounded = false for unbounded line, true for a segment, or a vector [false,true] or [true,false] to specify a ray with the first or second end unbounded. Default: false // bounded = false for unbounded line, true for a segment, or a vector [false,true] or [true,false] to specify a ray with the first or second end unbounded. Default: false
// ---
// d = diameter of circle
// eps = epsilon used for identifying the case with one solution. Default: 1e-9 // eps = epsilon used for identifying the case with one solution. Default: 1e-9
function circle_line_intersection(c,r,d,line,bounded=false,eps=EPSILON) = function circle_line_intersection(c,r,line,bounded=false,d,eps=EPSILON) =
let(r=get_radius(r=r,d=d,dflt=undef))
assert(_valid_line(line,2), "Invalid 2d line.") assert(_valid_line(line,2), "Invalid 2d line.")
assert(is_vector(c,2), "Circle center must be a 2-vector") assert(is_vector(c,2), "Circle center must be a 2-vector")
_circle_or_sphere_line_intersection(c,r,line,bounded,d,eps);
function _circle_or_sphere_line_intersection(c,r,line,bounded=false,d,eps=EPSILON) =
let(r=get_radius(r=r,d=d,dflt=undef))
assert(is_num(r) && r>0, "Radius must be positive") assert(is_num(r) && r>0, "Radius must be positive")
assert(is_bool(bounded) || is_bool_list(bounded,2), "Invalid bound condition") assert(is_bool(bounded) || is_bool_list(bounded,2), "Invalid bound condition")
let( let(
@ -1491,6 +1496,34 @@ function _noncollinear_triple(points,error=true,eps=EPSILON) =
// Section: Sphere Calculations
// Function: sphere_line_intersection()
// Usage:
// isect = sphere_line_intersection(c,<r|d>,[line],[bounded],[eps]);
// Topics: Geometry, Spheres, Lines, Intersection
// Description:
// Find intersection points between a sphere and a line, ray or segment specified by two points.
// By default the line is unbounded.
// Arguments:
// c = center of sphere
// r = radius of sphere
// line = two points defining the line
// bounded = false for unbounded line, true for a segment, or a vector [false,true] or [true,false] to specify a ray with the first or second end unbounded. Default: false
// ---
// d = diameter of sphere
// eps = epsilon used for identifying the case with one solution. Default: 1e-9
function sphere_line_intersection(c,r,line,bounded=false,d,eps=EPSILON) =
assert(_valid_line(line,3), "Invalid 3d line.")
assert(is_vector(c,3), "Sphere center must be a 3-vector")
_circle_or_sphere_line_intersection(c,r,line,bounded,d,eps);
// Section: Polygons // Section: Polygons
// Function: polygon_area() // Function: polygon_area()