diff --git a/blender_manifest_tree.toml b/blender_manifest_tree.toml index 8dbd292..c435983 100644 --- a/blender_manifest_tree.toml +++ b/blender_manifest_tree.toml @@ -1,7 +1,7 @@ schema_version = "1.0.0" id = "stylized_tree_generator" -version = "1.19.0" +version = "1.20.0" name = "Stylized Tree Generator" tagline = "Parametrische Baeume, Palmen, Bueschen mit Wachstums-Stufen" maintainer = "D4rkst3r" diff --git a/dist/index.json b/dist/index.json index 4466481..35cbc74 100644 --- a/dist/index.json +++ b/dist/index.json @@ -32,7 +32,7 @@ "id": "stylized_tree_generator", "name": "Stylized Tree Generator", "tagline": "Parametrische Baeume, Palmen, Bueschen mit Wachstums-Stufen", - "version": "1.19.0", + "version": "1.20.0", "type": "add-on", "maintainer": "D4rkst3r", "license": [ @@ -48,9 +48,9 @@ "Mesh", "Modeling" ], - "archive_url": "./stylized_tree_generator-1.19.0.zip", - "archive_size": 17827, - "archive_hash": "sha256:37f6a0be381178144b36a731b68f8d307c18c714e0d9b2cd9f1c109e4b4de8e6" + "archive_url": "./stylized_tree_generator-1.20.0.zip", + "archive_size": 18130, + "archive_hash": "sha256:1b3f215f320072966f3ced2aa15dff1acdcace63f9640b4af51c1eca3bcee95a" } ] } \ No newline at end of file diff --git a/dist/stylized_tree_generator-1.19.0.zip b/dist/stylized_tree_generator-1.19.0.zip deleted file mode 100644 index 112c62c..0000000 Binary files a/dist/stylized_tree_generator-1.19.0.zip and /dev/null differ diff --git a/dist/stylized_tree_generator-1.20.0.zip b/dist/stylized_tree_generator-1.20.0.zip new file mode 100644 index 0000000..6789b96 Binary files /dev/null and b/dist/stylized_tree_generator-1.20.0.zip differ diff --git a/stylized_tree_generator.py b/stylized_tree_generator.py index 43a9176..6c5b0c9 100644 --- a/stylized_tree_generator.py +++ b/stylized_tree_generator.py @@ -1,7 +1,7 @@ bl_info = { "name": "Stylized Tree Generator", "author": "D4rkst3r", - "version": (1, 19, 0), + "version": (1, 20, 0), "blender": (4, 2, 0), "location": "View3D > Sidebar > Tree Gen", "description": "Parametrischer Baum-/Palmen-/Busch-Generator (Geometry Nodes) mit Wachstums-Stufen", @@ -80,13 +80,27 @@ DEFAULTS = { # Presets: nur die Abweichungen von DEFAULTS. PRESETS = { "baum": {}, + # Palme: ein Palmenstamm ist KEIN Baumstamm - er hat nahezu konstanten + # Durchmesser (kaum Taper), einen glatt geschwollenen Fuss ohne Wurzelbretter, + # und die Wedel sitzen alle in EINER Krone ganz oben. "palme": { - "Height": 7.0, "Trunk Radius": 0.16, "Bend": 1.1, "Taper": 0.55, - "Branch Count": 11, "Branch Length": 2.6, "Branch Up": 0.55, - "Branch Start": 0.93, "Branch End": 1.0, - "Branch Bend": 0.25, "Branch Droop": 1.5, - "Sub Count": 0, # Wedel-Fiederung macht der User als Blattwerk - "Sides": 6, + "Height": 6.0, "Trunk Radius": 0.115, "Bend": 1.1, + "Taper": 0.22, # fast konstanter Durchmesser statt Kegel + "Trunk Tip": 0.9, # Krone endet stumpf, nicht spitz + "Branch Count": 15, "Branch Length": 3.4, "Branch Up": 1.05, + "Branch Start": 0.95, "Branch End": 1.0, + "Branch Bend": 0.35, + "Branch Droop": 1.15, "Droop Curve": 2.4, # Bogen, nicht haengend + "Branch Thickness": 0.32, # Wedelstiel ist kraeftig wie ein Besenstiel + "Branch Taper": 0.38, # bleiben bis zur Spitze Stiel, kein Draht + "Tip Blunt": 0.24, # stumpfes Ende statt Antenne + "Root Flare": 0.55, # nur leichte Verdickung ... + "Root Lobes": 0.0, "Root Lobe Depth": 0.0, # ... ohne Wurzelbretter + "Crown Taper": 0.0, "Crown Bulge": 0.0, + "Sub Count": 0, # Wedel-Fiederung macht der User als Blattwerk + "Detail": 0.7, # mehr Segmente -> weicher Bogen, kein + # langes gerades Endsegment als "Draht" + "Sides": 9, "Branch Sides": 4, }, "busch": { "Height": 1.6, "Trunk Radius": 0.07, "Bend": 0.4, "Taper": 0.8, diff --git a/tests/test_tree_addon.py b/tests/test_tree_addon.py index 8d2885f..892ead0 100644 --- a/tests/test_tree_addon.py +++ b/tests/test_tree_addon.py @@ -1,7 +1,7 @@ """Prueft das gebaute Tree-Addon: registrieren, Operator ausfuehren, Ergebnis messen.""" import bpy, sys, zipfile, os, tempfile, importlib.util, traceback -ZIP = r"A:\eco\stylized_rock_generator\dist\stylized_tree_generator-1.19.0.zip" +ZIP = r"A:\eco\stylized_rock_generator\dist\stylized_tree_generator-1.20.0.zip" fails = [] tmp = tempfile.mkdtemp()