diff --git a/c3cat-bottle-clip/c3cat-bottle-clip.scad b/c3cat-bottle-clip/c3cat-bottle-clip.scad index 3c42e6f..e922c2c 100644 --- a/c3cat-bottle-clip/c3cat-bottle-clip.scad +++ b/c3cat-bottle-clip/c3cat-bottle-clip.scad @@ -25,17 +25,14 @@ * licensing terms. */ -include -use - -$fn = 360; - NAME = "c3cat"; -LOGO_FILE = ""; // empty string is catear model -RENDER_COLOR_ONE = true; -RENDER_COLOR_TWO = true; -RENDER_COLOR_THREE = true; -USE_TINY_EARS = true; +RENDER_COLOR_1 = true; // used for clip body +RENDER_COLOR_2 = true; // used for logo and one small ear +RENDER_COLOR_3 = true; // used for name and other small ear +SMALL_EARS = true; +$fn=360; + +include /** * Creates one instance of a bottle clip name tag. The default values are @@ -62,59 +59,48 @@ USE_TINY_EARS = true; scale([0.2, 0.2, 0.2]) { difference() { scale([5, 5, 5]) rotate(45, [0, 0, 1]) 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 (SMALL_EARS) { + 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) { - color("orange") - translate([ 15*5, 0*5, 18*5]) - rotate(80, [0, 1, 0]) - catear(); - } - if (RENDER_COLOR_THREE) { - color("yellow") - translate([-15*5, 0*5, 18*5]) - rotate(-80, [0, 1, 0]) - catear(); + + if (SMALL_EARS) { + if (RENDER_COLOR_2) {translate([0, 5*5, 0]) catear();} + if (RENDER_COLOR_3) {rotate(180) translate([0, 5*5, 0]) catear();} } } -module name(name, font, rl, ht, ru) { - writecylinder( - text=name, - where=[0,0,0], - radius=rl+0.5, - height=ht/13*7, - h=ht/13*4, - t=max(rl,ru), - font=font); -} +module bottle_clip(ru=13, rl=17.5, ht=26, width=2.5, name="c3cat", font="write/orbitron.dxf", logo="") { -module logo(logo, rl, ht, ru, width) { - echo("logo: ", logo); - if(logo == "") { - ear_size=ht; - echo("ht: ", ht); - echo("ru: ", ru); - echo("rl: ", rl); - echo("width: ", width); - translate([0,-max(ru,rl),ht*3/4+.5]) - rotate([90,0,0]) - scale([1,1,1]) - scale([ht/100,ht/100,1]) - translate([0, -ht/2,0]) - rotate(-90, [0, 0, 1]) - catear_headband( - size=ear_size, - height=max(ru,rl), - thickness=width, - stretch_len=0, - tip_len=0, - details=false, - with_rake=false - ); - } else { - // The logo has been split in 3 parts. // well was... TODO + e=100; // should be big enough, used for the outer boundary of the text/logo + + difference() { + rotate([0,0,-45]) union() { + // main cylinder + if (RENDER_COLOR_1) {cylinder(r1=rl+width, r2=ru+width, h=ht);} + // text and logo + if(logo == "") { + if (RENDER_COLOR_3) { + color("orange") + writecylinder(name, [0,0,0], rl+0.5, ht/13*7, h=ht/13*4, t=max(rl,ru), font=font); + } + if (RENDER_COLOR_2) { + translate([4.7, -rl, ht*1.08]) + rotate(-10, [1, 0, 0]) + rotate(76, [0, 1, 0]) + scale([0.08, 2, 0.08]) + color("red") + import("catears.stl"); + } + } else { + if (RENDER_COLOR_3) { + color("orange") + writecylinder(name, [0,0,0], rl+0.5, ht/13*7, h=ht/13*4, t=max(rl,ru), font=font); + } + + if (RENDER_COLOR_2) { + // The logo has been split in 3 parts. // well the ohm one was ... /* rotate([0,0,-48]) translate([0,0,ht*3/4-0.1]) rotate([90,0,0]) @@ -140,46 +126,17 @@ module logo(logo, rl, ht, ru, width) { linear_extrude(height=max(ru,rl)*2) import("logo_3.dxf"); */ - } -} - -module bottle_clip(ru=13, rl=17.5, ht=26, width=2.5, name="c3cat", font="write/orbitron.dxf", logo="") { - e=100; // should be big enough, used for the outer boundary of the text/logo - rotate([0,0,-45]) { - // main cylinder - if (RENDER_COLOR_ONE) { - color("black") difference() { - cylinder(r1=rl+width, r2=ru+width, 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 - rotate([0, 0, 45]) - translate([0,0,-1]) - cube([50,50,50]); + } } } - // text - if (RENDER_COLOR_TWO) { - color("orange") difference() { - name(name=name, font=font, rl=rl, ht=ht, ru=ru); - cylinder(r1=rl+width, r2=ru+width, h=ht); - outer_cutoff(rl, e, ru, ht, width); - } + if (RENDER_COLOR_1) { + // inner cylinder which is substracted + translate([0,0,-1]) + cylinder(r1=rl, r2=ru, h=ht+2); + } else { + // main cylinder which is subtracted when not rendering color 1 + cylinder(r1=rl+width, r2=ru+width, h=ht); } - // logo - if (RENDER_COLOR_THREE) { - color("yellow") difference() { - logo(logo=logo, rl=rl, ht=ht, ru=ru, width=2*width); - cylinder(r1=rl+width, r2=ru+width, h=ht); - 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 // somewhere on the outside ;-) difference () { @@ -189,14 +146,15 @@ module outer_cutoff(rl, e, ru, ht, width) { // depth is > 0.7 cylinder(r1=rl+width+0.7, r2=ru+width+0.7, h=ht+2); } + // finally, substract a cube as a gap so we can clip it to the bottle + translate([0,0,-1]) cube([50,50,50]); + } } module catear() { - if (USE_TINY_EARS) { - rotate(-90, [0, 0, 1]) union() { - scale([1, 1 ,1]) translate([0, -85]) import("catear.stl"); - scale([1, -1, 1]) translate([0, -85]) import("catear.stl"); - } + rotate(-90, [0, 0, 1]) union() { + scale([1, 1 ,1]) translate([0, -85]) import("catear.stl"); + scale([1, -1, 1]) translate([0, -85]) import("catear.stl"); } } diff --git a/c3cat-bottle-clip/catear_headband.scad b/c3cat-bottle-clip/catear_headband.scad deleted file mode 120000 index f4226ca..0000000 --- a/c3cat-bottle-clip/catear_headband.scad +++ /dev/null @@ -1 +0,0 @@ -../catear_headband.scad \ No newline at end of file diff --git a/catear_headband.scad b/catear_headband.scad index 142ade5..a2fe08e 100644 --- a/catear_headband.scad +++ b/catear_headband.scad @@ -3,7 +3,7 @@ include ; use ; use ; -module catear(height, thickness, fractal=0, side_len=30, bend_factor=0.5, stretch_factor=1.2, debug=false, chamfer=CHAMFER, chamfer_shape=CHAMFER_SHAPE, details=true) { +module catear(height, thickness, fractal=0, side_len=30, bend_factor=0.5, stretch_factor=1.2, debug=false, chamfer=CHAMFER, chamfer_shape=CHAMFER_SHAPE) { $A=[0, side_len/2]; $B=[0,-side_len/2]; $C=[-(side_len/2/sin(120))*1.5*stretch_factor, 0]; @@ -23,7 +23,7 @@ module catear(height, thickness, fractal=0, side_len=30, bend_factor=0.5, stretc translate([0, $a/2, 0]) translate([$bend_offset, 0, 0]) color("#00ffff") - chamfer(size=(details)?chamfer:0, child_h=height, child_bot=-height/2, shape=chamfer_shape) + chamfer(size=chamfer, child_h=height, child_bot=-height/2, shape=chamfer_shape) partial_ring( part=$delta/360, radius=$bend_radius, @@ -35,19 +35,15 @@ module catear(height, thickness, fractal=0, side_len=30, bend_factor=0.5, stretc translate([0, -$b/2, 0]) translate([$bend_offset, 0, 0]) color("#ff00ff") - chamfer(size=(details)?chamfer:0, child_h=height, child_bot=-height/2, shape=chamfer_shape) + chamfer(size=chamfer, child_h=height, child_bot=-height/2, shape=chamfer_shape) partial_ring( part=$delta/360, radius=$bend_radius, thickness=thickness, height=height ); - translate($A) color("#aaaaaa") - chamfer(size=chamfer, child_h=height, child_bot=-height/2, shape=chamfer_shape) - cylinder(h=height, d=thickness, center=true); - translate($B) color("#bbbbbb") - chamfer(size=chamfer, child_h=height, child_bot=-height/2, shape=chamfer_shape) - cylinder(h=height, d=thickness, center=true); + translate($A) color("#aaaaaa") cylinder(h=height, d=thickness, center=true); + translate($B) color("#bbbbbb") cylinder(h=height, d=thickness, center=true); translate($C) color("#cccccc") chamfer(size=chamfer, child_h=height, child_bot=-height/2, shape=chamfer_shape) cylinder(h=height, d=thickness, center=true); @@ -74,7 +70,7 @@ module catear(height, thickness, fractal=0, side_len=30, bend_factor=0.5, stretc } } -module catear_headband(debug=DEBUG, size=SIZE, height=HEIGHT, thickness=THICKNESS, part=PART, stretch_len=STRETCH_LEN, tip_len=TIP_LEN, tip_bend=TIP_BEND, ear_scale=1.5, ear_bend_factor=0.15, ear_stretch_factor=1.2, ear_angle=42, chamfer=CHAMFER, chamfer_shape=CHAMFER_SHAPE, with_rake=true, details=true) { +module catear_headband(debug=DEBUG, size=SIZE, height=HEIGHT, thickness=THICKNESS, part=PART, stretch_len=STRETCH_LEN, tip_len=TIP_LEN, tip_bend=TIP_BEND, ear_scale=1.5, ear_bend_factor=0.15, ear_stretch_factor=1.2, ear_angle=42, chamfer=CHAMFER, chamfer_shape=CHAMFER_SHAPE, with_rake=true) { $a=size/2*ear_scale; $delta=2*(acos($a/(size*2))-90); @@ -90,8 +86,7 @@ module catear_headband(debug=DEBUG, size=SIZE, height=HEIGHT, thickness=THICKNES bend_factor=ear_bend_factor, stretch_factor=ear_stretch_factor, chamfer=chamfer, - chamfer_shape=chamfer_shape, - details=details + chamfer_shape=chamfer_shape ); } rotate(-ear_angle, [0, 0, 1]) { @@ -103,8 +98,7 @@ module catear_headband(debug=DEBUG, size=SIZE, height=HEIGHT, thickness=THICKNES bend_factor=ear_bend_factor, stretch_factor=ear_stretch_factor, chamfer=chamfer, - chamfer_shape=chamfer_shape, - details=details + chamfer_shape=chamfer_shape ); } headband( @@ -115,8 +109,7 @@ module catear_headband(debug=DEBUG, size=SIZE, height=HEIGHT, thickness=THICKNES stretch_len=stretch_len, tip_len=tip_len, tip_bend=tip_bend, - with_rake=with_rake, - details=details + with_rake=with_rake ); }; } diff --git a/headband.scad b/headband.scad index 9a0bab7..07e02b2 100644 --- a/headband.scad +++ b/headband.scad @@ -8,9 +8,9 @@ module partial_ring(part, radius, thickness, height) { square([thickness, height], center=true); } -module headband(debug=DEBUG, size=SIZE, height=HEIGHT, thickness=THICKNESS, part=PART, stretch_len=STRETCH_LEN, tip_len=TIP_LEN, tip_bend=TIP_BEND, rake_depth=RAKE_DEPTH, rake_width=RAKE_WIDTH, rake_stretch=RAKE_STRETCH, rake_chamfer=RAKE_CHAMFER, chamfer=CHAMFER, chamfer_shape=CHAMFER_SHAPE, with_rake=true, details=true) { +module headband(debug=DEBUG, size=SIZE, height=HEIGHT, thickness=THICKNESS, part=PART, stretch_len=STRETCH_LEN, tip_len=TIP_LEN, tip_bend=TIP_BEND, rake_depth=RAKE_DEPTH, rake_width=RAKE_WIDTH, rake_stretch=RAKE_STRETCH, rake_chamfer=RAKE_CHAMFER, chamfer=CHAMFER, chamfer_shape=CHAMFER_SHAPE, with_rake=true) { union() { - chamfer(size=(details)?chamfer:0, child_h=height, child_bot=-height/2, shape=chamfer_shape) union() { + chamfer(size=chamfer, child_h=height, child_bot=-height/2, shape=chamfer_shape) union() { color("purple") partial_ring(part, radius=size, thickness=thickness, height=height); rotate( 90-180*part, [0, 0, 1]) @@ -54,6 +54,6 @@ module headband(debug=DEBUG, size=SIZE, height=HEIGHT, thickness=THICKNESS, part color("red") cube([2*rake_depth, rake_width, height], center=true); } - } - } + }; + }; }