Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for meshes to primitive builders #33

Merged
merged 15 commits into from
May 16, 2024
Merged

Add support for meshes to primitive builders #33

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
27ad953
Added trimesh to depencencies
lorycontixd May 13, 2024
8acc9cd
Implemented MeshBuilder class, plus its inertia and geometry overrides
lorycontixd May 13, 2024
16e652c
Implemented 2 tests on meshbuilder
lorycontixd May 13, 2024
f10a04c
Run isort on meshbuilder tests
lorycontixd May 13, 2024
91f2332
Updated conda dependencies on github actions with trimesh
lorycontixd May 13, 2024
38a1a5c
Updated scale type hinting to numpy NDArray
lorycontixd May 14, 2024
7113789
Updated test on meshbuilder to use tempfile rather than creating file…
lorycontixd May 14, 2024
22b9816
Forced mesh type to be .stl on mesh load
lorycontixd May 14, 2024
1fbf07f
Added docstring to meshbuilder and reformatted affected files
lorycontixd May 14, 2024
d1d73f6
Added tempfile inside context for other meshbuilder test
lorycontixd May 14, 2024
07789d3
Added tempfile inside context for other meshbuilder test
lorycontixd May 14, 2024
e00ee38
Added extra type checks and extension parsig on mesh path
lorycontixd May 15, 2024
f4bffde
Removed leftover comments
lorycontixd May 15, 2024
fdc1fec
Added type checks on mesh file type
lorycontixd May 15, 2024
17d5028
Reverted extension extraction to usage of pathlib
lorycontixd May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/rod/builder/primitives.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ def __post_init__(self) -> None:
"""

if isinstance(self.mesh_path, str):
extension = pathlib.PurePath(self.mesh_path).suffix
extension = self.mesh_path.split(".")[-1]
elif isinstance(self.mesh_path, pathlib.Path):
extension = self.mesh_path.suffix
extension = str(self.mesh_path).split(".")[-1]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Last curiosity, any specific reason to go back to string?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was just not working without a suffix keyword for NamedTempFile. I can easily revert back.

else:
raise TypeError(
f"Expected str or pathlib.Path for mesh_path, got {type(self.mesh_path)}"
Expand All @@ -88,11 +88,9 @@ def __post_init__(self) -> None:
self.mesh: trimesh.base.Trimesh = trimesh.load(
str(self.mesh_path),
force="mesh",
file_type=extension.lstrip("."),
file_type=extension,
)

if not isinstance(self.scale, NDArray):
raise TypeError(f"Expected numpy.ndarray for scale, got {type(self.scale)}")
assert self.scale.shape == (
3,
), f"Scale must be a 3D vector, got {self.scale.shape}"
Expand Down
4 changes: 2 additions & 2 deletions tests/test_meshbuilder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def test_builder_creation():
mesh = trimesh.creation.box([1, 1, 1])

# Temporary write to file because rod Mesh works with uri
with tempfile.NamedTemporaryFile() as fp:
with tempfile.NamedTemporaryFile(suffix=".stl") as fp:
mesh.export(fp.name, file_type="stl")

builder = MeshBuilder(
Expand Down Expand Up @@ -40,7 +40,7 @@ def test_builder_creation_custom_mesh():
mesh = trimesh.Trimesh(vertices=vertices, faces=faces)

# Temporary write to file because rod Mesh works with uri
with tempfile.NamedTemporaryFile() as fp:
with tempfile.NamedTemporaryFile(suffix=".stl") as fp:
mesh.export(fp.name, file_type="stl")

builder = MeshBuilder(
Expand Down
Loading