0.1.7

Added mesh triangulation checks

Author: eadf

Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-version = "0.1.6"
+version = "0.1.7"
 name = "hallr"
 edition = "2024"
 readme = "README.md"

Cargo.toml

@@ -12,7 +12,7 @@
     "category": "Object",
     "description": "A collection of addons written in Rust",
     "author": "EAD https://github.com/eadf",
-    "version": (0, 1, 6),
+    "version": (0, 1, 7),
     "warning": "This executes compiled rust code on your computer",
 }
 

blender_addon/__init__.py

@@ -513,7 +513,12 @@ def call_rust(config: dict[str, str], active_obj, second_mesh=None, second_mesh_
         vertices = [Vector3(v.co.x, v.co.y, v.co.z) for v in active_obj.data.vertices if v.select]
     else:
         # 4. Gather triangle vertex indices
-        indices = [vert_idx for face in active_obj_to_process.data.polygons for vert_idx in face.vertices]
+        if not all(len(face.vertices) == 3 for face in active_obj_to_process.data.polygons):
+            raise HallrException(f"The '{active_obj_to_process.name}' mesh is not fully triangulated!")
+        indices = [v for face in active_obj_to_process.data.polygons for v in face.vertices]
+        if len(indices) == 0:
+            raise HallrException(
+                f"No polygons found in '{active_obj_to_process.name}', maybe the mesh is not fully triangulated?")
 
         # 5. Convert the data to a ctypes-friendly format
         vertices = [Vector3(v.co.x, v.co.y, v.co.z) for v in active_obj_to_process.data.vertices]
@@ -536,10 +541,14 @@ def call_rust(config: dict[str, str], active_obj, second_mesh=None, second_mesh_
                 indices.append(edge.vertices[0])
                 indices.append(edge.vertices[1])
         else:
+            first_indices_len = len(indices)
             # Treat second mesh as triangulated mesh (like active_obj)
-            indices += [vert_idx
-                        for face in second_obj_to_process.data.polygons
-                        for vert_idx in face.vertices]
+            if not all(len(face.vertices) == 3 for face in second_obj_to_process.data.polygons):
+                raise HallrException(f"The '{second_obj_to_process.name}' mesh is not fully triangulated!")
+            indices += [v for face in second_obj_to_process.data.polygons for v in face.vertices]
+            if len(indices)-first_indices_len == 0:
+                raise HallrException(f"No polygons found in '{second_obj_to_process.name}', maybe the mesh is not fully triangulated?")
+
 
     if active_obj_is_duplicated:
         cleanup_duplicated_object(active_obj_to_process)
@@ -627,11 +636,9 @@ def call_rust_direct(config, active_obj, use_line_chunks=False):
     else:
         config["mesh.format"] = "triangulated"
         # Collect vertices and check if the mesh is fully triangulated
-        indices = []
-        for face in active_obj_to_process.data.polygons:
-            if len(face.vertices) != 3:
-                raise HallrException("The mesh is not fully triangulated!")
-            indices.extend(face.vertices)
+        if not all(len(face.vertices) == 3 for face in active_obj_to_process.data.polygons):
+            raise HallrException("The mesh is not fully triangulated!")
+        indices = [v for face in active_obj_to_process.data.polygons for v in face.vertices]
         if len(indices) == 0:
             raise HallrException("No polygons found, maybe the mesh is not fully triangulated?")
     indices_ptr = (ctypes.c_size_t * len(indices))(*indices)

blender_addon/hallr_ffi_utils.py

@@ -103,6 +103,11 @@ def execute(self, context):
         if settings.bounding_shape is not None:
             settings.bounding_shape = None
             return {'FINISHED'}
+
+        if settings.mesh is not None and bounding_shape == settings.mesh:
+            self.report({'ERROR'}, "This object is already selected as the mesh. Please select a different object.")
+            return {'CANCELLED'}
+
         if bounding_shape.type != 'MESH':
             self.report({'ERROR'}, "The bounding shape should be of type 'MESH'.")
             settings.bounding_shape = None
@@ -135,6 +140,11 @@ def execute(self, context):
             settings.mesh = None
             return {'FINISHED'}
 
+        if settings.bounding_shape is not None and active_object == settings.bounding_shape:
+            self.report({'ERROR'},
+                        "This object is already selected as the bounding shape. Please select a different object.")
+            return {'CANCELLED'}
+
         if active_object.type != 'MESH':
             self.report({'ERROR'}, "The mesh shape should be of type 'MESH'.")
             settings.mesh = None