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

Make circle_point_tangents() behavior consistent for points on the circle. Fix #408

Browse source
This commit is contained in:
Martin Čížek 2021-02-02 19:18:43 +01:00
parent a2d0ed6a57
commit ba32041b53
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
geometry.scad
View file

@ -1508,7 +1508,7 @@ function circle_point_tangents(r, d, cp, pt) =
dist = norm(delta), dist = norm(delta),
baseang = atan2(delta.y,delta.x) baseang = atan2(delta.y,delta.x)
) dist < r? [] : ) dist < r? [] :
approx(dist,r)? [[baseang, pt]] : approx(dist,r)? [pt] :
let( let(
relang = acos(r/dist), relang = acos(r/dist),
angs = [baseang + relang, baseang - relang] angs = [baseang + relang, baseang - relang]

5
tests/test_geometry.scad
View file

@ -606,7 +606,10 @@ module test_circle_point_tangents() {
[[0,0], 50, [50*sqrt(2),0], [polar_to_xy(50,45), polar_to_xy(50,-45)]], [[0,0], 50, [50*sqrt(2),0], [polar_to_xy(50,45), polar_to_xy(50,-45)]],
[[5,10], 50, [5+50*sqrt(2),10], [[5,10]+polar_to_xy(50,45), [5,10]+polar_to_xy(50,-45)]], [[5,10], 50, [5+50*sqrt(2),10], [[5,10]+polar_to_xy(50,45), [5,10]+polar_to_xy(50,-45)]],
[[0,0], 50, [0,50*sqrt(2)], [polar_to_xy(50,135), polar_to_xy(50,45)]], [[0,0], 50, [0,50*sqrt(2)], [polar_to_xy(50,135), polar_to_xy(50,45)]],
[[5,10], 50, [5,10+50*sqrt(2)], [[5,10]+polar_to_xy(50,135), [5,10]+polar_to_xy(50,45)]] [[5,10], 50, [5,10+50*sqrt(2)], [[5,10]+polar_to_xy(50,135), [5,10]+polar_to_xy(50,45)]],
[[5,10], 50, [5,10+50*sqrt(2)], [[5,10]+polar_to_xy(50,135), [5,10]+polar_to_xy(50,45)]],
[[5,10], 50, [5, 60], [[5, 60]]],
[[5,10], 50, [5, 59], []],
]; ];
for (v = testvals) { for (v = testvals) {
cp = v[0]; r = v[1]; pt = v[2]; expect = v[3]; cp = v[0]; r = v[1]; pt = v[2]; expect = v[3];