diff --git a/Shot Dispenser/Shot Glas/Liza.stl b/Shot Dispenser/Shot Glas/Liza.stl
new file mode 100644
index 0000000..53a1af4
Binary files /dev/null and b/Shot Dispenser/Shot Glas/Liza.stl differ
diff --git a/Shot Dispenser/Shot Glas/Shot Glas.scad b/Shot Dispenser/Shot Glas/Shot Glas.scad
index fcdb4a3..8c0c1f0 100644
--- a/Shot Dispenser/Shot Glas/Shot Glas.scad
+++ b/Shot Dispenser/Shot Glas/Shot Glas.scad
@@ -1,3 +1,20 @@
+module pentagram(r, w=1, d=1) {
+ linear_extrude(height=d) {
+ for(a=[0:+(360/5):360]) {
+ rotate([0, 0, a])
+ translate([-r, 0, 0]) rotate([0, 0, 18]) translate([w * 0.95, -0.5 * w]) square(size=[r, w]);
+ rotate([0, 0, a])
+ translate([-r, 0, 0]) rotate([0, 0, -1 * 18]) translate([w * 0.95, -0.5 * w]) square(size=[r, w]);
+ }
+ difference() {
+ circle(r=r);
+ circle(r=r-w);
+ }
+ }
+}
+
+
+
scale([1/10, 1/10, 1/10]) union() {
Heigth = 560;
@@ -9,7 +26,7 @@ scale([1/10, 1/10, 1/10]) union() {
difference() {
cylinder(h=Heigth, r1=radius * 0.37, r2=radius * 0.5, center = false, $fn = 128);
translate([0,0,50])
- cylinder(h=Heigth+100, r1=radius * 0.25, r2=radius * 0.48, center = false, $fn = 30);
+ cylinder(h=Heigth+100, r1=radius * 0.25, r2=radius * 0.48, center = false, $fn = 23);
translate([0, 300, 320]) rotate([-10, 0, 0]) union() {
sphere(100, $fn = 128);
@@ -28,20 +45,23 @@ scale([1/10, 1/10, 1/10]) union() {
rotate([180,0,0])
cylinder(280, r=100, $fn=128);
}
-
+ DIAMETER = 200;
+ //translate([0,0,45]) pentagram((DIAMETER/2) - 1, 10, 12);
translate([0,0,40]) rotate([180,0,45]) cylinder(70, r1=50, r2=200, $fn=6);
}
- rotate([80, 0, -45])
-translate([0, 250, -200])
-linear_extrude(30)
-import("communism.svg", center=true);
+
+ rotate([81, 0, -45])
+ translate([0, 220, -250])
+ linear_extrude(84)
+
+ import("dog.svg", center=true);
}
-ARC_ANGLE=100;
-stext = ["C", "A", "L", "V", "I", "N"];
+ARC_ANGLE=120;
+stext = ["P", "H", "I", "L"];
chars = len( stext );
color("red")
@@ -51,7 +71,7 @@ for(i=[0:1:chars]){
translate( [Heigth*0.4,0,0])
rotate([90,0,90])
linear_extrude(30)
- text(stext[i],size=75,valign="center",halign="center");
+ text(stext[i],size=120,valign="center",halign="center");
}
}
diff --git a/Shot Dispenser/Shot Glas/bat.svg b/Shot Dispenser/Shot Glas/bat.svg
new file mode 100644
index 0000000..b45e6be
--- /dev/null
+++ b/Shot Dispenser/Shot Glas/bat.svg
@@ -0,0 +1,14 @@
+
+
+
+
\ No newline at end of file
diff --git a/Shot Dispenser/Shot Glas/dog.svg b/Shot Dispenser/Shot Glas/dog.svg
new file mode 100644
index 0000000..c1544fb
--- /dev/null
+++ b/Shot Dispenser/Shot Glas/dog.svg
@@ -0,0 +1,85 @@
+
+
+
+
+
\ No newline at end of file