Merge pull request #2113 from mikedh/up/manifold

Release: update to latest manifold3d API

Author: mikedh

docs/Makefile

@@ -21,10 +21,10 @@ example_rsts = $(foreach name, $(example_names), examples.$(name).rst)
 
 
 html: conf.py $(CONTENT)/index.rst trimesh.rst README.rst $(example_rsts) examples.rst .deps
+	cp -R "$(STATICDIR)" "$(GENDIR)/static"
 	@$(SPHINXBUILD) -M html "$(GENDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 	echo "trimesh.org" > "$(BUILDDIR)/html/CNAME"
 	touch "$(BUILDDIR)/html/.nojekyll"
-	cp -R "$(STATICDIR)/images" "$(BUILDDIR)/html/images" || true
 	cp   "$(STATICDIR)/favicon.ico" "$(BUILDDIR)/html/favicon.ico" || true
 
 .deps: requirements.txt

docs/conf.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python3
-import inspect
 import os
 
 # get version from trimesh without installing
 import trimesh
 
+_cwd = os.path.abspath(os.path.expanduser(os.path.dirname(__file__)))
 
-def abspath(rel):
+
+def abspath(rel: str) -> str:
     """
     Take paths relative to the current file and
     convert them to absolute paths.
@@ -21,10 +22,8 @@ def abspath(rel):
     abspath : str
       Absolute path, IE '/home/user/stuff'
     """
-
     # current working directory
-    cwd = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))
-    return os.path.abspath(os.path.join(cwd, rel))
+    return os.path.abspath(os.path.join(_cwd, rel))
 
 
 extensions = [
@@ -66,7 +65,7 @@ def abspath(rel):
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
+exclude_patterns = ["built", "Thumbs.db", ".DS_Store"]
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = "sphinx"
@@ -85,8 +84,8 @@ def abspath(rel):
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["static"]
-html_logo = "images/trimesh-logo.png"
+html_static_path = [abspath("static")]
+html_logo = "static/images/trimesh-logo.png"
 
 # custom css
 html_css_files = ["custom.css"]

docs/requirements.txt

@@ -1,13 +1,13 @@
-pypandoc==1.11
+pypandoc==1.12
 recommonmark==0.7.1
 jupyter==1.0.0
 
 # get sphinx version range from furo install
 furo==2023.9.10
 myst-parser==2.0.0
-pyopenssl==23.2.0
-autodocsumm==0.2.11
-jinja2==3.1.2
-matplotlib==3.8.0
-nbconvert==7.8.0
+pyopenssl==23.3.0
+autodocsumm==0.2.12
+jinja2==3.1.3
+matplotlib==3.8.2
+nbconvert==7.14.1
 

models/rock.obj.bz2

@@ -5,7 +5,7 @@ requires = ["setuptools >= 61.0", "wheel"]
 [project]
 name = "trimesh"
 requires-python = ">=3.7"
-version = "4.0.8"
+version = "4.0.9"
 authors = [{name = "Michael Dawson-Haggerty", email = "mikedh@kerfed.com"}]
 license = {file = "LICENSE.md"}
 description = "Import, export, process, analyze and view triangular meshes."
@@ -77,6 +77,7 @@ easy = [
     "scipy",
     "embreex",
     "pillow",
+    "vhacdx",
 ]
 
 recommend = [
@@ -88,8 +89,7 @@ recommend = [
     "xatlas",
     "scikit-image",
     "python-fcl",
-    "vhacdx",
-    "manifold3d"
+    "manifold3d>=2.3.0"
 ]
 
 # this is the list of everything that is ever added anywhere

pyproject.toml

@@ -54,6 +54,10 @@ def test_fileobj(self):
         # clean up
         file_obj.close()
 
+    def test_load_bz2(self):
+        mesh = g.trimesh.load(g.os.path.join(g.dir_models, "rock.obj.bz2"), force="mesh")
+        assert mesh.is_volume
+
 
 if __name__ == "__main__":
     g.trimesh.util.attach_to_log()

tests/test_loaded.py

@@ -62,6 +62,7 @@ def test_pointcloud(self):
 
         # check to see if copy works
         assert g.np.allclose(cloud.vertices, cloud.copy().vertices)
+        assert hash(cloud.visual) == hash(cloud.copy().visual)
 
     def test_empty(self):
         p = g.trimesh.PointCloud(None)

tests/test_points.py

@@ -178,6 +178,12 @@ def test_quat(self):
             g.np.linalg.norm(random_quat(num=100), axis=1), 1.0, atol=1e-6
         )
 
+    def test_angle(self):
+        assert g.np.isclose(
+            g.trimesh.transformations.angle_between_vectors(g.np.ones(3), g.np.ones(3)),
+            0.0,
+        )
+
 
 if __name__ == "__main__":
     g.trimesh.util.attach_to_log()

tests/test_transformations.py

@@ -83,8 +83,8 @@ def boolean_manifold(meshes, operation, debug=False, **kwargs):
     """
     # Convert to manifold meshes
     manifolds = [
-        Manifold.from_mesh(
-            Mesh(
+        Manifold(
+            mesh=Mesh(
                 vert_properties=np.asarray(mesh.vertices, dtype="float32"),
                 tri_verts=np.asarray(mesh.faces, dtype="int32"),
             )

trimesh/boolean.py

@@ -117,6 +117,9 @@ def export_collada(mesh, **kwargs):
                 uv = m.visual.uv
             elif m.visual.kind == "vertex":
                 colors = (m.visual.vertex_colors / 255.0)[:, :3]
+                mat.effect.diffuse = np.array(m.visual.main_color) / 255.0
+            elif m.visual.kind == "face":
+                mat.effect.diffuse = np.array(m.visual.main_color) / 255.0
         c.effects.append(mat.effect)
         c.materials.append(mat)