3 files changed, 37 insertions, 51 deletions
diff --git a/candlestick_molds/taper.scad b/candlestick_molds/taper.scad
new file mode 100644
index 0000000..97356dd
--- /dev/null
+++ b/candlestick_molds/taper.scad
@@ -0,0 +1,37 @@
+
+use <../lib/bezier.scad>;
+
+$fn = 100;
+base_radius = (7/8)/2;
+top_radius = base_radius * 0.75;
+top_height = top_radius * 2;
+total_height = 10;
+stem_height = total_height - top_height;
+
+module stick() {
+    cylinder(stem_height, base_radius, top_radius);
+
+    control_points = [
+        [top_radius, 0],
+        [0.125, top_height/4],
+        [0.125, top_height/2],
+        [0.125, top_height],
+        [0, top_height]
+    ];
+    // adjust curve_facets for low & odd $fn values
+    curve_facets = $fn/2;
+    head_curve = bezier_curve(control_points, $fn=curve_facets);
+    top_curve = concat(head_curve, [[0, 0]]);
+
+    translate([0, 0, stem_height])
+        rotate_extrude()
+            polygon(top_curve);
+
+};
+
+difference() {
+    translate([0, 0, 0])
+        stick();
+    translate([-1.5, -1.5, -0.01])
+        cube([3, 3, 5.01]);
+};
diff --git a/candlestick_molds/taper_block.scad b/candlestick_molds/taper_block.scad
deleted file mode 100644
index 28f455a..0000000
--- a/candlestick_molds/taper_block.scad
+++ /dev/null
@@ -1,51 +0,0 @@
-
-use <../lib/bezier.scad>;
-
-$fn = 100;
-base_radius = 7/8;
-top_radius = base_radius * 0.75;
-top_height = top_radius * 2;
-total_height = 10;
-stem_height = total_height - top_height;
-
-module stick() {
-	cylinder(stem_height + 0.01, base_radius, top_radius);
-
-	control_points = [
-		[top_radius, 0],
-		[0.25, 0.5],
-		[0.4, top_height],
-		[0, top_height]
-	];
-	// adjust curve_facets for low & odd $fn values
-	curve_facets = $fn/2;
-	head_curve = bezier_curve(control_points, $fn=curve_facets);
-	top_curve = concat(head_curve, [[0, 0]]);
-
-	translate([0, 0, stem_height])
-		rotate_extrude()
-			polygon(top_curve);
-
-	translate([0, 0, total_height-0.5])
-		cylinder(r = 0.03);
-};
-
-difference() {
-	// Base Mold Block
-	translate([-1.5, -1.5, 0.01])
-		cube([6, 6, total_height]);
-	
-	// Mold of each stick
-	translate([0, 0, 0]) stick();
-	translate([3, 0, 0]) stick();
-	translate([0, 3, 0]) stick();
-	translate([3, 3, 0]) stick();
-
-	// Cut Molds in half
-	// Print 2 of these to form full mold	
-	translate([-1.51, -1.51, 0])
-		cube([6.02, 1.51, total_height + 0.02]);
-	translate([-1.51, 3, 0])
-		cube([6.02, 1.51, total_height + 0.02]);
-};
-
diff --git a/candlestick_molds/taper_block.stl b/candlestick_molds/taper_block.stl
deleted file mode 100644
index 67f4ff2..0000000
--- a/candlestick_molds/taper_block.stl
+++ /dev/null