Compare commits
No commits in common. "c3cat-bottle-tag" and "trunk" have entirely different histories.
c3cat-bott
...
trunk
|
@ -150,13 +150,8 @@ module bottle_clip(ru=13, rl=17.5, ht=26, width=2.5, name="c3cat", font="write/o
|
|||
if (RENDER_COLOR_ONE) {
|
||||
color("black") difference() {
|
||||
cylinder(r1=rl+width, r2=ru+width, h=ht);
|
||||
difference() {
|
||||
union() {
|
||||
name(name=name, font=font, rl=rl, ht=ht, ru=ru);
|
||||
logo(logo=logo, rl=rl, ht=ht, ru=ru, width=width);
|
||||
}
|
||||
cylinder(r1=rl+width/2, r2=ru+width/2, h=ht);
|
||||
}
|
||||
name(name=name, font=font, rl=rl, ht=ht, ru=ru);
|
||||
logo(logo=logo, rl=rl, ht=ht, ru=ru, width=width);
|
||||
translate([0,0,-1])
|
||||
cylinder(r1=rl, r2=ru, h=ht+2);
|
||||
// finally, substract a cube as a gap so we can clip it to the bottle
|
||||
|
@ -169,7 +164,7 @@ module bottle_clip(ru=13, rl=17.5, ht=26, width=2.5, name="c3cat", font="write/o
|
|||
if (RENDER_COLOR_TWO) {
|
||||
color("orange") difference() {
|
||||
name(name=name, font=font, rl=rl, ht=ht, ru=ru);
|
||||
cylinder(r1=rl+width/2, r2=ru+width/2, h=ht);
|
||||
cylinder(r1=rl+width, r2=ru+width, h=ht);
|
||||
outer_cutoff(rl, e, ru, ht, width);
|
||||
}
|
||||
}
|
||||
|
@ -177,7 +172,7 @@ module bottle_clip(ru=13, rl=17.5, ht=26, width=2.5, name="c3cat", font="write/o
|
|||
if (RENDER_COLOR_THREE) {
|
||||
color("yellow") difference() {
|
||||
logo(logo=logo, rl=rl, ht=ht, ru=ru, width=2*width);
|
||||
cylinder(r1=rl+width/2, r2=ru+width/2, h=ht);
|
||||
cylinder(r1=rl+width, r2=ru+width, h=ht);
|
||||
outer_cutoff(rl, e, ru, ht, width);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue