Merge branch 'pulley_colour' of https://github.com/martinbudden/NopSCADlib into martinbudden-pulley_colour

This commit is contained in:
Chris Palmer 2021-01-26 17:10:58 +00:00
commit 2a1fa3fe6b

View File

@ -53,7 +53,7 @@ function pulley_extent(type) = max(pulley_flange_dia(type), pulley_hub_dia(type)
T_angle = 40; T_angle = 40;
GT_r = 0.555; GT_r = 0.555;
module pulley(type) { //! Draw a pulley module pulley(type, colour = silver) { //! Draw a pulley
teeth = pulley_teeth(type); teeth = pulley_teeth(type);
od = pulley_od(type); od = pulley_od(type);
@ -117,7 +117,7 @@ module pulley(type) { //! Draw a pulley
rotate([-90, 0, i * -90]) rotate([-90, 0, i * -90])
cylinder(r = screw_radius(pulley_screw(type)), h = 100); cylinder(r = screw_radius(pulley_screw(type)), h = 100);
color(silver) { color(colour) {
if(screw_z && screw_z < hl) if(screw_z && screw_z < hl)
render() render()
difference() { difference() {
@ -140,9 +140,9 @@ module pulley(type) { //! Draw a pulley
} }
} }
module pulley_assembly(type) { //! Draw a pulley with its grub screws in place module pulley_assembly(type, colour = silver) { //! Draw a pulley with its grub screws in place
translate_z(pulley_offset(type)) { translate_z(pulley_offset(type)) {
pulley(type); pulley(type, colour);
if(pulley_screws(type)) if(pulley_screws(type))
translate_z(pulley_screw_z(type)) translate_z(pulley_screw_z(type))