Updated Candles

1. Adjusted heights. 2. Regenerated stls. 3. Renamed direcory to candles.

6 files changed, 30 insertions, 38 deletions

diff --git a/candlestick_molds/diamond.scad b/candles/diamond.scad
index ad3f3c4..ba8aabb 100644
--- a/candlestick_molds/diamond.scad
+++ b/candles/diamond.scad
@@ -25,4 +25,5 @@ diamond(3);
 diamond(4);
 diamond(5);
 diamond(6);
+diamond(7);
 
diff --git a/candlestick_molds/diamond.stl b/candles/diamond.stl
index 81c4d54..0fa58fb 100644
--- a/candlestick_molds/diamond.stl
+++ b/candles/diamond.stl
diff --git a/candles/taper.scad b/candles/taper.scad
new file mode 100644
index 0000000..5d8fff5
--- /dev/null
+++ b/candles/taper.scad
@@ -0,0 +1,28 @@
+
+use <../lib/bezier.scad>;
+
+$fn = 100;
+base_radius = 3/8;
+top_radius = base_radius * 0.75;
+top_height = top_radius * 2;
+total_height = 7.5;
+stem_height = total_height - top_height;
+
+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);
+
diff --git a/candles/taper.stl b/candles/taper.stl
new file mode 100644
index 0000000..c8029aa
--- /dev/null
+++ b/candles/taper.stl
diff --git a/candlestick_molds/taper.scad b/candlestick_molds/taper.scad
deleted file mode 100644
index 97356dd..0000000
--- a/candlestick_molds/taper.scad
+++ /dev/null
@@ -1,37 +0,0 @@
-

-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/lib/view_stl.scad b/lib/view_stl.scad
index 15efedc..3e98a11 100644
--- a/lib/view_stl.scad
+++ b/lib/view_stl.scad
@@ -1,2 +1,2 @@
 
-import ("../candlestick_molds/diamond.stl");
+import ("../candles/diamond.stl");