.gitignore

@@ -1,2 +1 @@
 stls/
-private

c3cat-bottle-clip/c3cat-bottle-clip.scad

@@ -26,16 +26,6 @@
  */
 
 include <write/Write.scad>
-use <catear_headband.scad>
-
-$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;
 
 /**
  * Creates one instance of a bottle clip name tag. The default values are
@@ -61,7 +51,7 @@ 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);
+    scale([5, 5, 5]) rotate(45, [0, 0, 1]) bottle_clip(name="c3cat");
     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();
   }
@@ -70,42 +60,22 @@ scale([0.2, 0.2, 0.2]) {
   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);
+	e=100;  // should be big enough, used for the outer boundary of the text/logo
+
+  difference() {
+    rotate([0,0,-45]) union() {
+      // main cylinder
+      cylinder(r1=rl+width, r2=ru+width, h=ht);
+      // text and 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
-                );
+        color("orange") writecylinder(name, [0,0,0], rl+0.5, ht/13*7, h=ht/13*4, t=max(rl,ru), font=font);
+        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 {
-        // The logo has been split in 3 parts. // well was... TODO
+        color("orange") writecylinder(name, [0,0,0], rl+0.5, ht/13*7, h=ht/13*4, t=max(rl,ru), font=font);
+
+        // The logo has been split in 3 parts.
 /*
         rotate([0,0,-48]) translate([0,0,ht*3/4-0.1])
           rotate([90,0,0])
@@ -133,32 +103,6 @@ module logo(logo, rl, ht, ru, width) {
 */
       }
     }
-
-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
-
-  difference() {
-    rotate([0,0,-45]) union() {
-      // 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);
-          }
-      }
-      // text
-      if (RENDER_COLOR_TWO) {
-        color("orange")
-          name(name=name, font=font, rl=rl, ht=ht, ru=ru);
-      }
-      // logo
-      if (RENDER_COLOR_THREE) {
-        color("yellow") logo(logo=logo, rl=rl, ht=ht, ru=ru, width=2*width);
-      }
-    }
     // inner cylinder which is substracted
     translate([0,0,-1])
       cylinder(r1=rl, r2=ru, h=ht+2);
@@ -177,13 +121,11 @@ module bottle_clip(ru=13, rl=17.5, ht=26, width=2.5, name="c3cat", font="write/o
 }
 
 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");
   }
 }
-}
 
 /**
  * Creates one instance of a bottle clip name tag suitable for 0.33l longneck

c3cat-bottle-clip/catear_headband.scad

@@ -1 +0,0 @@
-../catear_headband.scad

catear_headband.scad

@@ -1,9 +1,8 @@
 include <globals.scad>;
 
 use <headband.scad>;
-use <chamfer.scad>;
 
-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 +22,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 +34,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 +69,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) {
 
   $a=size/2*ear_scale;
   $delta=2*(acos($a/(size*2))-90);
@@ -90,8 +85,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 +97,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(
@@ -114,9 +107,7 @@ module catear_headband(debug=DEBUG, size=SIZE, height=HEIGHT, thickness=THICKNES
       part=part,
       stretch_len=stretch_len,
       tip_len=tip_len,
-      tip_bend=tip_bend,
-      with_rake=with_rake,
-      details=details
+      tip_bend=tip_bend
     );
   };
 }

catear_pedestal.scad

@@ -1,49 +0,0 @@
-include <globals.scad>
-
-use <catear_headband.scad>
-
-SCALE_FACTOR=SIZE/9;
-
-echo("scale factor: ", SCALE_FACTOR);
-echo("bottom diameter: ", SIZE/SCALE_FACTOR);
-
-
-difference() {
-  union()
-    for (i=[-1,1])
-      translate([i*2, 0, 0])
-        rotate(i*90, [0, 1, 0])
-          scale(1/SCALE_FACTOR)
-            union() {
-              translate([0, 0, SIZE+20+60])
-                rotate(90, [0, 1, 0])
-                  scale(1.6)
-                    catear_headband(thickness=5, with_rake=false);
-              translate([0, 0, 20])
-                cylinder(h=10, r=SIZE, $fn=360);
-              cylinder(h=20, d=SIZE, $fn=360);
-            }
-  translate([0, 0, -SIZE*(1/SCALE_FACTOR)*5])
-    cube(SIZE*10*(1/SCALE_FACTOR), center=true);
-}
-
-/*
-scale(1/SCALE_FACTOR) {
-translate([0, 0, 30])
-scale([1, 1, -1])
-difference() {
-  union() {
-    translate([0, 0, 20])
-      cylinder(h=10, r=SIZE, $fn=360);
-    cylinder(h=20, d=SIZE, $fn=360);
-  }
-  translate([0, 0, SIZE+20+60])
-    rotate(90, [0, 1, 0])
-      scale(1.6)
-        catear_headband(thickness=5, with_rake=false);
-}
-scale(1.6)
-  translate([0, 0, HEIGHT/2])
-    catear_headband(thickness=5, with_rake=false);
-}
-*/

globals.scad

@@ -12,7 +12,7 @@ RAKE_WIDTH=1;
 RAKE_STRETCH=1;
 RAKE_CHAMFER=0.5;
 CHAMFER=1;
-CHAMFER_SHAPE="curve";
+CHAMFER_SHAPE="cone";
 
 INSERTICLE_X = 4.6;
 INSERTICLE_Y = 7.4;

headband.scad

@@ -1,5 +1,5 @@
+include <chamfer.scad>
 include <globals.scad>
-use <chamfer.scad>
 
 module partial_ring(part, radius, thickness, height) {
   rotate(180-180*part, [0, 0, 1])
@@ -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) {
   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])
@@ -41,7 +41,7 @@ module headband(debug=DEBUG, size=SIZE, height=HEIGHT, thickness=THICKNESS, part
                   );
         }
     }
-    if (with_rake) for (i=[-size/2:size/2]) {
+    for (i=[-size/2:size/2]) {
       rotate(i*2-rake_width/2, [0, 0, 1])
         intersection() {
           scale([1, 1, rake_stretch/(rake_depth/height)])
@@ -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);
         }
-    }
-  }
+    };
+  };
 }

mouseear_headband.scad

@@ -1,20 +0,0 @@
-use <catear_headband.scad>
-include <headband.scad>
-
-module mouseear_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, ear_bend_factor=0.65, ear_stretch_factor=1, ear_angle=40) {
-  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=ear_scale,
-    ear_bend_factor=ear_bend_factor,
-    ear_stretch_factor=ear_stretch_factor,
-    ear_angle=ear_angle);
-}
-
-mouseear_headband();