From 89a33df7ff7808115fd5f659f264df01b3137b80 Mon Sep 17 00:00:00 2001 From: djerun Date: Sat, 14 Dec 2024 14:31:52 +0100 Subject: [PATCH] [WIP] bottle tag logo --- c3cat-bottle-clip/c3cat-bottle-clip.scad | 28 +- c3cat-bottle-clip/sterntastatur.svg | 910 +++++++++++++++++++++++ c3cat-bottle-clip/test.svg | 46 ++ generate_bottle_tag.sh | 4 + 4 files changed, 973 insertions(+), 15 deletions(-) create mode 100644 c3cat-bottle-clip/sterntastatur.svg create mode 100644 c3cat-bottle-clip/test.svg diff --git a/c3cat-bottle-clip/c3cat-bottle-clip.scad b/c3cat-bottle-clip/c3cat-bottle-clip.scad index 19a51e7..4c5a6e2 100644 --- a/c3cat-bottle-clip/c3cat-bottle-clip.scad +++ b/c3cat-bottle-clip/c3cat-bottle-clip.scad @@ -61,7 +61,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=NAME, logo=LOGO_FILE); 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(); } @@ -93,6 +93,7 @@ module name(name, font, rl, ht, ru) { module logo(logo, rl, ht, ru, width) { echo("logo: ", logo); if(logo == "") { + echo("CATEAR LOGO"); ear_size=ht; echo("ht: ", ht); echo("ru: ", ru); @@ -114,32 +115,29 @@ module logo(logo, rl, ht, ru, width) { with_rake=false ); } else { + echo("LOGO: ", logo); // The logo has been split in 3 parts. // well was... TODO -/* - rotate([0,0,-48]) translate([0,0,ht*3/4-0.1]) + rotate([0,0,-45]) translate([0,0,ht*3/4-0.1]) rotate([90,0,0]) - scale([0.9,0.9,1]) + scale([0.8,0.8,1]) scale([ht/100,ht/100,1]) - translate([-25,-29,0.5]) + translate([-32,-33,0.5]) linear_extrude(height=max(ru,rl)*2) - import("logo_1.dxf"); -*/ + import("test.svg"); translate([0,0,ht*3/4-0.1]) rotate([90,0,0]) scale([0.8,0.8,1]) scale([ht/100,ht/100,1]) - translate([-18,-22,0.5]) + translate([-32,-33,0.5]) linear_extrude(height=max(ru,rl)*2) import(logo); -/* - rotate([0,0,44]) translate([0,0,ht*3/4-0.1]) + rotate([0,0,45]) translate([0,0,ht*3/4-0.1]) rotate([90,0,0]) - scale([0.7,0.7,1]) + scale([0.8,0.8,1]) scale([ht/100,ht/100,1]) - translate([-25,-26,0.5]) + translate([-32,-33,0.5]) linear_extrude(height=max(ru,rl)*2) - import("logo_3.dxf"); -*/ + import("test.svg"); } } @@ -153,7 +151,7 @@ module bottle_clip(ru=13, rl=17.5, ht=26, width=2.5, name="c3cat", font="write/o difference() { union() { name(name=name, font=font, rl=rl, ht=ht, ru=ru); - logo(logo=logo, rl=rl, ht=ht, ru=ru, width=width); + logo(logo=logo, rl=rl, ht=ht, ru=ru, width=2*width); } cylinder(r1=rl+width/2, r2=ru+width/2, h=ht); } diff --git a/c3cat-bottle-clip/sterntastatur.svg b/c3cat-bottle-clip/sterntastatur.svg new file mode 100644 index 0000000..520ed37 --- /dev/null +++ b/c3cat-bottle-clip/sterntastatur.svg @@ -0,0 +1,910 @@ + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/c3cat-bottle-clip/test.svg b/c3cat-bottle-clip/test.svg new file mode 100644 index 0000000..c983ded --- /dev/null +++ b/c3cat-bottle-clip/test.svg @@ -0,0 +1,46 @@ + + + + + + + + + + diff --git a/generate_bottle_tag.sh b/generate_bottle_tag.sh index 8ea378d..877f7e8 100755 --- a/generate_bottle_tag.sh +++ b/generate_bottle_tag.sh @@ -11,6 +11,10 @@ FN=90 NAME="\"$1\"" +if [[ $# -ge 2 ]];then + LOGO_FILE="\"$2\"" +fi + # usage: render NAME PART render() { case "$2" in