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

Fixed alignment problem in tangent_align.()

Browse source
This commit is contained in:
Adrian Mariano 2020-02-03 17:46:42 -05:00
parent 0aabf2cf47
commit 927e50c5ca
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
skin.scad
View file

@ -557,7 +557,8 @@ function tangent_align(poly1, poly2) =
swap = len(poly1)>len(poly2), swap = len(poly1)>len(poly2),
big = swap ? poly1 : poly2, big = swap ? poly1 : poly2,
small = swap ? poly2 : poly1, small = swap ? poly2 : poly1,
cutpts = [for(i=[0:len(small)-1]) find_one_tangent(big, select(small,i,i+1))], curve_offset = centroid(small)-centroid(big),
cutpts = [for(i=[0:len(small)-1]) find_one_tangent(big, select(small,i,i+1),curve_offset=curve_offset)],
d=echo(cutpts = cutpts), d=echo(cutpts = cutpts),
shift = select(cutpts,-1)+1, shift = select(cutpts,-1)+1,
newbig = polygon_shift(big, shift), newbig = polygon_shift(big, shift),
@ -568,7 +569,7 @@ function tangent_align(poly1, poly2) =
swap ? [newbig, newsmall] : [newsmall, newbig]; swap ? [newbig, newsmall] : [newsmall, newbig];
function find_one_tangent(curve, edge, closed=true) = function find_one_tangent(curve, edge, curve_offset=[0,0,0], closed=true) =
let( let(
angles = angles =
[for(i=[0:len(curve)-(closed?1:2)]) [for(i=[0:len(curve)-(closed?1:2)])
@ -577,10 +578,11 @@ function find_one_tangent(curve, edge, closed=true) =
tangent = [curve[i], select(curve,i+1)] tangent = [curve[i], select(curve,i+1)]
) )
plane_line_angle(plane,tangent)], plane_line_angle(plane,tangent)],
zcross = [for(i=[0:len(curve)-(closed?1:2)]) if (sign(angles[i]) != sign(select(angles,i+1))) i], zero_cross = [for(i=[0:len(curve)-(closed?1:2)]) if (sign(angles[i]) != sign(select(angles,i+1))) i],
d = [for(i=zcross) distance_from_line(edge, curve[i])] d = [for(i=zero_cross) distance_from_line(edge, curve[i]+curve_offset)]
) )
zcross[min_index(d)];//zcross; zero_cross[min_index(d)];//zcross;
function plane_line_angle(plane, line) = function plane_line_angle(plane, line) =