openscad/BOSL2
1
0
Fork 0
mirror of https://github.com/revarbat/BOSL2.git synced 2025-08-01 13:50:33 +02:00
Code Issues Projects Releases Wiki Activity

joiners bugfix, attachments proofread

Browse Source
This commit is contained in:
Adrian Mariano
2022-11-15 23:02:39 -05:00
parent 1cf60c41e2
commit 45826195c8
2 changed files with 90 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
joiners.scad
View File

@@ -629,70 +629,76 @@ module dovetail(gender, width, height, slide, h, w, angle, slope, thickness, tap
count2 = num_defined([taper,back_width]);
count3 = num_defined([chamfer, radius]);
dummy =
assert(count<=1, "Do not specify both angle and slope")
assert(count2<=1, "Do not specify both taper and back_width")
assert(count3<=1 || (radius==0 && chamfer==0), "Do not specify both chamfer and radius");
slope = is_def(slope) ? slope :
is_def(angle) ? 1/tan(angle) : 6;
assert(count<=1, "Do not specify both angle and slope")
assert(count2<=1, "Do not specify both taper and back_width")
assert(count3<=1 || (radius==0 && chamfer==0), "Do not specify both chamfer and radius");
slope = is_def(slope) ? slope
: is_def(angle) ? 1/tan(angle)
: 6;
height_slop = gender == "female" ? get_slop() : 0;
// This adjustment factor doesn't seem to be exactly right, but don't know how to get it right
// Need taper angle for computing width adjustment, but not used elsewhere
taper_ang = is_def(taper) ? taper
: is_def(back_width) ? atan((back_width-width)/slide)
: is_def(back_width) ? atan((back_width-width)/2/slide)
: 0;
wfactor=rot(atan(cos(taper_ang)/slope),p=zrot(taper_ang, RIGHT), v=[-sin(taper_ang),cos(taper_ang),0]).x;
// This is the adjustment factor for width to grow in the direction normal to the dovetail face
wfactor = sqrt( 1/slope^2 + 1/cos(taper_ang)^2 );
// adjust width for increased height adjust for normal to dovetail surface
width_slop = 2*height_slop/slope + 2* height_slop / wfactor;
width_slop = 2*height_slop/slope + 2* height_slop * wfactor;
width = w + width_slop;
height = h + height_slop;
back_width = u_add(back_width, width_slop);
front_offset = is_def(taper) ? -extra * tan(taper)
extra_offset = is_def(taper) ? -extra * tan(taper)
: is_def(back_width) ? extra * (back_width-width)/slide/2
: 0;
size = is_def(chamfer) && chamfer>0 ? chamfer
: is_def(radius) && radius>0 ? radius
: 0;
fullsize = round ? [size,size]
: gender == "male" ? [size,0]
: [0,size];
type = is_def(chamfer) && chamfer>0 ? "chamfer" : "circle";
fullsize = round ? [size,size] :
gender == "male" ? [size,0] : [0,size];
smallend_half = round_corners(
move(
[0,-slide/2-extra,0],
p=[
[0, 0, height],
[width/2 - front_offset, 0, height],
[width/2 - height/slope - front_offset, 0, 0 ],
[width/2 - front_offset + height, 0, 0 ]
[width/2 - extra_offset, 0, height],
[width/2 - extra_offset - height/slope, 0, 0 ],
[width/2 - extra_offset + height, 0, 0 ]
]
),
method=type, cut = fullsize, closed=false
);
smallend_points = concat(select(smallend_half, 1, -2), [down(extra,p=select(smallend_half, -2))]);
offset = is_def(taper) ? -(slide+extra) * tan(taper)
offset = is_def(taper) ? -slide * tan(taper)
: is_def(back_width) ? (back_width-width) / 2
: 0;
bigend_points = move([offset,slide+2*extra,0], p=smallend_points);
bigend_points = move([offset+2*extra_offset,slide+2*extra,0], p=smallend_points);
bigenough = all_nonnegative(column(smallend_half,0)) && all_nonnegative(column(bigend_points,0));
assert(bigenough, "Width of dovetail is not large enough for its geometry (angle and taper");
//adjustment = $overlap * (gender == "male" ? -1 : 1); // Adjustment for default overlap in attach()
adjustment = 0; // Default overlap is assumed to be zero
// This code computes the true normal from which the exact width factor can be obtained
// as the x component. Comparing to wfactor above shows small discrepancy.
// Note, male joint case is totally wrong, but that doesn't matter because we only need
// slop for female
// as the x component. Comparing to wfactor above shows that they agree.
// pts = [smallend_points[0], smallend_points[1], bigend_points[1],bigend_points[0]];
// n = -polygon_normal(pts);
// echo(n=n);
// echo(wfactor=wfactor);
// echo(err = n.x-wfactor);
// echo(invwfactor = 1/wfactor, error = n.x-1/wfactor);
attachable(anchor,spin,orient, size=[width+2*offset, slide, height]) {
down(height/2+adjustment) {
//color("red")stroke([pts],width=.1);
skin(
[
reverse(concat(smallend_points, xflip(p=reverse(smallend_points)))),