Screw update: 4x faster, higbee renamed blunt start and on by default

This commit is contained in:
Adrian Mariano 2023-04-04 19:55:05 -04:00
parent 9e982d12d1
commit 7179bc7711
4 changed files with 887 additions and 454 deletions

View file

@ -117,7 +117,7 @@ module pco1810_neck(wall=2, anchor="support-ring", spin=0, orient=UP)
thread_depth=thread_h+0.1, thread_depth=thread_h+0.1,
flank_angle=flank_angle, flank_angle=flank_angle,
turns=810/360, turns=810/360,
taper=-thread_h*2, lead_in=-thread_h*2,
anchor=TOP anchor=TOP
); );
zrot_copies(rots=[90,270]) { zrot_copies(rots=[90,270]) {
@ -190,7 +190,7 @@ module pco1810_cap(wall=2, texture="none", anchor=BOTTOM, spin=0, orient=UP)
} }
up(wall) cyl(d=cap_id, h=tamper_ring_h+wall, anchor=BOTTOM); up(wall) cyl(d=cap_id, h=tamper_ring_h+wall, anchor=BOTTOM);
} }
up(wall+2) thread_helix(d=thread_od-thread_depth*2, pitch=thread_pitch, thread_depth=thread_depth, flank_angle=flank_angle, turns=810/360, taper=-thread_depth, internal=true, anchor=BOTTOM); up(wall+2) thread_helix(d=thread_od-thread_depth*2, pitch=thread_pitch, thread_depth=thread_depth, flank_angle=flank_angle, turns=810/360, lead_in=-thread_depth, internal=true, anchor=BOTTOM);
} }
children(); children();
} }
@ -306,7 +306,7 @@ module pco1881_neck(wall=2, anchor="support-ring", spin=0, orient=UP)
thread_depth=thread_h+0.1, thread_depth=thread_h+0.1,
flank_angle=flank_angle, flank_angle=flank_angle,
turns=650/360, turns=650/360,
taper=-thread_h*2, lead_in=-thread_h*2,
anchor=TOP anchor=TOP
); );
zrot_copies(rots=[90,270]) { zrot_copies(rots=[90,270]) {
@ -371,7 +371,7 @@ module pco1881_cap(wall=2, texture="none", anchor=BOTTOM, spin=0, orient=UP)
} }
up(wall) cyl(d=28.58, h=11.2+wall, anchor=BOTTOM); up(wall) cyl(d=28.58, h=11.2+wall, anchor=BOTTOM);
} }
up(wall+2) thread_helix(d=25.5, pitch=2.7, thread_depth=1.6, flank_angle=15, turns=650/360, taper=-1.6, internal=true, anchor=BOTTOM); up(wall+2) thread_helix(d=25.5, pitch=2.7, thread_depth=1.6, flank_angle=15, turns=650/360, lead_in=-1.6, internal=true, anchor=BOTTOM);
} }
children(); children();
} }
@ -475,7 +475,7 @@ module generic_bottle_neck(
thread_depth = thread_h + 0.1 * diamMagMult, thread_depth = thread_h + 0.1 * diamMagMult,
flank_angle = flank_angle, flank_angle = flank_angle,
turns = (height - pitch - lip_roundover_r) * .6167 / pitch, turns = (height - pitch - lip_roundover_r) * .6167 / pitch,
taper = -thread_h * 2, lead_in = -thread_h * 2,
anchor = TOP anchor = TOP
); );
zrot_copies(rots = [90, 270]) { zrot_copies(rots = [90, 270]) {
@ -579,7 +579,7 @@ module generic_bottle_cap(
difference(){ difference(){
up(wall + pitch / 2) { up(wall + pitch / 2) {
thread_helix(d = neckOuterDTol, pitch = pitch, thread_depth = threadDepth, flank_angle = flank_angle, thread_helix(d = neckOuterDTol, pitch = pitch, thread_depth = threadDepth, flank_angle = flank_angle,
turns = ((height - pitch) / pitch), taper = -threadDepth, internal = true, anchor = BOTTOM); turns = ((height - pitch) / pitch), lead_in = -threadDepth, internal = true, anchor = BOTTOM);
} }
} }
} }
@ -954,8 +954,9 @@ function bottle_adapter_neck_to_neck(
// 400, 410 and 415. The 400 type neck has 360 degrees of thread, the 410 // 400, 410 and 415. The 400 type neck has 360 degrees of thread, the 410
// neck has 540 degrees of thread, and the 415 neck has 720 degrees of thread. // neck has 540 degrees of thread, and the 415 neck has 720 degrees of thread.
// You can also choose between the L style thread, which is symmetric and // You can also choose between the L style thread, which is symmetric and
// the M style thread, which is an asymmetric buttress thread. You can // the M style thread, which is an asymmetric buttress thread. The M style
// specify the wall thickness (measured from the base of the threads) or // may be good for 3d printing if printed with the flat face up.
// You can specify the wall thickness (measured from the base of the threads) or
// the inner diameter, and you can specify an optional bead at the base of the threads. // the inner diameter, and you can specify an optional bead at the base of the threads.
// Arguments: // Arguments:
// diam = nominal outer diameter of threads // diam = nominal outer diameter of threads
@ -1094,6 +1095,8 @@ module sp_neck(diam,type,wall,id,style="L",bead=false, anchor, spin, orient)
H = entry[2]; H = entry[2];
S = entry[3]; S = entry[3];
tpi = entry[4]; tpi = entry[4];
// a is the width of the thread
a = (style=="M" && tpi==12) ? 1.3 : struct_val(_sp_thread_width,tpi); a = (style=="M" && tpi==12) ? 1.3 : struct_val(_sp_thread_width,tpi);
twist = struct_val(_sp_twist, type); twist = struct_val(_sp_twist, type);
@ -1126,7 +1129,7 @@ module sp_neck(diam,type,wall,id,style="L",bead=false, anchor, spin, orient)
up((H+extra_bot)/2){ up((H+extra_bot)/2){
difference(){ difference(){
union(){ union(){
thread_helix(d=T-.01, profile=profile, pitch = INCH/tpi, turns=twist/360, taper=taperlen, anchor=TOP); thread_helix(d=T-.01, profile=profile, pitch = INCH/tpi, turns=twist/360, lead_in=taperlen, anchor=TOP);
cylinder(d=T-depth*2,h=H,anchor=TOP); cylinder(d=T-depth*2,h=H,anchor=TOP);
if (bead) if (bead)
down(bead_shift) down(bead_shift)
@ -1154,12 +1157,15 @@ module sp_neck(diam,type,wall,id,style="L",bead=false, anchor, spin, orient)
// the M style thread, which is an asymmetric buttress thread. Note that it // the M style thread, which is an asymmetric buttress thread. Note that it
// is OK to mix styles, so you can put an L-style cap onto an M-style neck. // is OK to mix styles, so you can put an L-style cap onto an M-style neck.
// . // .
// These caps often contain a cardboard or foam sealer disk, which can be as much as 1mm thick. // The 410 and 415 caps have very long unthreaded sections at the bottom.
// If you don't include this, your cap may bottom out on the bead on the neck instead of sealing // The bot_adj parameter specifies an amount to reduce that bottom extension, which might be
// against the top. If you set top_adj to 1 it will make the top space 1mm smaller so that the // necessary if the cap bottoms out on the bead. Be careful that you don't shrink past the threads,
// cap will not bottom out. The 410 and 415 caps have very long unthreaded sections at the bottom. // especially if making adjustments to 400 caps which have a very small bottom extension.
// The bot_adj parameter specifies an amount to reduce that bottom extension. Be careful that // These caps often contain a cardboard or foam sealer disk, which can be as much as 1mm thick, and
// you don't shrink past the threads. // would cause the cap to stop in a higher position.
// .
// You can also adjust the space between the top of the cap and the threads using top_adj. This
// will change how the threads engage when the cap is fully seated.
// . // .
// The inner diameter of the cap is set to allow 10% of the thread depth in clearance. The diameter // The inner diameter of the cap is set to allow 10% of the thread depth in clearance. The diameter
// is further increased by `2 * $slop` so you can increase clearance if necessary. // is further increased by `2 * $slop` so you can increase clearance if necessary.
@ -1182,6 +1188,7 @@ module sp_neck(diam,type,wall,id,style="L",bead=false, anchor, spin, orient)
// orient = Vector to rotate top towards, after spin. See [orient](attachments.scad#subsection-orient). Default: `UP` // orient = Vector to rotate top towards, after spin. See [orient](attachments.scad#subsection-orient). Default: `UP`
// Examples: // Examples:
// sp_cap(48,400,2); // sp_cap(48,400,2);
// sp_cap(22,400,2);
// sp_cap(22,410,2); // sp_cap(22,410,2);
// sp_cap(28,415,1.5,style="M"); // sp_cap(28,415,1.5,style="M");
module sp_cap(diam,type,wall,style="L",top_adj=0, bot_adj=0, texture="none", anchor, spin, orient) module sp_cap(diam,type,wall,style="L",top_adj=0, bot_adj=0, texture="none", anchor, spin, orient)
@ -1194,13 +1201,14 @@ module sp_cap(diam,type,wall,style="L",top_adj=0, bot_adj=0, texture="none", anc
T = entry[0]; T = entry[0];
I = entry[1]; I = entry[1];
H = entry[2]-1; H = entry[2]-0.5;
S = entry[3]; S = entry[3];
tpi = entry[4]; tpi = entry[4];
a = (style=="M" && tpi==12) ? 1.3 : struct_val(_sp_thread_width,tpi); a = (style=="M" && tpi==12) ? 1.3 : struct_val(_sp_thread_width,tpi);
twist = struct_val(_sp_twist, type); twist = struct_val(_sp_twist, type);
echo(top_adj=top_adj,bot_adj=bot_adj);
dum3=assert(top_adj<S+0.75*a, str("The top_adj value is too large so the thread won't fit. It must be smaller than ",S+0.75*a)); dum3=assert(top_adj<S+0.75*a, str("The top_adj value is too large so the thread won't fit. It must be smaller than ",S+0.75*a));
oprofile = _sp_thread_profile(tpi,a,S+0.75*a-top_adj,style,flip=true); oprofile = _sp_thread_profile(tpi,a,S+0.75*a-top_adj,style,flip=true);
bounds=pointlist_bounds(oprofile); bounds=pointlist_bounds(oprofile);
@ -1224,7 +1232,7 @@ module sp_cap(diam,type,wall,style="L",top_adj=0, bot_adj=0, texture="none", anc
} }
cyl(d=T+space, l=H-bot_adj+1, anchor=TOP); cyl(d=T+space, l=H-bot_adj+1, anchor=TOP);
} }
thread_helix(d=T+space-.01, profile=profile, pitch = INCH/tpi, turns=twist/360, taper=taperlen, anchor=TOP, internal=true); thread_helix(d=T+space-.01, profile=profile, pitch = INCH/tpi, turns=twist/360, lead_in=taperlen, anchor=TOP, internal=true);
} }
children(); children();
} }

View file

@ -189,7 +189,7 @@ Torx values: https://www.stanleyengineeredfastening.com/-/media/web/sef/resourc
// Module: screw() // Module: screw()
// Usage: // Usage:
// screw([spec], [head], [drive], [thread=], [drive_size=], [length=|l=], [thread_len=], [undersize=], [shaft_undersize=], [head_undersize=], [tolerance=], [details=], [anchor=], [atype=], [orient=], [spin=]) [ATTACHMENTS]; // screw([spec], [head], [drive], [thread=], [drive_size=], [length=|l=], [thread_len=], [undersize=], [shaft_undersize=], [head_undersize=], [tolerance=], [blunt_start=], [details=], [anchor=], [atype=], [orient=], [spin=]) [ATTACHMENTS];
// Description: // Description:
// Create a screw. See [screw and nut parameters](#section-screw-and-nut-parameters) for details on the parameters that define a screw. // Create a screw. See [screw and nut parameters](#section-screw-and-nut-parameters) for details on the parameters that define a screw.
// The tolerance determines the dimensions of the screw // The tolerance determines the dimensions of the screw
@ -246,9 +246,11 @@ Torx values: https://www.stanleyengineeredfastening.com/-/media/web/sef/resourc
// shaft_undersize = amount to decrease diameter of the shaft of screw; replaces rather than adding to the shaft_oversize value in a screw specification. // shaft_undersize = amount to decrease diameter of the shaft of screw; replaces rather than adding to the shaft_oversize value in a screw specification.
// head_undersize = amount to decrease the head diameter of the screw; replaces rather than adding to the head_oversize value in a screw specification. // head_undersize = amount to decrease the head diameter of the screw; replaces rather than adding to the head_oversize value in a screw specification.
// bevel1 = bevel bottom end of screw. Default: true // bevel1 = bevel bottom end of screw. Default: true
// bevel2 = bevel top end of threaded section. Default: true for headless, false otherwise // bevel2 = bevel top end of threaded section. Default: true for fully threaded or unthreaded headless, false otherwise
// bevel = bevel both ends of the threaded section. // bevel = bevel both ends of the threaded section.
// higbee = if true create blunt start threads at both ends for headless screws, and bottom only for other screws. Default: false // blunt_start = if true and hole is threaded, create blunt start threads. Default: true
// blunt_start1 = if true and hole is threaded, create blunt start threads at bottom end.
// blunt_start2 = if true and hole is threaded, create blunt start threads top end.
// atype = anchor type, one of "screw", "head", "shaft", "threads", "shank" // atype = anchor type, one of "screw", "head", "shaft", "threads", "shank"
// anchor = Translate so anchor point on the shaft is at origin (0,0,0). See [anchor](attachments.scad#subsection-anchor). Default: `CENTER` // anchor = Translate so anchor point on the shaft is at origin (0,0,0). See [anchor](attachments.scad#subsection-anchor). Default: `CENTER`
// spin = Rotate this many degrees around the Z axis after anchor. See [spin](attachments.scad#subsection-spin). Default: `0` // spin = Rotate this many degrees around the Z axis after anchor. See [spin](attachments.scad#subsection-spin). Default: `0`
@ -424,7 +426,7 @@ Torx values: https://www.stanleyengineeredfastening.com/-/media/web/sef/resourc
// $fn=32; // $fn=32;
// projection(cut=true)xrot(-90){ // projection(cut=true)xrot(-90){
// screw("1/4-20,3/8", head="hex",orient=UP,anchor=BOTTOM,tolerance="1A"); // screw("1/4-20,3/8", head="hex",orient=UP,anchor=BOTTOM,tolerance="1A");
// down(INCH*1/20*1.395) nut("1/4-20", thickness=8, nutwidth=0.5*INCH, tolerance="1B"); // down(INCH*1/20*1.5) nut("1/4-20", thickness=8, nutwidth=0.5*INCH, tolerance="1B");
// } // }
// Example: Here is a screw with nonstandard threading and a weird head size, which we create by modifying the screw structure: // Example: Here is a screw with nonstandard threading and a weird head size, which we create by modifying the screw structure:
// spec = screw_info("M6x2,12",head="socket"); // spec = screw_info("M6x2,12",head="socket");
@ -515,19 +517,19 @@ function _nominal_diam(spec) = struct_val(spec,"diameter")+default(struct_val(sp
function screw(spec, head, drive, thread, drive_size, function screw(spec, head, drive, thread, drive_size,
length, l, thread_len, tolerance, details=true, length, l, thread_len, tolerance, details=true,
undersize, shaft_undersize, head_undersize, undersize, shaft_undersize, head_undersize,
atype="screw",anchor=BOTTOM, spin=0, orient=UP, atype="screw",anchor, spin=0, orient=UP,
_shoulder_diam=0, _shoulder_len=0, _shoulder_diam=0, _shoulder_len=0,
bevel,bevel1,bevel2,bevelsize, bevel,bevel1,bevel2,bevelsize,
higbee=false, blunt_start,blunt_start1, blunt_start2,
_internal=false, _counterbore, _teardrop) = no_function("screw"); _internal=false, _counterbore, _teardrop=false)
= no_function("screw");
module screw(spec, head, drive, thread, drive_size, module screw(spec, head, drive, thread, drive_size,
length, l, thread_len, tolerance, details=true, length, l, thread_len, tolerance, details=true,
undersize, shaft_undersize, head_undersize, undersize, shaft_undersize, head_undersize,
atype="screw",anchor, spin=0, orient=UP, atype="screw",anchor, spin=0, orient=UP,
_shoulder_diam=0, _shoulder_len=0, _shoulder_diam=0, _shoulder_len=0,
bevel,bevel1,bevel2,bevelsize, bevel,bevel1,bevel2,bevelsize,
higbee, blunt_start,blunt_start1, blunt_start2,
_internal=false, _counterbore, _teardrop=false) _internal=false, _counterbore, _teardrop=false)
{ {
tempspec = _get_spec(spec, "screw_info", _internal ? "screw_hole" : "screw", tempspec = _get_spec(spec, "screw_info", _internal ? "screw_hole" : "screw",
@ -585,6 +587,9 @@ module screw(spec, head, drive, thread, drive_size,
: (struct_val(spec,"head_size_sharp")+struct_val(spec,"head_oversize",0)-d_major)/2/tan(struct_val(spec,"head_angle")/2); : (struct_val(spec,"head_size_sharp")+struct_val(spec,"head_oversize",0)-d_major)/2/tan(struct_val(spec,"head_angle")/2);
flat_cbore_height = flathead && is_num(counterbore) ? counterbore : 0; flat_cbore_height = flathead && is_num(counterbore) ? counterbore : 0;
blunt_start1 = first_defined([blunt_start1,blunt_start,true]);
blunt_start2 = first_defined([blunt_start2,blunt_start,true]);
shoulder_adj = _shoulder_len>0 ? flat_height:0; // Adjustment because flathead height doesn't count toward shoulder length shoulder_adj = _shoulder_len>0 ? flat_height:0; // Adjustment because flathead height doesn't count toward shoulder length
shoulder_full = _shoulder_len==0 ? 0 : _shoulder_len + flat_height; shoulder_full = _shoulder_len==0 ? 0 : _shoulder_len + flat_height;
shank_len = is_def(user_thread_len) ? length - user_thread_len - (_shoulder_len==0?flat_height:0) : 0; shank_len = is_def(user_thread_len) ? length - user_thread_len - (_shoulder_len==0?flat_height:0) : 0;
@ -647,6 +652,8 @@ module screw(spec, head, drive, thread, drive_size,
: is_def(vnf) ? undef : is_def(vnf) ? undef
: head_height+flat_height+flat_cbore_height; : head_height+flat_height+flat_cbore_height;
bevelsize = default(bevelsize, d_major/12); bevelsize = default(bevelsize, d_major/12);
bevel1 = first_defined([bevel1,bevel,true]);
bevel2 = first_defined([bevel2,bevel,headless && _shoulder_len==0 && shank_len==0]);
attachable( attachable(
vnf = vnf, vnf = vnf,
d = u_add(u_mul(attach_d, rad_scale), islop), d = u_add(u_mul(attach_d, rad_scale), islop),
@ -671,8 +678,16 @@ module screw(spec, head, drive, thread, drive_size,
if (shank_len>0 || pitch==0){ if (shank_len>0 || pitch==0){
L = pitch==0 ? length - (_shoulder_len==0?flat_height:0) : shank_len; L = pitch==0 ? length - (_shoulder_len==0?flat_height:0) : shank_len;
bevsize = (_internal ? -1 : 1)*bevelsize; bevsize = (_internal ? -1 : 1)*bevelsize;
bev1 = details && pitch==0 && first_defined([bevel1,bevel,!_internal]) ? bevsize : 0; bev1 = pitch!=0 ? 0
bev2 = details && pitch==0 && first_defined([bevel2,bevel,headless && !_internal]) ? bevsize : 0; : bevel1==true ? bevsize
: bevel1==false ? 0
: bevel1=="reverse" ? -bevsize
: bevel1;
bev2 = pitch!=0 ? 0
: bevel2==true ? bevsize
: bevel2==false ? 0
: bevel2=="reverse" ? -bevsize
: bevel2;
down(_shoulder_len+flat_height-eps_shank) down(_shoulder_len+flat_height-eps_shank)
if (_teardrop) if (_teardrop)
teardrop(d=d_major*rad_scale+islop, h=L+eps_shank, anchor=FRONT, orient=BACK, $fn=sides, chamfer1=bev1, chamfer2=bev2); teardrop(d=d_major*rad_scale+islop, h=L+eps_shank, anchor=FRONT, orient=BACK, $fn=sides, chamfer1=bev1, chamfer2=bev2);
@ -680,18 +695,15 @@ module screw(spec, head, drive, thread, drive_size,
cyl(d=d_major*rad_scale+islop, h=L+eps_shank, anchor=TOP, $fn=sides, chamfer1=bev1, chamfer2=bev2); cyl(d=d_major*rad_scale+islop, h=L+eps_shank, anchor=TOP, $fn=sides, chamfer1=bev1, chamfer2=bev2);
} }
if (thread_len>0 && pitch>0){ if (thread_len>0 && pitch>0){
bev1 = details && first_defined([bevel1,bevel,!_internal]);
bev2 = details && first_defined([bevel2,bevel,!_internal && (flathead || _shoulder_len>0 || headless)]);
down(_shoulder_len+flat_height+shank_len-eps_thread) down(_shoulder_len+flat_height+shank_len-eps_thread)
threaded_rod([mean(struct_val(threadspec, "d_minor")), threaded_rod([mean(struct_val(threadspec, "d_minor")),
mean(struct_val(threadspec, "d_pitch")), mean(struct_val(threadspec, "d_pitch")),
d_major], d_major],
pitch = struct_val(threadspec, "pitch"), pitch = struct_val(threadspec, "pitch"),
l=thread_len+eps_thread, left_handed=false, internal=_internal, l=thread_len+eps_thread, left_handed=false, internal=_internal,
bevel1=bev1, bevel1=bevel1,
bevel2=bev2, bevel2=bevel2,
higbee1=higbee && !_internal, blunt_start=blunt_start, blunt_start1=blunt_start1, blunt_start2=blunt_start2,
higbee2=(!headless && !_internal) || is_undef(higbee) ? false : higbee,
$fn=sides, anchor=TOP); $fn=sides, anchor=TOP);
} }
@ -704,10 +716,9 @@ module screw(spec, head, drive, thread, drive_size,
// Module: screw_hole() // Module: screw_hole()
// Usage: // Usage:
// screw_hole([spec], [head], [thread=], [length=|l=], [oversize=], [hole_oversize=], [teardrop=], [head_oversize], [tolerance=], [$slop=], [anchor=], [atype=], [orient=], [spin=]) [ATTACHMENTS]; // screw_hole([spec], [head], [thread=], [length=|l=], [oversize=], [hole_oversize=], [teardrop=], [head_oversize], [tolerance=], [$slop=], [blunt_start=], [anchor=], [atype=], [orient=], [spin=]) [ATTACHMENTS];
// Description: // Description:
// Create a screw hole mask. See [screw and nut parameters](#section-screw-and-nut-parameters) for details on the parameters that define a screw. // Create a screw hole mask. See [screw and nut parameters](#section-screw-and-nut-parameters) for details on the parameters that define a screw.
// The screw hole can be threaded to receive a screw or it can be an unthreaded clearance hole. // The screw hole can be threaded to receive a screw or it can be an unthreaded clearance hole.
@ -755,7 +766,9 @@ module screw(spec, head, drive, thread, drive_size,
// bevel = if true create bevel at both ends of hole. Default: see below // bevel = if true create bevel at both ends of hole. Default: see below
// bevel1 = if true create bevel at bottom end of hole. Default: false // bevel1 = if true create bevel at bottom end of hole. Default: false
// bevel2 = if true create bevel at top end of hole. Default: true when tolerance="self tap", false otherwise // bevel2 = if true create bevel at top end of hole. Default: true when tolerance="self tap", false otherwise
// higbee = if true and hole is threaded, create blunt start threads at the top of the hole. Default: false // blunt_start = if true and hole is threaded, create blunt start threads. Default: true
// blunt_start1 = if true and hole is threaded, create blunt start threads at bottom end.
// blunt_start2 = if true and hole is threaded, create blunt start threads top end.
// $slop = add extra gap to account for printer overextrusion. Default: 0 // $slop = add extra gap to account for printer overextrusion. Default: 0
// atype = anchor type, one of "screw", "head", "shaft", "threads", "shank" // atype = anchor type, one of "screw", "head", "shaft", "threads", "shank"
// anchor = Translate so anchor point on the shaft is at origin (0,0,0). See [anchor](attachments.scad#subsection-anchor). Default: `CENTER` // anchor = Translate so anchor point on the shaft is at origin (0,0,0). See [anchor](attachments.scad#subsection-anchor). Default: `CENTER`
@ -795,14 +808,20 @@ module screw(spec, head, drive, thread, drive_size,
// cuboid(20) // cuboid(20)
// attach(TOP) // attach(TOP)
// screw_hole("1/4-20,.5",head="flat",counterbore=0,anchor=TOP); // screw_hole("1/4-20,.5",head="flat",counterbore=0,anchor=TOP);
// Example: Threaded hole // Example: Threaded hole, with inward bevel at the base
// diff() // bottom_half()
// cuboid(20) // diff()
// attach(FRONT) // cuboid(20)
// screw_hole("M16,15",anchor=TOP,thread=true); // attach(FRONT)
// screw_hole("M16,15",anchor=TOP,thread=true,bevel1="reverse");
function screw_hole(spec, head, thread, oversize, hole_oversize, head_oversize,
length, l, thread_len, tolerance=undef, counterbore, teardrop=false,
bevel, bevel1, bevel2, blunt_start, blunt_start1, blunt_start2,
atype="screw",anchor=CENTER,spin=0, orient=UP)
= no_function("screw_hole");
module screw_hole(spec, head, thread, oversize, hole_oversize, head_oversize, module screw_hole(spec, head, thread, oversize, hole_oversize, head_oversize,
length, l, thread_len, tolerance=undef, counterbore, teardrop=false, length, l, thread_len, tolerance=undef, counterbore, teardrop=false,
bevel, bevel1, bevel2, higbee=false, bevel, bevel1, bevel2, blunt_start, blunt_start1, blunt_start2,
atype="screw",anchor=CENTER,spin=0, orient=UP) atype="screw",anchor=CENTER,spin=0, orient=UP)
{ {
screwspec = _get_spec(spec, "screw_info", "screw_hole", screwspec = _get_spec(spec, "screw_info", "screw_hole",
@ -821,9 +840,10 @@ module screw_hole(spec, head, thread, oversize, hole_oversize, head_oversize,
head_oversize = first_defined([head_oversize, oversize[1],struct_val(screwspec,"head_oversize")]); head_oversize = first_defined([head_oversize, oversize[1],struct_val(screwspec,"head_oversize")]);
if (threaded || is_def(hole_oversize) || tolerance==0 || tolerance=="none") { if (threaded || is_def(hole_oversize) || tolerance==0 || tolerance=="none") {
default_tag("remove") default_tag("remove")
screw(spec,head=head,thread=thread,shaft_undersize=u_mul(-1,hole_oversize), head_undersize=u_mul(-1,head_oversize), higbee=higbee, screw(spec,head=head,thread=thread,shaft_undersize=u_mul(-1,hole_oversize), head_undersize=u_mul(-1,head_oversize),
blunt_start=blunt_start, blunt_start1=blunt_start1, blunt_start2=blunt_start2,
length=length,l=l,thread_len=thread_len, tolerance=tolerance, _counterbore=counterbore, length=length,l=l,thread_len=thread_len, tolerance=tolerance, _counterbore=counterbore,
bevel=bevel, bevel1=bevel1, bevel2=bevel2, bevel1=bevel1, bevel2=bevel2,
atype=atype, anchor=anchor, spin=spin, orient=orient, _internal=true, _teardrop=teardrop) atype=atype, anchor=anchor, spin=spin, orient=orient, _internal=true, _teardrop=teardrop)
children(); children();
} }
@ -944,7 +964,7 @@ module screw_hole(spec, head, thread, oversize, hole_oversize, head_oversize,
default_tag("remove") default_tag("remove")
screw(spec,head=head,thread=0,shaft_undersize=-hole_oversize, head_undersize=-head_oversize, screw(spec,head=head,thread=0,shaft_undersize=-hole_oversize, head_undersize=-head_oversize,
length=length,l=l,thread_len=thread_len, _counterbore=counterbore, length=length,l=l,thread_len=thread_len, _counterbore=counterbore,
bevel=bevel, bevel1=bevel1, bevel2=bevel2, bevelsize=pitch>0?pitch:undef, higbee=higbee, bevel1=bevel1, bevel2=bevel2, bevelsize=pitch>0?pitch:undef,
atype=atype, anchor=anchor, spin=spin, orient=orient, _internal=true, _teardrop=teardrop) atype=atype, anchor=anchor, spin=spin, orient=orient, _internal=true, _teardrop=teardrop)
children(); children();
} }
@ -1025,8 +1045,13 @@ module screw_hole(spec, head, thread, oversize, hole_oversize, head_oversize,
// shoulder_screw("iso", 16, length=20, head="none"); // shoulder_screw("iso", 16, length=20, head="none");
// Example: Changing head height // Example: Changing head height
// shoulder_screw("iso", 16, length=20, head_size=[24,5]); // shoulder_screw("iso", 16, length=20, head_size=[24,5]);
function shoulder_screw(s,d,length,head, thread_len, tolerance, head_size, drive, drive_size, thread,
undersize, shaft_undersize, head_undersize, shoulder_undersize=0,
blunt_start, blunt_start1, blunt_start2,
atype="screw", anchor=BOT, orient,spin) = no_function("shoulder_screw");
module shoulder_screw(s,d,length,head, thread_len, tolerance, head_size, drive, drive_size, thread, module shoulder_screw(s,d,length,head, thread_len, tolerance, head_size, drive, drive_size, thread,
undersize, shaft_undersize, head_undersize, shoulder_undersize=0, undersize, shaft_undersize, head_undersize, shoulder_undersize=0,
blunt_start, blunt_start1, blunt_start2,
atype="screw", anchor=BOT, orient,spin) atype="screw", anchor=BOT, orient,spin)
{ {
d1= assert(is_num(d) && d>0, "Must specify shoulder diameter") d1= assert(is_num(d) && d>0, "Must specify shoulder diameter")
@ -1121,6 +1146,7 @@ module shoulder_screw(s,d,length,head, thread_len, tolerance, head_size, drive,
screw(struct_set(info, headfields), screw(struct_set(info, headfields),
_shoulder_len = length, _shoulder_diam = shoulder_diam-shoulder_tol, _shoulder_len = length, _shoulder_diam = shoulder_diam-shoulder_tol,
length=thread_len, tolerance=tolerance, shaft_undersize=shaft_undersize, head_undersize=head_undersize, length=thread_len, tolerance=tolerance, shaft_undersize=shaft_undersize, head_undersize=head_undersize,
blunt_start=blunt_start, blunt_start1=blunt_start1, blunt_start2=blunt_start2,
atype=atype, anchor=anchor, orient=orient, spin=spin) atype=atype, anchor=anchor, orient=orient, spin=spin)
children(); children();
} }
@ -1486,9 +1512,9 @@ module screw_head(screw_info,details=false, counterbore=0,flat_height,teardrop=f
// ibevel = if true, bevel the inside (the hole). Default: true // ibevel = if true, bevel the inside (the hole). Default: true
// ibevel1 = if true bevel the inside, bottom end. // ibevel1 = if true bevel the inside, bottom end.
// ibevel2 = if true bevel the inside, top end. // ibevel2 = if true bevel the inside, top end.
// higbee = If true apply higbee thread truncation at both ends, or set to an angle to adjust higbee cut point. Default: false // blunt_start = If true apply truncated blunt start threads at both ends. Default: true
// higbee1 = If true apply higbee thread truncation at bottom end, or set to an angle to adjust higbee cut point. // blunt_start1 = If true apply truncated blunt start threads bottom end.
// higbee2 = If true apply higbee thread truncation at top end, or set to an angle to adjust higbee cut point. // blunt_start2 = If true apply truncated blunt start threads top end.
// tolerance = nut tolerance. Determines actual nut thread geometry based on nominal sizing. See [tolerance](#subsection-tolerance). Default is "2B" for UTS and "6H" for ISO. // tolerance = nut tolerance. Determines actual nut thread geometry based on nominal sizing. See [tolerance](#subsection-tolerance). Default is "2B" for UTS and "6H" for ISO.
// $slop = extra space left to account for printing over-extrusion. Default: 0 // $slop = extra space left to account for printing over-extrusion. Default: 0
// anchor = Translate so anchor point is at origin (0,0,0). See [anchor](attachments.scad#subsection-anchor). Default: `CENTER` // anchor = Translate so anchor point is at origin (0,0,0). See [anchor](attachments.scad#subsection-anchor). Default: `CENTER`
@ -1537,7 +1563,7 @@ function nut(spec, shape, thickness, nutwidth, thread, tolerance, hole_oversize,
bevel,bevel1,bevel2,bevang=15,ibevel,ibevel1,ibevel2, higbee, higbee1, higbee2, anchor=BOTTOM, spin=0, orient=UP, oversize=0) bevel,bevel1,bevel2,bevang=15,ibevel,ibevel1,ibevel2, higbee, higbee1, higbee2, anchor=BOTTOM, spin=0, orient=UP, oversize=0)
= no_function("nut"); = no_function("nut");
module nut(spec, shape, thickness, nutwidth, thread, tolerance, hole_oversize, module nut(spec, shape, thickness, nutwidth, thread, tolerance, hole_oversize,
bevel,bevel1,bevel2,bevang=15,ibevel,ibevel1,ibevel2, higbee, higbee1, higbee2, anchor=BOTTOM, spin=0, orient=UP, oversize=0) bevel,bevel1,bevel2,bevang=15,ibevel,ibevel1,ibevel2,blunt_start, blunt_start1, blunt_start2, anchor=BOTTOM, spin=0, orient=UP, oversize=0)
{ {
dummyA = assert(is_undef(nutwidth) || (is_num(nutwidth) && nutwidth>0)); dummyA = assert(is_undef(nutwidth) || (is_num(nutwidth) && nutwidth>0));
@ -1565,11 +1591,15 @@ module nut(spec, shape, thickness, nutwidth, thread, tolerance, hole_oversize,
shape=shape, shape=shape,
bevel=bevel,bevel1=bevel1,bevel2=bevel2,bevang=bevang, bevel=bevel,bevel1=bevel1,bevel2=bevel2,bevang=bevang,
ibevel=ibevel,ibevel1=ibevel1,ibevel2=ibevel2, ibevel=ibevel,ibevel1=ibevel1,ibevel2=ibevel2,
higbee=higbee, higbee1=higbee1, higbee2=higbee2, blunt_start=blunt_start, blunt_start1=blunt_start1, blunt_start2=blunt_start2,
anchor=anchor,spin=spin,orient=orient) children(); anchor=anchor,spin=spin,orient=orient) children();
} }
// Module: nut_trap_side() // Module: nut_trap_side()
// Usage: // Usage:
// nut_trap_side(trap_width, [spec], [shape], [thickness], [nutwidth=], [poke_len=], [poke_diam=], [$slop=], [anchor=], [orient=], [spin=]) [ATTACHMENTS]; // nut_trap_side(trap_width, [spec], [shape], [thickness], [nutwidth=], [poke_len=], [poke_diam=], [$slop=], [anchor=], [orient=], [spin=]) [ATTACHMENTS];

250
skin.scad
View file

@ -1053,132 +1053,140 @@ module rotate_sweep(
// Takes a closed 2D polygon path, centered on the XY plane, and sweeps/extrudes it along a 3D spiral path // Takes a closed 2D polygon path, centered on the XY plane, and sweeps/extrudes it along a 3D spiral path
// of a given radius, height and degrees of rotation. The origin in the profile traces out the helix of the specified radius. // of a given radius, height and degrees of rotation. The origin in the profile traces out the helix of the specified radius.
// If turns is positive the path will be right-handed; if turns is negative the path will be left-handed. // If turns is positive the path will be right-handed; if turns is negative the path will be left-handed.
// Such an extrusion can be used to make screw threads.
// . // .
// The taper options specify tapering at of the ends of the extrusion, and are given as the linear distance // The lead_in options specify a lead-in setiton where the ends of the spiral scale down to avoid a sharp cut face at the ends.
// over which to taper. If taper is positive the extrusion lengthened by the specified distance; if taper // You can specify the length of this scaling directly with the lead_in parameters or as an angle using the lead_in_ang parameters.
// is negative, the taper is included in the extrusion length specified by `turns`. // If you give a positive value, the extrusion is lengthenend by the specified distance or angle; if you give a negative
// value then the scaled end is included in the extrusion length specified by `turns`. If the value is zero then no scaled ends
// are produced. The shape of the scaled ends can be controlled with the lead_in_shape parameter. Supported options are "sqrt", "linear"
// "smooth" and "cut".
// .
// The inside argument changes how the extrusion lead-in sections are formed. If it is true then they scale
// towards the outside, like would be needed for internal threading. If internal is fale then the lead-in sections scale
// towards the inside, like would be appropriate for external threads.
// Arguments: // Arguments:
// poly = Array of points of a polygon path, to be extruded. // poly = Array of points of a polygon path, to be extruded.
// h = height of the spiral to extrude along. // h = height of the spiral extrusion path
// r = Radius of the spiral to extrude along. // r = Radius of the spiral extrusion path
// turns = number of revolutions to spiral up along the height. // turns = number of revolutions to include in the spiral
// --- // ---
// d = Diameter of the spiral to extrude along. // d = Diameter of the spiral extrusion path.
// d1/r1 = Bottom inside diameter or radius of spiral to extrude along. // d1/r1 = Bottom inside diameter or radius of spiral to extrude along.
// d2/r2 = Top inside diameter or radius of spiral to extrude along. // d2/r2 = Top inside diameter or radius of spiral to extrude along.
// taper = Length of tapers for thread ends. Positive to add taper to threads, negative to taper within specified length. Default: 0 // lead_in = Specify linear length of the lead-in scaled section of the spiral. Default: 0
// taper1 = Length of taper for bottom thread end // lead_in1 = Specify linear length of the lead-in scaled section of the spiral at the bottom
// taper2 = Length of taper for top thread end // lead_in2 = Specify linear length of the lead-in scaled section of the spiral at the top
// internal = if true make internal threads. The only effect this has is to change how the extrusion tapers if tapering is selected. When true, the extrusion tapers towards the outside; when false, it tapers towards the inside. Default: false // lead_in_ang = Specify angular length of the lead-in scaled section of the spiral
// lead_in_ang1 = Specify angular length of the lead-in scaled section of the spiral at the bottom
// lead_in_ang2 = Specify angular length of the lead-in scaled section of the spiral at the top
// lead_in_shape = Specify the shape of the thread lead in by giving a text string or function. Default: "sqrt"
// lead_in_shape1 = Specify the shape of the thread lead-in at the bottom by giving a text string or function.
// lead_in_shape2 = Specify the shape of the thread lead-in at the top by giving a text string or function.
// lead_in_sample = Factor to increase sample rate in the lead-in section. Default: 10
// internal = if true make internal threads. The only effect this has is to change how the extrusion lead-in section are formed. When true, the extrusion scales towards the outside; when false, it scales towards the inside. Default: false
// anchor = Translate so anchor point is at origin (0,0,0). See [anchor](attachments.scad#subsection-anchor). Default: `CENTER` // anchor = Translate so anchor point is at origin (0,0,0). See [anchor](attachments.scad#subsection-anchor). Default: `CENTER`
// spin = Rotate this many degrees around the Z axis after anchor. See [spin](attachments.scad#subsection-spin). Default: `0` // spin = Rotate this many degrees around the Z axis after anchor. See [spin](attachments.scad#subsection-spin). Default: `0`
// orient = Vector to rotate top towards, after spin. See [orient](attachments.scad#subsection-orient). Default: `UP` // orient = Vector to rotate top towards, after spin. See [orient](attachments.scad#subsection-orient). Default: `UP`
// center = If given, overrides `anchor`. A true value sets `anchor=CENTER`, false sets `anchor=BOTTOM`. // See Also: sweep(), linear_sweep(), rotate_sweep(), path_sweep(), thread_helix()
// See Also: sweep(), linear_sweep(), rotate_sweep(), path_sweep()
// Example: // Example:
// poly = [[-10,0], [-3,-5], [3,-5], [10,0], [0,-30]]; // poly = [[-10,0], [-3,-5], [3,-5], [10,0], [0,-30]];
// spiral_sweep(poly, h=200, r=50, turns=3, $fn=36); // spiral_sweep(poly, h=200, r=50, turns=3, $fn=36);
function _taperfunc_orig_1d(x,L) = _leadin_ogive=function (x,L)
x>1 ? 1 : x<0 ? 0: let( minscale = .05,
let(
higofs = pow(0.05,2) // Smallest hig scale is the square root of this value
)
sqrt((1-higofs)*x+higofs);
function _taperfunc_orig(x,L) =
let(s=_taperfunc_orig_1d(x))
x>1 ? [1,1]
: x<0 ? [0,0]
: [lerp(s,1,.25),s];
function _taperfunc_ellipse(x) =
sqrt(1-(1-x)^2);
function _taperfunc_linear(x) =
x>1 ? 1 : x<0 ? 0 : x;
function _taperfunc_ogive_width(x,L) =
let( minscale = .2,
r=(L^2+(1-minscale^2))/2/(1-minscale), r=(L^2+(1-minscale^2))/2/(1-minscale),
scale = sqrt(r^2-(L*(1-x))^2) -(r-1) scale = sqrt(r^2-(L*(1-x))^2) -(r-1)
) )
x>1 ? [1,1] x>1 ? [1,1]
: x<0 ? [0,0] : x<0 ? [lerp(minscale,1,.25),0]
: [scale,1]; : [lerp(scale,1,.25),scale];
function _taperfunc_ogive_width_circle(x,L,h) =
let( minscale = .2, _leadin_cut = function(x,L) x>0 ? [1,1] : [1,0];
r=(L^2+(1-minscale^2))/2/(1-minscale),
scale = sqrt(r^2-(L*(1-x))^2) -(r-1), _leadin_sqrt = function(x,L)
vscale = x*L>h ? h : sqrt(h^2-(x*L-h)^2) let(end=0.05) // Smallest scale at the end
)
x>1 ? [1,1] x>1 ? [1,1]
: x<0.02 ? [0,0] : x<0 ? [lerp(end,1,.25),0]
: [scale,vscale/h]; : let(
function _taperfunc_ogive_height(x,L) = s = sqrt(x + end^2 * (1-x))
let( minscale = .1,L=3*L,
r=(L^2+(1-minscale^2))/2/(1-minscale),
scale = sqrt(r^2-(L*(1-x))^2) -(r-1)
) )
[lerp(s,1,.25),s]; // thread width scale, thread height scale
_leadin_linear = function(x,L)
let(minscale=.1)
x>1 ? [1,1] x>1 ? [1,1]
: x<0 ? [0,0] //minscale,0] : x<0 ? [lerp(minscale,1,.25),0]
: [1,scale]; : let(scale = lerp(minscale,1,x))
function _taperfunc_ogive(x,L) = [lerp(scale,1,.25),scale];
let( minscale = .3,
r=(L^2+(1-minscale^2))/2/(1-minscale),
scale = sqrt(r^2-(L*(1-x))^2) -(r-1)
)
x>1 ? [1,1]
: x<0 ? [0,0]
: [scale,scale];
function _taperfunc_ogive_orig(x,L) =
let( minscale = .3,
r=(L^2+(1-minscale^2))/2/(1-minscale),
scale = sqrt(r^2-(L*(1-x))^2) -(r-1)
)
x>1 ? [1,1]
: x<0 ? [0,0]
: [lerp(_taperfunc_orig_1d(x),1,.25),scale];
function _taperfunc_cut(x,L) = x>1 ? [1,1] : [0,0];
function _taperfunc(x,L,h) = _taperfunc_ogive_width_circle(x,L,h);
//function _taperfunc(x,L,h) = _taperfunc_orig(x,L);
//function _taperfunc(x,L,h) = _taperfunc_ogive_width(x,L);
function _taperfunc(x,L,h) = _taperfunc_orig(x,L);
_lead_in_table = [
["default", _leadin_sqrt],
["sqrt", _leadin_sqrt],
["cut", _leadin_cut],
["smooth", _leadin_ogive],
["linear", _leadin_linear]
];
function _ss_polygon_r(N,theta) = function _ss_polygon_r(N,theta) =
let( alpha = 360/N ) let( alpha = 360/N )
cos(alpha/2)/(cos(posmod(theta,alpha)-alpha/2)); cos(alpha/2)/(cos(posmod(theta,alpha)-alpha/2));
function spiral_sweep(poly, h, r, turns=1, taper, center, r1, r2, d, d1, d2, taper1, taper2, internal=false, anchor=CENTER, spin=0, orient=UP) = function spiral_sweep(poly, h, r, turns=1, taper, r1, r2, d, d1, d2, internal=false,
lead_in_shape,lead_in_shape1, lead_in_shape2,
lead_in, lead_in1, lead_in2,
lead_in_ang, lead_in_ang1, lead_in_ang2,
height,l,length,
lead_in_sample = 10,
anchor=CENTER, spin=0, orient=UP) =
assert(is_num(turns) && turns != 0, "turns must be a nonzero number") assert(is_num(turns) && turns != 0, "turns must be a nonzero number")
assert(all_positive([h]), "Spiral height must be a positive number") assert(all_positive([h]), "Spiral height must be a positive number")
let( let(
tapersample = 10, // Oversample factor for higbee tapering
dir = sign(turns), dir = sign(turns),
r1 = get_radius(r1=r1, r=r, d1=d1, d=d, dflt=50), r1 = get_radius(r1=r1, r=r, d1=d1, d=d),
r2 = get_radius(r1=r2, r=r, d1=d2, d=d, dflt=50), r2 = get_radius(r1=r2, r=r, d1=d2, d=d),
bounds = pointlist_bounds(poly), bounds = pointlist_bounds(poly),
yctr = (bounds[0].y+bounds[1].y)/2, yctr = (bounds[0].y+bounds[1].y)/2,
xmin = bounds[0].x, xmin = bounds[0].x,
xmax = bounds[1].x, xmax = bounds[1].x,
poly = path3d(clockwise_polygon(poly)), poly = path3d(clockwise_polygon(poly)),
anchor = get_anchor(anchor,center,BOT,BOT),
sides = segs(max(r1,r2)), sides = segs(max(r1,r2)),
ang_step = 360/sides, ang_step = 360/sides,
turns = abs(turns), turns = abs(turns),
taper1 = first_defined([taper1, taper, 0]), lead_in1 = first_defined([lead_in1, lead_in]),
taper2 = first_defined([taper2, taper, 0]), lead_in2 = first_defined([lead_in1, lead_in]),
taperang1 = 360 * abs(taper1) / (2 * r1 * PI), lead_in_ang1 =
taperang2 = 360 * abs(taper2) / (2 * r2 * PI), let(
minang = taper1<=0 ? 0 : -taperang1, user_ang = first_defined([lead_in_ang1,lead_in_ang])
tapercut1 = taper1<=0 ? taperang1 : 0, )
maxang = taper2<=0 ? 360*turns : 360*turns+taperang2, assert(is_undef(user_ang) || is_undef(lead_in1), "Cannot define lead_in/lead_in1 by both length and angle")
tapercut2 = taper2<=0 ? 360*turns-taperang2 : 360*turns is_def(user_ang) ? user_ang : default(lead_in1,0)*360/(2*PI*r1),
lead_in_ang2 =
let(
user_ang = first_defined([lead_in_ang2,lead_in_ang])
)
assert(is_undef(user_ang) || is_undef(lead_in2), "Cannot define lead_in/lead_in2 by both length and angle")
is_def(user_ang) ? user_ang : default(lead_in2,0)*360/(2*PI*r2),
minang = -max(0,lead_in_ang1),
maxang = 360*turns + max(0,lead_in_ang2),
cut_ang1 = minang+abs(lead_in_ang1),
cut_ang2 = maxang-abs(lead_in_ang1),
lead_in_shape1 = first_defined([lead_in_shape1, lead_in_shape, "default"]),
lead_in_shape2 = first_defined([lead_in_shape2, lead_in_shape, "default"]),
lead_in_func1 = is_func(lead_in_shape1) ? lead_in_shape1
: assert(is_string(lead_in_shape1),"lead_in_shape/lead_in_shape1 must be a function or string")
let(ind = search([lead_in_shape1], _lead_in_table,0)[0])
assert(ind!=[],str("Unknown lead_in_shape, \"",lead_in_shape1,"\""))
_lead_in_table[ind[0]][1],
lead_in_func2 = is_func(lead_in_shape2) ? lead_in_shape2
: assert(is_string(lead_in_shape2),"lead_in_shape/lead_in_shape2 must be a function or string")
let(ind = search([lead_in_shape2], _lead_in_table,0)[0])
assert(ind!=[],str("Unknown lead_in_shape, \"",lead_in_shape2,"\""))
_lead_in_table[ind[0]][1]
) )
assert( tapercut1<tapercut2 && tapercut1<maxang, "Tapers are too long to fit") assert( cut_ang1<cut_ang2, "Tapers are too long to fit")
assert( all_positive([r1,r2]), "Diameter/radius must be positive") assert( all_positive([r1,r2]), "Diameter/radius must be positive")
let( let(
// This complicated sampling scheme is designed to ensure that faceting always starts at angle zero // This complicated sampling scheme is designed to ensure that faceting always starts at angle zero
// for alignment with cylinders, and there is always a facet boundary at the $fn specified locations, // for alignment with cylinders, and there is always a facet boundary at the $fn specified locations,
// regardless of what kind of subsampling occurs for tapers. // regardless of what kind of subsampling occurs for tapers.
@ -1189,17 +1197,17 @@ function spiral_sweep(poly, h, r, turns=1, taper, center, r1, r2, d, d1, d2, tap
maxang maxang
], ],
anglist = [ anglist = [
for(a=orig_anglist) if (a<tapercut1-EPSILON) a, for(a=orig_anglist) if (a<cut_ang1-EPSILON) a,
tapercut1, cut_ang1,
for(a=orig_anglist) if (a>tapercut1+EPSILON && a<tapercut2-EPSILON) a, for(a=orig_anglist) if (a>cut_ang1+EPSILON && a<cut_ang2-EPSILON) a,
tapercut2, cut_ang2,
for(a=orig_anglist) if (a>tapercut2+EPSILON) a for(a=orig_anglist) if (a>cut_ang2+EPSILON) a
], ],
interp_ang = [ interp_ang = [
for(i=idx(anglist,e=-2)) for(i=idx(anglist,e=-2))
each lerpn(anglist[i],anglist[i+1], each lerpn(anglist[i],anglist[i+1],
(taper1!=0 && anglist[i+1]<=tapercut1) || (taper2!=0 && anglist[i]>=tapercut2) (lead_in_ang1!=0 && anglist[i+1]<=cut_ang1) || (lead_in_ang2!=0 && anglist[i]>=cut_ang2)
? ceil((anglist[i+1]-anglist[i])/ang_step*tapersample) ? ceil((anglist[i+1]-anglist[i])/ang_step*lead_in_sample)
: 1, : 1,
endpoint=false), endpoint=false),
last(anglist) last(anglist)
@ -1207,8 +1215,8 @@ function spiral_sweep(poly, h, r, turns=1, taper, center, r1, r2, d, d1, d2, tap
skewmat = affine3d_skew_xz(xa=atan2(r2-r1,h)), skewmat = affine3d_skew_xz(xa=atan2(r2-r1,h)),
points = [ points = [
for (a = interp_ang) let ( for (a = interp_ang) let (
hsc = a<tapercut1 ? _taperfunc((a-minang)/taperang1,abs(taper1),xmax-xmin) hsc = a<cut_ang1 ? lead_in_func1((a-minang)/abs(lead_in_ang1),abs(lead_in_ang1)*2*PI*r1/360)
: a>tapercut2 ? _taperfunc((maxang-a)/taperang2,abs(taper2),xmax-xmin) : a>cut_ang2 ? lead_in_func2((maxang-a)/abs(lead_in_ang2),abs(lead_in_ang2)*2*PI*r2/360)
: [1,1], : [1,1],
u = a/(360*turns), u = a/(360*turns),
r = lerp(r1,r2,u), r = lerp(r1,r2,u),
@ -1230,15 +1238,30 @@ function spiral_sweep(poly, h, r, turns=1, taper, center, r1, r2, d, d1, d2, tap
module spiral_sweep(poly, h, r, turns=1, taper, center, r1, r2, d, d1, d2, taper1, taper2, internal=false, anchor=CENTER, spin=0, orient=UP) { module spiral_sweep(poly, h, r, turns=1, taper, r1, r2, d, d1, d2, internal=false,
vnf = spiral_sweep(poly, h, r, turns, taper, center, r1, r2, d, d1, d2, taper1, taper2, internal); lead_in_shape,lead_in_shape1, lead_in_shape2,
r1 = get_radius(r1=r1, r=r, d1=d1, d=d, dflt=50); lead_in, lead_in1, lead_in2,
r2 = get_radius(r1=r2, r=r, d1=d2, d=d, dflt=50); lead_in_ang, lead_in_ang1, lead_in_ang2,
taper1 = first_defined([taper1,taper,0]); height,l,length,
taper2 = first_defined([taper2,taper,0]); lead_in_sample=10,
extra = PI/2*(max(0,taper1/r1)+max(0,taper2/r2)); anchor=CENTER, spin=0, orient=UP)
{
vnf = spiral_sweep(poly=poly, h=h, r=r, turns=turns, r1=r1, r2=r2, d=d, d1=d1, d2=d2, internal=internal,
lead_in_shape=lead_in_shape,lead_in_shape1=lead_in_shape1, lead_in_shape2=lead_in_shape2,
lead_in=lead_in, lead_in1=lead_in1, lead_in2=lead_in2,
lead_in_ang=lead_in_ang, lead_in_ang1=lead_in_ang1, lead_in_ang2=lead_in_ang2,
height=height,l=length,length=length,
lead_in_sample=lead_in_sample);
h = one_defined([h,height,length,l],"h,height,length,l");
r1 = get_radius(r1=r1, r=r, d1=d1, d=d);
r2 = get_radius(r1=r2, r=r, d1=d2, d=d);
lead_in1 = u_mul(first_defined([lead_in1,lead_in]),1/(2*PI*r1));
lead_in2 = u_mul(first_defined([lead_in2,lead_in]),1/(2*PI*r2));
lead_in_ang1 = first_defined([lead_in_ang1,lead_in_ang]);
lead_in_ang2 = first_defined([lead_in_ang2,lead_in_ang]);
extra_turns = max(0,first_defined([lead_in1,lead_in_ang1,0]))+max(0,first_defined([lead_in2,lead_in_ang2,0]));
attachable(anchor,spin,orient, r1=r1, r2=r2, l=h) { attachable(anchor,spin,orient, r1=r1, r2=r2, l=h) {
vnf_polyhedron(vnf, convexity=ceil(2*(abs(turns)+extra))); vnf_polyhedron(vnf, convexity=ceil(2*(abs(turns)+extra_turns)));
children(); children();
} }
} }
@ -1796,7 +1819,22 @@ function path_sweep(shape, path, method="incremental", normal, closed, twist=0,
) )
assert(approx(ynormal*znormal,0),str("Supplied normal is parallel to the path tangent at point ",i)) assert(approx(ynormal*znormal,0),str("Supplied normal is parallel to the path tangent at point ",i))
translate(path[i%L])*rotation*zrot(-twist*tpathfrac[i]) translate(path[i%L])*rotation*zrot(-twist*tpathfrac[i])
] ]
: method=="cross"?
let(
crossnormal_mid = [for(i=[(closed?0:1):L-(closed?1:2)])
let(v= cross( select(path,i+1)-path[i], path[i]-select(path,i-1)),
f=assert(norm(v)>EPSILON)
)
v
],
crossnormal = closed ? crossnormal_mid : [crossnormal_mid[0], each crossnormal_mid, last(crossnormal_mid)]
)
[for(i=[0:L-(closed?0:1)]) let(
rotation = frame_map(x=crossnormal[i%L], z=tangents[i%L])
)
translate(path[i%L])*rotation*zrot(-twist*tpathfrac[i])
]
: method=="natural" ? // map x axis of shape to the path normal, which points in direction of curvature : method=="natural" ? // map x axis of shape to the path normal, which points in direction of curvature
let (pathnormal = path_normals(path, tangents, closed)) let (pathnormal = path_normals(path, tangents, closed))
assert(all_defined(pathnormal),"Natural normal vanishes on your curve, select a different method") assert(all_defined(pathnormal),"Natural normal vanishes on your curve, select a different method")

File diff suppressed because it is too large Load diff