Merge pull request #2104 from mikedh/release/removegeom

Release: Remove Geometries Fix And Pathlib

Author: mikedh

pyproject.toml

@@ -5,7 +5,7 @@ requires = ["setuptools >= 61.0", "wheel"]
 [project]
 name = "trimesh"
 requires-python = ">=3.7"
-version = "4.0.7"
+version = "4.0.8"
 authors = [{name = "Michael Dawson-Haggerty", email = "mikedh@kerfed.com"}]
 license = {file = "LICENSE.md"}
 description = "Import, export, process, analyze and view triangular meshes."

tests/test_scenegraph.py

@@ -65,6 +65,21 @@ def test_nodes(self):
         # should have dumped the cache and removed the node
         assert node not in graph.nodes
 
+    def test_remove_geometries(self):
+        # remove geometries from a scene graph
+        scene = g.get_mesh("cycloidal.3DXML")
+
+        # only keep geometry instances of these
+        keep = {"disc_cam_A", "disc_cam_B", "vxb-6800-2rs"}
+
+        assert len(scene.duplicate_nodes) == 12
+
+        # should remove instance references except `keep`
+        scene.graph.remove_geometries(set(scene.geometry.keys()).difference(keep))
+
+        # there should now be three groups of duplicate nodes
+        assert len(scene.duplicate_nodes) == len(keep)
+
     def test_kwargs(self):
         # test the function that converts various
         # arguments into a homogeneous transformation

trimesh/scene/transforms.py

@@ -1,5 +1,6 @@
 import collections
 from copy import deepcopy
+from typing import Sequence
 
 import numpy as np
 
@@ -473,7 +474,7 @@ def geometry_nodes(self):
                 res[attr["geometry"]].append(node)
         return res
 
-    def remove_geometries(self, geometries):
+    def remove_geometries(self, geometries: Sequence):
         """
         Remove the reference for specified geometries
         from nodes without deleting the node.
@@ -498,6 +499,7 @@ def remove_geometries(self, geometries):
         # but the only property using the geometry should be
         # nodes_geometry: if this becomes not true change this to clear!
         self._cache.cache.pop("nodes_geometry", None)
+        self.transforms._hash = None
 
     def __contains__(self, key):
         return key in self.transforms.node_data

trimesh/typed.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 from typing import IO, Dict, List, Optional, Sequence, Tuple, Union
 
 # our default integer and floating point types
@@ -11,7 +12,7 @@
 
 # most loader routes take `file_obj` which can either be
 # a file-like object or a file path
-Loadable = Union[str, IO]
+Loadable = Union[str, Path, IO]
 
 __all__ = [
     "NDArray",