From 8f6c7ff9228f413f526309f106411bcf88619ae4 Mon Sep 17 00:00:00 2001
From: wes <wes@wesk.tech>
Date: Fri, 26 Apr 2024 17:20:23 -0400
Subject: [PATCH] add gandalf rune

---
 gandalf.svg | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 planter.py  | 13 ++++++------
 2 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 gandalf.svg

diff --git a/gandalf.svg b/gandalf.svg
new file mode 100644
index 0000000..286d3da
--- /dev/null
+++ b/gandalf.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.0"
+   width="910.22223"
+   height="606.43555"
+   id="svg2"
+   viewBox="0 0 853.33331 568.53333"
+   sodipodi:docname="gandalf.svg"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false"
+     inkscape:zoom="1.1964111"
+     inkscape:cx="455.11112"
+     inkscape:cy="303.40742"
+     inkscape:window-width="1920"
+     inkscape:window-height="997"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata15">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4" />
+  <g
+     id="g1"
+     transform="matrix(7.459295,0,0,7.459295,295.54473,74.430041)">
+    <g
+       id="layer1"
+       transform="matrix(1.5332797,0,0,1.5332797,-8.5186284,-12.769486)">
+      <path
+         d="m 10.744549,17.902233 4.8125,-4.484375 -1.285156,-2.132812 3.582031,-1.8457035 1.517578,2.6386715 -8.626953,8.558594 v 4.962891 l 11.867187,-12.126953 -1.394531,-2.1875 3.582031,-1.8457035 1.503907,2.6386715 -15.558594,16.064453 v 5.933594 l 1.558594,2.583985 -3.6367192,1.791015 -1.4492188,-2.55664 V 13.786999 L 5.6449394,11.285046 9.2269707,9.4393425 10.744549,12.050671 v 5.851562"
+         id="text2389"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:125%;font-family:'Liberation Serif';-inkscape-font-specification:'Liberation Serif';text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/planter.py b/planter.py
index 39ef286..a69ef55 100644
--- a/planter.py
+++ b/planter.py
@@ -45,28 +45,29 @@ planter_polygon = result.workplane(offset=-36).makePolygon(
 
 result = planter_polygon.vertices().sphere(8, combine="cut")
 
-paths, attributes = svg2paths("/home/deck/cad_files/tree_of_gondor_small.svg")
+gondor_paths, gondor_attributes = svg2paths("/home/deck/cad_files/tree_of_gondor_small.svg")
+gandalf_paths, gandalf_attributes = svg2paths("/home/deck/cad_files/gandalf.svg")
 
 
 if RENDER_TREES:
     tree = (
         Workplane("YZ")
         .center(0, 75)
-        .addSvgPath(paths[0])
+        .addSvgPath(gondor_paths[0])
         .extrude(-2.0)
         .translate((95.03, -100, 0))
     )
 
-    tree2 = (
+    gandalf = (
         Workplane("YZ")
         .center(0, 75)
-        .addSvgPath(paths[0])
+        .addSvgPath(gandalf_paths[0])
         .extrude(2.0)
-        .translate((-95.03, -100, 0))
+        .translate((-95.03, -14.5, 85))
     )
 
     result = result.cut(tree, clean=False)
-    result = result.cut(tree2, clean=False)
+    result = result.cut(gandalf, clean=False)
 
 cone = cq.Solid.makeCone(planter_radius, 33, planter_height + 95)