ada-py 0.0.44.dev2__tar.gz → 0.0.45.dev4__tar.gz

{ada-py-0.0.44.dev2/src/ada_py.egg-info → ada-py-0.0.45.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ada-py
-Version: 0.0.44.dev2
+Version: 0.0.45.dev4
 Summary: Assembly for Design & Analysis - A python library for structural analysis and design
 Author-email: "Kristoffer H. Andersen" <kristoffer_andersen@outlook.com>
 Project-URL: Homepage, https://github.com/Krande/adapy

{ada-py-0.0.44.dev2 → ada-py-0.0.45.dev4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ada-py"
-version = "0.0.44-dev2"
+version = "0.0.45-dev4"
 description = "Assembly for Design & Analysis - A python library for structural analysis and design"
 readme = "README.md"
 requires-python = ">=3.10"

{ada-py-0.0.44.dev2 → ada-py-0.0.45.dev4}/src/ada/api/spatial/part.py

@@ -758,11 +758,15 @@ class Part(BackendGeom):
 
         self.to_trimesh_scene(**kwargs).export(gltf_file, buffer_postprocessor=post_pro)
 
-    def to_trimesh_scene(self, render_override: dict[str, GeomRepr | str] = None, filter_by_guids=None):
+    def to_trimesh_scene(
+        self, render_override: dict[str, GeomRepr | str] = None, filter_by_guids=None, merge_meshes=True
+    ):
         from ada.occ.tessellating import BatchTessellator
 
         bt = BatchTessellator()
-        return bt.tessellate_part(self)
+        return bt.tessellate_part(
+            self, merge_meshes=merge_meshes, render_override=render_override, filter_by_guids=filter_by_guids
+        )
 
     def to_stp(
         self,

{ada-py-0.0.44.dev2 → ada-py-0.0.45.dev4}/src/ada/fem/exceptions/model_definition.py

@@ -15,3 +15,7 @@ class FemSetNameExists(Exception):
         self.name = name
         self.message = f"FemSet {name} already exists"
         super(FemSetNameExists, self).__init__(self.message)
+
+
+class DoesNotSupportMultiPart(Exception):
+    pass

{ada-py-0.0.44.dev2 → ada-py-0.0.45.dev4}/src/ada/fem/formats/sesam/write/writer.py

@@ -7,6 +7,7 @@ from typing import TYPE_CHECKING
 from ada.config import logger
 from ada.core.utils import Counter, get_current_user
 from ada.fem import FEM
+from ada.fem.exceptions.model_definition import DoesNotSupportMultiPart
 
 from .templates import top_level_fem_str
 from .write_utils import write_ff
@@ -31,7 +32,7 @@ def to_fem(assembly, name, analysis_dir=None, metadata=None, model_data_only=Fal
 
     parts = list(filter(lambda x: len(x.fem.nodes) > 0, assembly.get_all_subparts(include_self=True)))
     if len(parts) != 1:
-        raise ValueError(f"Sesam writer currently only works for a single part. Currently found {len(parts)}")
+        raise DoesNotSupportMultiPart(f"Sesam writer currently only works for a single part. Currently found {len(parts)}")
 
     if len(assembly.fem.steps) > 1:
         logger.error("Sesam writer currently only supports 1 step. Will only use 1st step")

{ada-py-0.0.44.dev2 → ada-py-0.0.45.dev4}/src/ada/occ/tessellating.py

@@ -178,7 +178,7 @@ class BatchTessellator:
                 logger.error(e)
                 continue
 
-    def tessellate_part(self, part: Part, filter_by_guids=None, render_override=None) -> trimesh.Scene:
+    def tessellate_part(self, part: Part, filter_by_guids=None, render_override=None, merge_meshes=True) -> trimesh.Scene:
         graph = part.get_graph_store()
         scene = trimesh.Scene(base_frame=graph.top_level.name)
 
@@ -189,8 +189,12 @@ class BatchTessellator:
 
         all_shapes = sorted(shapes_tess_iter, key=lambda x: x.material)
         for mat_id, meshes in groupby(all_shapes, lambda x: x.material):
-            merged_store = concatenate_stores(meshes)
-            merged_mesh_to_trimesh_scene(scene, merged_store, self.get_mat_by_id(mat_id), mat_id, graph)
+            if merge_meshes:
+                merged_store = concatenate_stores(meshes)
+                merged_mesh_to_trimesh_scene(scene, merged_store, self.get_mat_by_id(mat_id), mat_id, graph)
+            else:
+                for mesh_store in meshes:
+                    merged_mesh_to_trimesh_scene(scene, mesh_store, self.get_mat_by_id(mat_id), mat_id, graph)
 
         shell_color = Color.from_str("white")
         shell_color_id = self.add_color(shell_color)

{ada-py-0.0.44.dev2 → ada-py-0.0.45.dev4}/src/ada/visit/gltf/store.py

@@ -188,7 +188,11 @@ class GltfMergeStore:
 
 
 def merged_mesh_to_trimesh_scene(
-    scene: trimesh.Scene, merged_mesh: MergedMesh, pbr_mat: dict | Color, buffer_id: int, graph_store: GraphStore
+    scene: trimesh.Scene,
+    merged_mesh: MergedMesh | MeshStore,
+    pbr_mat: dict | Color,
+    buffer_id: int,
+    graph_store: GraphStore,
 ):
     vertices = merged_mesh.position.reshape(int(len(merged_mesh.position) / 3), 3)
     if merged_mesh.type == MeshType.TRIANGLES:

{ada-py-0.0.44.dev2 → ada-py-0.0.45.dev4/src/ada_py.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ada-py
-Version: 0.0.44.dev2
+Version: 0.0.45.dev4
 Summary: Assembly for Design & Analysis - A python library for structural analysis and design
 Author-email: "Kristoffer H. Andersen" <kristoffer_andersen@outlook.com>
 Project-URL: Homepage, https://github.com/Krande/adapy