Support for Blender 4.2+

.github/workflows/build_release.yml

@@ -0,0 +1,62 @@
+name: build
+on:
+  push:
+    tags:
+      - '**'
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - os: windows-latest
+            extension: bat
+            name: windows
+          - os: ubuntu-latest
+            extension: sh
+            name: linux
+          - os: macos-latest
+            extension: osx
+            name: macOS
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: setup python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.11
+      - name: generate cmake files
+        run: cmake -S src -B build
+      - name: build
+        run: cmake --build build
+
+      - name: upload addon
+        uses: actions/upload-artifact@v4
+        with:
+          name: modular_tree_${{ matrix.name }}
+          path: addon
+
+  release:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+      - name: Download build artifacts
+        uses: actions/download-artifact@v4
+      - name: Display structure of downloaded files
+        run: ls -R
+      - name: Zip artifacts
+        run: |
+          for dir in modular_tree_*; do
+            if [ -d "$dir" ]; then
+              zip -r "${dir}.zip" "${dir}"
+            fi
+          done
+      - name: Create release
+        uses: softprops/action-gh-release@v2
+        if: github.ref_type == 'tag'
+        with:
+          files: modular_tree_*.zip

.gitignore

@@ -1,42 +1,13 @@
-*/build/
-*__pycache__/
-*Debug/
-m_tree/m_tree.egg-info/
-
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
-*.pyd
-*.pdb
-**/.vscode/
-m_tree.egg-info/
-*.exp
-*/binaries/
-tmp/*
+# IDEs
+**/.idea
+**/.vscode
+**/.vs
+
+# Misc
+**/__pycache__
+
+# Build
+build
+addon/lib/*.pyd
+addon/lib/*.pdb
+*.zip

README.md

@@ -1,3 +1,9 @@
+# Note!
+This repository is a fork that supports 4.2+ Blender versions. It is built with Python 3.11, which is currently bundled into Blender.
+
+It has changes to the build process, making it easier to update in the future.
+
+
 # Mtree
 
 Mtree (previously Modular Tree) is a library for making 3d trees. It comes as an addon for blender but the c++ library can be used separately.
@@ -14,19 +20,21 @@ Mtree (previously Modular Tree) is a library for making 3d trees. It comes as an
 
 
 ## Installation (blender addon)
-Go to the [latest release]. Under `Assets`, select the version corresponding to your os.\
-Follow the [blender documentation][blender addon doc] to install the downloaded addon.
+Go to the [latest release]. Under `Assets`, select the version corresponding to your os.
+
+Follow the [Blender documentation][blender addon doc] to install the downloaded addon.
 
 ## Development
 ### Dependencies
 - [Cmake]
-- Blender 2.93 or higher (if you want to to develop the blender addon)
+- Blender 4.2 or higher
 
 ### Installation
-1. Clone the repository reccursively `git clone --recursive https://github.com/MaximeHerpin/modular_tree`
-2. Execute the `build_mtree` bash script corresponding to your platform.
-3. If all went well, a cmake project has been generated under `mtree/build`.
-4. You can bundle the blender addon by calling the [addon bundling script].
+1. Clone the repository reccursively `git clone https://github.com/ethanporcaro/modular_tree_py311`
+2. Generate Cmake files with `cmake -S src -B build`
+3. Build the project with `cmake --build build`
+3. If all went well, your addon will be generated and zipped to `modular_tree_{platform}.zip` where `{platform}` is the name of your operating system.
+
 
 ### Usage
 A `Tree` is generated by executing a succession of `TreeFunction`. When being executed, a `TreeFunction` modifies the structure of the tree, and then calls children functions recursively.\
@@ -60,7 +68,7 @@ trunk->add_child(branches_dead);
 Tree tree(trunk);
 ```
 ## License
-Blender being under the GPL license, the blender addon (all files under `python_classes` as well as `__init__.py`) is under the [GPLv3] license.\
+Blender being under the GPL license, the blender addon (all files under `addon`) is under the [GPLv3] license.\
 The Mtree library is under the [MIT] license.
 
 

VERSION

@@ -1 +1 @@
-4_0_2
+5_0_0

__init__.py → addon/__init__.py

@@ -11,29 +11,26 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-import os
-from pathlib import Path
-from . import python_classes
-
+from . import nodes
+from . import operators
 
 bl_info = {
-    "name" : "Modular Tree",
-    "author" : "Maxime",
-    "description" : "create trees",
-    "blender" : (2, 83, 0),
-    "version" : (4, 0, 2),
-    "location" : "",
-    "warning" : "",
-    "category" : "Generic"
+    "name": "Modular Tree",
+    "author": "Maxime",
+    "description": "create trees",
+    "blender": (4, 4, 3),
+    "version": (5, 0, 0),
+    "location": "",
+    "warning": "",
+    "category": "Generic"
 }
 
 
-# auto_load.init()
-
 def register():
-    python_classes.register()
-    # auto_load.register()
+    operators.register()
+    nodes.register()
+
 
 def unregister():
-    python_classes.unregister()
-    # auto_load.unregister()
+    operators.unregister()
+    nodes.unregister()

python_classes/nodes/properties/ramp_property.py → addon/nodes/properties/ramp_property.py

@@ -1,6 +1,6 @@
 import bpy
 from ..base_types.node import MtreePropertyNode
-from ....m_tree import SimpleCurveProperty, PropertyWrapper
+from ...lib.m_tree import SimpleCurveProperty, PropertyWrapper
 
 class RampPropertyNode(bpy.types.Node, MtreePropertyNode):
     bl_idname = "mt_RampPropertyNode"

python_classes/nodes/properties/random_property.py → addon/nodes/properties/random_property.py

@@ -1,6 +1,6 @@
 import bpy
 from ..base_types.node import MtreePropertyNode
-from ....m_tree import RandomProperty, PropertyWrapper
+from ...lib.m_tree import RandomProperty, PropertyWrapper
 
 class RandomPropertyNode(bpy.types.Node, MtreePropertyNode):
     bl_idname = "mt_RandomPropertyNode"

python_classes/nodes/sockets/property_socket.py → addon/nodes/sockets/property_socket.py

@@ -1,6 +1,6 @@
 import bpy
 from ..base_types.socket import MtreeSocket
-from ....m_tree import ConstantProperty, RandomProperty, PropertyWrapper
+from ...lib.m_tree import ConstantProperty, RandomProperty, PropertyWrapper
 
 class MtreePropertySocket(bpy.types.NodeSocket, MtreeSocket):
     bl_idname = 'mt_PropertySocket'

python_classes/nodes/tree_function_nodes/branch_node.py → addon/nodes/tree_function_nodes/branch_node.py

@@ -1,7 +1,7 @@
 from random import randint
 import bpy
 from ..base_types.node import MtreeFunctionNode
-from ....m_tree import BranchFunction
+from ...lib.m_tree import BranchFunction
 
 class BranchNode(bpy.types.Node, MtreeFunctionNode):
     bl_idname = "mt_BranchNode"

python_classes/nodes/tree_function_nodes/pipe_radius_node.py → addon/nodes/tree_function_nodes/pipe_radius_node.py

@@ -1,6 +1,6 @@
 import bpy
 from ..base_types.node import MtreeFunctionNode
-from ....m_tree import PipeRadiusFunction
+from ...lib.m_tree import PipeRadiusFunction
 
 class PipeRadiusNode(bpy.types.Node, MtreeFunctionNode):
     bl_idname = "mt_PipeRadiusNode"

python_classes/nodes/tree_function_nodes/tree_mesher_node.py → addon/nodes/tree_function_nodes/tree_mesher_node.py

@@ -1,7 +1,7 @@
 import time
 import numpy as np
 import bpy
-from .... import m_tree
+from ...lib import m_tree
 from ..base_types.node import MtreeNode 
 
 def on_update_prop(node, context):
@@ -103,12 +103,12 @@ def fill_blender_mesh(self, mesh, cpp_mesh):
         mesh.loops.add(len(faces))
         mesh.loops.foreach_set("vertex_index", faces)
 
-        loop_start = np.arange(0, len(faces), 4, dtype=np.int)
-        loop_total = np.ones(len(faces)//4, dtype = np.int)*4
+        loop_start = np.arange(0, len(faces), 4, dtype=int)
+        loop_total = np.ones(len(faces)//4, dtype = int)*4
         mesh.polygons.add(len(faces)//4)
         mesh.polygons.foreach_set("loop_start", loop_start)
         mesh.polygons.foreach_set("loop_total", loop_total)
-        mesh.polygons.foreach_set('use_smooth',  np.ones(len(faces)//4, dtype=np.bool))
+        mesh.polygons.foreach_set('use_smooth',  np.ones(len(faces)//4, dtype=bool))
 
 
         uv_data = cpp_mesh.get_uvs()

python_classes/nodes/tree_function_nodes/trunk_node.py → addon/nodes/tree_function_nodes/trunk_node.py

@@ -1,7 +1,7 @@
 from random import randint
 import bpy
 from ..base_types.node import MtreeFunctionNode
-from ....m_tree import TrunkFunction
+from ...lib.m_tree import TrunkFunction
 
 class TrunkNode(bpy.types.Node, MtreeFunctionNode):
     bl_idname = "mt_TrunkNode"

python_classes/operators.py → addon/operators.py

@@ -6,7 +6,7 @@
 import gpu
 import numpy as np
 
-from .. import m_tree
+from .lib import m_tree
 from .resources.node_groups import distribute_leaves
 
 

python_classes/resources/resource_utils.py → addon/resources/resource_utils.py

@@ -2,7 +2,7 @@
 from pathlib import Path
 import bpy
 
-MTREE_RESOURCE_DIR = (Path(__file__).parent.parent.parent / "resources").resolve()
+MTREE_RESOURCE_DIR = Path(__file__).parent.resolve()
 
 class ResourceUtils:
 
@@ -13,7 +13,7 @@ def append_geo_node(cls, name:str):
         group = bpy.data.node_groups.get(name, None)
 
         if group is None:
-            directory = os.path.join(cls.geo_nodes_dir, "geo_nodes_2_93.blend", "NodeTree")
+            directory = os.path.join(cls.geo_nodes_dir, "geo_nodes.blend", "NodeTree")
             filepath = os.path.join(directory, name)
             bpy.ops.wm.append(filepath=filepath,filename=name,directory=directory, autoselect=False)
             group = bpy.data.node_groups[name]