Parameter customizer

.gitignore

@@ -1,3 +1,8 @@
+.DS_Store
+
+# PyCharm user preferences
+.idea/
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -107,4 +112,4 @@ venv.bak/
 # ========
 build.bat
 staging/
-.idea/
+.idea/

ch_trees/__init__.py

@@ -1,18 +1,30 @@
 bl_info = {
     "name": "TreeGen",
     "category": "Object",
+    "description": "Generate high quality tree models",
+    "author": "Charlie Hewitt and Luke Pflibsen-Jones",
+    "version": (0, 0, 1),
+    "wiki_url": "",
 }
 
+
 import bpy
 from . import gui
 
 
 def register():
     bpy.utils.register_class(gui.TreeGen)
     bpy.utils.register_class(gui.TreeGenPanel)
+    bpy.utils.register_class(gui.TreeGenCustomisePanel)
+    bpy.utils.register_class(gui.TreeGenSaveFile)
+    bpy.utils.register_class(gui.TreeGenLoadParams)
+
 
 def unregister():
     # Reversing order is best-practice
+    bpy.utils.unregister_class(gui.TreeGenLoadParams)
+    bpy.utils.unregister_class(gui.TreeGenSaveFile)
+    bpy.utils.register_class(gui.TreeGenCustomisePanel)
     bpy.utils.unregister_class(gui.TreeGenPanel)
     bpy.utils.unregister_class(gui.TreeGen)
 

ch_trees/leaf.py

@@ -59,7 +59,7 @@ def get_mesh(self, bend, base_shape, index):
         if bend > 0:
             bend_trf_1, bend_trf_2 = self.calc_bend_trf(bend)
         else:
-            bend_trf_1 = bend_trf_2 = None
+            bend_trf_1 = None
 
         vertices = []
         for vertex in base_shape[0]:
@@ -71,7 +71,7 @@ def get_mesh(self, bend, base_shape, index):
             # apply bend if needed
             if bend > 0:
                 n_vertex.rotate(bend_trf_1)
-                n_vertex.rotate(bend_trf_2)
+                # n_vertex.rotate(bend_trf_2)
 
             # move to right position
             n_vertex += self.position
@@ -92,6 +92,10 @@ def calc_bend_trf(self, bend):
         theta_pos = atan2(self.position.y, self.position.x)
         theta_bend = theta_pos - atan2(normal.y, normal.x)
         bend_trf_1 = Quaternion(Vector([0, 0, 1]), theta_bend * bend)
+
+        # i think this is what the paper says but the second transform just looks stupid
+        # so we just ignore it above
+
         self.direction.rotate(bend_trf_1)
         self.right.rotate(bend_trf_1)
         normal = self.direction.cross(self.right)