Code cleaning + add ears to the bottle clip! #22

Open
ajabep wants to merge 23 commits from ajabep/scad:trunk into trunk
Showing only changes of commit b342b09dab - Show all commits

Fix indent, some typo, and all of that

Ajabep 2026-01-09 20:31:34 +01:00

View file

@ -33,8 +33,8 @@ $fn = 360;
NAME = "c3cat"; NAME = "c3cat";
LOGO_FILE = ""; // empty string is catear model LOGO_FILE = ""; // empty string is catear model
RENDER_COLOR_ONE = true; RENDER_COLOR_ONE = true;
RENDER_COLOR_TWO = true; RENDER_COLOR_TEXT = true;
RENDER_COLOR_THREE = true; RENDER_COLOR_LOGO = true;
USE_TINY_EARS = true; USE_TINY_EARS = true;
/** /**
@ -61,9 +61,18 @@ USE_TINY_EARS = true;
*/ */
scale([0.2, 0.2, 0.2]) { scale([0.2, 0.2, 0.2]) {
difference() { difference() {
scale([5, 5, 5]) rotate(45, [0, 0, 1]) bottle_clip(name=NAME); scale([5, 5, 5])
translate([ 15*5, 0*5, 18*5]) rotate(80, [0, 1, 0]) catear(); rotate(45, [0, 0, 1])
translate([-15*5, 0*5, 18*5]) rotate(-80, [0, 1, 0]) catear(); bottle_clip(
name=NAME);
translate([ 15*5, 0*5, 18*5])
rotate(-80, [0, 1, 0])
catear();
translate([-15*5, 0*5, 18*5])
rotate(-80, [0, 1, 0])
catear();
} }
if (RENDER_COLOR_TWO) { if (RENDER_COLOR_TWO) {
color("orange") color("orange")
@ -91,13 +100,13 @@ module name(name, font, rl, ht, ru) {
} }
module logo(logo, rl, ht, ru, width) { module logo(logo, rl, ht, ru, width) {
echo("logo: ", logo); echo(logo=logo);
if(logo == "") { if(logo == "") {
ear_size=ht; ear_size=ht;
echo("ht: ", ht); echo(ht=ht);
echo("ru: ", ru); echo(ru=ru);
echo("rl: ", rl); echo(rl=rl);
echo("width: ", width); echo(width=width);
translate([0, -max(ru,rl), ht*3/4+.5]) translate([0, -max(ru,rl), ht*3/4+.5])
rotate([90, 0, 0]) rotate([90, 0, 0])
scale([1, 1, 1]) scale([1, 1, 1])
@ -159,7 +168,7 @@ module bottle_clip(ru=13, rl=17.5, ht=26, width=2.5, name="c3cat", font="write/o
} }
translate([0, 0, -1]) translate([0, 0, -1])
cylinder(r1=rl, r2=ru, h=ht+2); cylinder(r1=rl, r2=ru, h=ht+2);
// finally, substract a cube as a gap so we can clip it to the bottle // finally, subtract a cube as a gap so we can clip it to the bottle
rotate([0, 0, 45]) rotate([0, 0, 45])
translate([0, 0, -1]) translate([0, 0, -1])
cube([50, 50, 50]); cube([50, 50, 50]);
@ -185,7 +194,7 @@ module bottle_clip(ru=13, rl=17.5, ht=26, width=2.5, name="c3cat", font="write/o
} }
module outer_cutoff(rl, e, ru, ht, width) { module outer_cutoff(rl, e, ru, ht, width) {
// outer cylinder which is substracted, so the text and the logo end // outer cylinder which is subtracted, so the text and the logo end
// somewhere on the outside ;-) // somewhere on the outside ;-)
difference () { difference () {
cylinder(r1=rl+e, r2=ru+e, h=ht); cylinder(r1=rl+e, r2=ru+e, h=ht);