Merge 5298060 into ee5db2a

tests/test_bounds.py

@@ -228,14 +228,32 @@ def test_obb_order(self):
                                  b.bounds)
 
             # unordered extents and transforms
-            transform, extents = g.trimesh.bounds.oriented_bounds(b, ordered=False)
-            assert g.np.allclose(g.np.sort(extents), extents_ordered)
+            transform, extents = g.trimesh.bounds.oriented_bounds(
+                b, ordered=False)
+            assert g.np.allclose(g.np.sort(extents),
+                                 extents_ordered)
             # create a box from the unordered OBB information
             box = g.trimesh.creation.box(
                 extents=extents, transform=g.np.linalg.inv(transform))
             # make sure it is a real OBB too
             assert g.np.allclose(box.bounds, b.bounds)
 
+    def test_bounds_tree(self):
+        # test r-tree intersections
+        for dimension in (2, 3):
+            # create some (n, 2, 3) bounds
+            bounds = g.np.array([[i.min(axis=0), i.max(axis=0)]
+                                 for i in
+                                 [g.random((4, dimension))
+                                  for i in range(10)]])
+            tree = g.trimesh.util.bounds_tree(bounds)
+            for i, b in enumerate(bounds):
+                assert i in set(tree.intersection(b.ravel()))
+            # construct tree with per-row bounds
+            tree = g.trimesh.util.bounds_tree(bounds.reshape((-1, dimension * 2)))
+            for i, b in enumerate(bounds):
+                assert i in set(tree.intersection(b.ravel()))
+
 
 if __name__ == '__main__':
     g.trimesh.util.attach_to_log()

tests/test_dxf.py

@@ -28,7 +28,9 @@ def test_dxf(self):
             text = d.export(file_type='dxf')
 
             # DXF files are always pairs of lines
-            assert (len(str.splitlines(str(text))) % 2) == 0
+            lines = str.splitlines(str(text))
+            assert (len(lines) % 2) == 0
+            assert all(len(L.strip()) > 0 for L in lines)
 
             # reload the file by name and by stream
             rc = [g.trimesh.load(temp_name),

tests/test_points.py

@@ -127,9 +127,9 @@ def test_kmeans(self,
         """
         clustered = []
         for i in range(cluster_count):
-            # use repeatable random- ish coordinatez
+            # use repeatable random- ish coordinates
             clustered.append(
-                g.random((points_per_cluster, 3)) + (i * 10.0))
+                g.random((points_per_cluster, 3)) * (1e-3) + (i * 10.0))
         clustered = g.np.vstack(clustered)
 
         # run k- means clustering on our nicely separated data

tests/test_repair.py

@@ -33,8 +33,8 @@ def test_fill_holes(self):
             assert not mesh.is_volume
 
             # color some faces
-            g.trimesh.repair.broken_faces(mesh,
-                                          color=[255, 0, 0, 255])
+            g.trimesh.repair.broken_faces(
+                mesh, color=[255, 0, 0, 255])
 
             hashes.append({mesh._data.crc(),
                            mesh._data.md5(),
@@ -52,9 +52,12 @@ def test_fill_holes(self):
             hashes.append({mesh._data.crc(),
                            mesh._data.md5(),
                            mesh._data.fast_hash()})
-
             assert hashes[1] != hashes[2]
 
+            # try broken faces on a watertight mesh
+            g.trimesh.repair.broken_faces(
+                mesh, color=[255, 255, 0, 255])
+
     def test_fix_normals(self):
         for mesh in g.get_meshes(5):
             mesh.fix_normals()

trimesh/repair.py

@@ -184,7 +184,7 @@ def broken_faces(mesh, color=None):
     broken = [k for k, v in dict(adjacency.degree()).items()
               if v != 3]
     broken = np.array(broken)
-    if color is not None:
+    if color is not None and broken.size != 0:
         # if someone passed a broken color
         color = np.array(color)
         if not (color.shape == (4,) or color.shape == (3,)):

trimesh/resources/helpers/dxf_helper.py

@@ -8,6 +8,7 @@
 
 import os
 import json
+import numpy as np
 
 
 def get_json(file_name='../dxf.json.template'):
@@ -37,9 +38,17 @@ def replace_whitespace(text, SAFE_SPACE='|<^>|', insert=True):
     else:
         # replace safe space chr with whitespace
         args = (SAFE_SPACE, ' ')
-
-    return '\n'.join(line.strip().replace(*args)
-                     for line in str.splitlines(text))
+    lines = [line.strip().replace(*args)
+             for line in str.splitlines(text)]
+    # remove any blank lines
+    if any(len(L) == 0 for L in lines):
+        shaped = np.reshape(lines, (-1, 2))
+        mask = np.ones(len(shaped), dtype=np.bool)
+        for i, v in enumerate(shaped[:, 1]):
+            if len(v) == 0:
+                mask[i] = False
+        lines = shaped[mask].ravel()
+    return '\n'.join(lines)
 
 
 def write_files(template, destination='./dxf'):

trimesh/util.py

@@ -1582,7 +1582,7 @@ def bounds_tree(bounds):
 
     Parameters
     ------------
-    bounds : (n, dimension * 2) float
+    bounds : (n, dimension * 2) or (n, 2, dimension) float
       Non-interleaved bounds, i.e. for a 2D bounds tree:
         [(minx, miny, maxx, maxy), ...]
 
@@ -1596,8 +1596,14 @@ def bounds_tree(bounds):
 
     # make sure we've copied bounds
     bounds = np.array(bounds, dtype=np.float64, copy=True)
-    if len(bounds.shape) != 2:
-        raise ValueError('Bounds must be (n,dimension*2)!')
+    if len(bounds.shape) == 3:
+        # should be min-max per bound
+        if bounds.shape[1] != 2:
+            raise ValueError('bounds not (n, 2, dimension)!')
+        # reshape to one-row-per-hyperrectangle
+        bounds = bounds.reshape((len(bounds), -1))
+    elif len(bounds.shape) != 2:
+        raise ValueError('Bounds must be (n, dimension * 2)!')
 
     # check to make sure we have correct shape
     dimension = bounds.shape[1]

trimesh/version.py

@@ -1 +1 @@
-__version__ = '3.5.12'
+__version__ = '3.5.13'