diff --git a/main.scad b/main.scad index e3c9403..9b8dccf 100644 --- a/main.scad +++ b/main.scad @@ -25,7 +25,7 @@ module puzzle_line(a=20, b=15, z=40, h=10) { module contour(h=70) { for(r = [0:5]) { rotate([0,0,(r+0.5)*60]) - translate([10.95,-6.88,0]) + translate([10.9,-6.88,0]) { if( r%2 == 0 ) { mirror([1,0,0]) @@ -46,7 +46,7 @@ module contour_hull(h=1, a=5.7, b=3.2, z=6.88*2, a0=4.5,b0=2.2,z0=6.88*2) { for(r = [0:2]) { rotate([0,0,r*120-30]) - translate([10.95,-6.88,0]) { + translate([10.9,-6.88,0]) { hull() { translate([-0.5,(z0-(a0-1))/2,0]) cube([0.5, (a0-1), h]); @@ -59,7 +59,7 @@ module contour_hull(h=1, a=5.7, b=3.2, z=6.88*2, a0=4.5,b0=2.2,z0=6.88*2) { for(r = [0:2]) { rotate([0,0,30+r*120]) - translate([10.95,-6.88,0]) + translate([10.9,-6.88,0]) mirror([1,0,0]) translate([-1,0,0]) { @@ -78,14 +78,14 @@ module contour_hull(h=1, a=5.7, b=3.2, z=6.88*2, a0=4.5,b0=2.2,z0=6.88*2) { module inner_contour(h=70) { for(r = [0:5]) { rotate([0,0,(r+0.5)*60]) - translate([10.8-1,-6.25,0]) + translate([10.5-1,-6,0]) { if( r%2 == 0 ) { mirror([1,0,0]) translate([-1,0,0]) - puzzle_line(6, 4.4, z=6.25*2, h=h); + puzzle_line(6, 4.4, z=6*2, h=h); } else { - puzzle_line(4.5, 1, z=6.25*2, h=h); + puzzle_line(4.5, 1, z=6*2, h=h); } } } @@ -107,28 +107,34 @@ module inner(h=70) { inner_contour(h=h); translate([-20,4,0]) - cube([40, 15,h]); + cube([40, 15, h]); } + // back inner_contour_hull(); + + // front translate([0,0,h]) - render() - difference() { - cylinder(d=26, h=4, $fn=6); + { + front(); + + color([0,0,1]) + { + translate([0,4,10]) + text("220", size=6, halign="center", font="+Jakatar"); - translate([0,-8,2]) - cylinder(d=16, h=3, $fn=6); - - translate([0,-3,1]) - cylinder(d=20, h=2, $fn=6); + translate([0,-8,10]) + text("Ω", size=10, halign="center", font="+Jakatar"); + } } } } + module outer(h=70) { - translate([0,0,-8]) - cylinder(d=15, h=8, $fn=6); + translate([0,0,-10]) + cylinder(d=15.5, h=10, $fn=6); contour(h=h);