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

Rewrote PCO* parts to use arcleft/arcright turtle commands. Removed turtle_arc()

Browse source
This commit is contained in:
Revar Desmera 2019-08-31 23:44:24 -07:00
parent 207721012f
commit bd19e12096
2 changed files with 12 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
shapes2d.scad
View file

@ -878,36 +878,5 @@ function _turtle_command(command, parm, parm2, state, index) =
[];
// Function: turtle_arc(d,r,ang);
// Usage:
// arccmds = turtle_arc(d|r, ang);
// Description:
// Generates a list of `turtle()` commands to make an arc path.
// Arguments:
// r = The radius of the arc.
// d = The diameter of the arc.
// ang = The total angle to arc. Negative is clockwise.
// n = If given, the number of segments.
// Examples:
// stroke(turtle(turtle_arc(d=100,arc=120)));
// stroke(turtle(turtle_arc(d=100,arc=-45)));
// stroke(turtle(concat(["move", 100], turtle_arc(d=100,arc=120), ["move", 100])));
// stroke(turtle(["move", 100, "repeat", 1, turtle_arc(d=100,arc=120), "move", 100])));
function turtle_arc(d,r,ang,n) =
let(
r = get_radius(r=r, d=d, dflt=1),
n = max(2,default(n,ceil(segs(r)*abs(ang)/360))),
stepang = ang/n
) echo(n=n) concat(
[
for(i=[0:1:n-1]) each [
stepang<0? "right" : "left", abs(stepang) * (i? 1 : 0.5),
"move", abs(2*r*sin(stepang/2)),
]
],
[stepang<0? "right" : "left", abs(stepang) * 0.5]
);
// vim: noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 nowrap

24
threading.scad
View file

@ -963,11 +963,11 @@ module pco1810_neck(wall=2, anchor="support-ring", spin=0, orient=UP)
"untilx", neck_d/2,
"left", 90,
"move", neck_h - 1,
"repeat", 1, turtle_arc(r=1, ang=-90), // Support ring base.
"arcright", 1, 90,
"untilx", support_d/2-support_rad,
"repeat", 1, turtle_arc(r=support_rad, ang=90),
"arcleft", support_rad, 90,
"move", support_width,
"repeat", 1, turtle_arc(r=support_rad, ang=90-support_ang),
"arcleft", support_rad, 90-support_ang,
"untilx", tamper_base_d/2,
"right", 90-support_ang,
"untily", h-tamper_base_h, // Tamper ring holder base.
@ -975,11 +975,11 @@ module pco1810_neck(wall=2, anchor="support-ring", spin=0, orient=UP)
"untilx", tamper_ring_d/2,
"left", 90,
"move", tamper_ring_width,
"repeat", 1, turtle_arc(r=tamper_ring_r, ang=90),
"arcleft", tamper_ring_r, 90,
"untilx", threadbase_d/2,
"right", 90,
"untily", h-lip_h-lip_leadin_r, // Lip base.
"repeat", 1, turtle_arc(r=lip_leadin_r, ang=-90),
"arcright", lip_leadin_r, 90,
"untilx", lip_d/2,
"left", 90,
"untily", h-lip_recess_h,
@ -987,7 +987,7 @@ module pco1810_neck(wall=2, anchor="support-ring", spin=0, orient=UP)
"untilx", lip_recess_d/2,
"right", 90,
"untily", h-lip_roundover_r,
"repeat", 1, turtle_arc(r=lip_roundover_r, ang=90),
"arcleft", lip_roundover_r, 90,
"untilx", inner_d/2
]
));
@ -1135,13 +1135,13 @@ module pco1881_neck(wall=2, anchor="support-ring", spin=0, orient=UP)
"untilx", neck_d/2,
"left", 90,
"move", neck_h - 1,
"repeat", 1, turtle_arc(r=1, ang=-90), // Support ring base.
"arcright", 1, 90,
"untilx", support_d/2-support_rad,
"repeat", 1, turtle_arc(r=support_rad, ang=90),
"arcleft", support_rad, 90,
"move", support_width,
"repeat", 1, turtle_arc(r=support_rad, ang=90-support_ang),
"arcleft", support_rad, 90-support_ang,
"untilx", tamper_base_d/2,
"repeat", 1, turtle_arc(r=tamper_divot_r, ang=support_ang*2-180),
"arcright", tamper_divot_r, 180-support_ang*2,
"left", 90-support_ang,
"untily", h-tamper_base_h, // Tamper ring holder base.
"right", 90,
@ -1152,7 +1152,7 @@ module pco1881_neck(wall=2, anchor="support-ring", spin=0, orient=UP)
"untilx", threadbase_d/2,
"right", tamper_ring_ang,
"untily", h-lip_h-lip_leadin_r, // Lip base.
"repeat", 1, turtle_arc(r=lip_leadin_r, ang=-90),
"arcright", lip_leadin_r, 90,
"untilx", lip_d/2,
"left", 90,
"untily", h-lip_recess_h,
@ -1160,7 +1160,7 @@ module pco1881_neck(wall=2, anchor="support-ring", spin=0, orient=UP)
"untilx", lip_recess_d/2,
"right", 90,
"untily", h-lip_roundover_r,
"repeat", 1, turtle_arc(r=lip_roundover_r, ang=90),
"arcleft", lip_roundover_r, 90,
"untilx", inner_d/2
]
));