voxel fix and remote loading

Author: mikedh

.travis.yml

@@ -1,11 +1,13 @@
 language: python
 sudo: required
 dist: trusty
+
 python:
 - '2.7'
 - '3.4'
 - '3.5'
 - '3.6'
+
 before_deploy:
 - sudo apt-get install pandoc -y
 - pip install pypandoc
@@ -38,14 +40,14 @@ deploy:
   api_key: $GITHUB_TOKEN
   skip_cleanup: true
   file: "../trimesh-$TMVERSION.tar.gz"
-  on:
-    tags: true
+
 before_install:
 - sudo apt-get update
 - sudo apt-get install -y openscad blender meshlab xvfb
 - sudo wget https://github.com/mikedh/v-hacd-1/raw/master/bin/linux/testVHACD --quiet
   -P /usr/bin
 - sudo chmod +x /usr/bin/testVHACD
+
 install:
 - if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then wget --quiet https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
   -O miniconda.sh; else wget --quiet https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
@@ -61,6 +63,7 @@ install:
 - source activate test-environment
 - pip install .
 - pip install pytest pytest-cov coveralls
+
 script:
 - python -c "import trimesh"
 - conda install scikit-image rtree shapely

setup.py

@@ -55,6 +55,7 @@
                                'sympy',
                                'msgpack',
                                'pillow',
+                               'requests',
                                'colorlog'],
                       'all': ['lxml',
                               'pyglet',
@@ -67,6 +68,7 @@
                               'python-fcl',
                               'colorlog',
                               'xxhash',
+                              'requests',
                               'pillow',
                               'setuptools']}
       )

tests/test_collision.py

@@ -28,50 +28,51 @@ def test_collision(self):
         m.add_object('cube1', cube, tf1)
 
         ret = m.in_collision_single(cube)
-        self.assertTrue(ret == True)
+        assert ret == True
 
         ret, names, data = m.in_collision_single(cube,
                                                  tf1,
                                                  return_names=True,
                                                  return_data=True)
-        self.assertTrue(ret == True)
+
+        assert ret == True
         assert all(len(i.point) == 3 for i in data)
 
         if 'cube1' not in names:
             print('\n\n', m._objs.keys(), names)
-        self.assertTrue('cube1' in names)
+        assert 'cube1' in names
 
         ret, names, data = m.in_collision_single(cube,
                                                  tf2,
                                                  return_names=True,
                                                  return_data=True)
-        self.assertTrue(ret == False)
-        self.assertTrue(len(names) == 0)
+        assert ret == False
+        assert len(names) == 0
         assert all(len(i.point) == 3 for i in data)
 
         # Test internal collision checking and object
         # addition/removal/modification
         ret = m.in_collision_internal()
-        self.assertTrue(ret == False)
+        assert ret == False
 
         m.add_object('cube2', cube, tf1)
         ret, names = m.in_collision_internal(return_names=True)
-        self.assertTrue(ret == True)
-        self.assertTrue(('cube1', 'cube2') in names)
-        self.assertTrue(('cube0', 'cube1') not in names)
-        self.assertTrue(('cube2', 'cube1') not in names)
+        assert ret == True
+        assert ('cube1', 'cube2') in names
+        assert ('cube0', 'cube1') not in names
+        assert ('cube2', 'cube1') not in names
 
         m.set_transform('cube2', tf2)
         ret = m.in_collision_internal()
-        self.assertTrue(ret == False)
+        assert ret == False
 
         m.set_transform('cube2', tf1)
         ret = m.in_collision_internal()
-        self.assertTrue(ret == True)
+        assert ret == True
 
         m.remove_object('cube2')
         ret = m.in_collision_internal()
-        self.assertTrue(ret == False)
+        assert ret == False
 
         # Test manager-to-manager collision checking
         m = g.trimesh.collision.CollisionManager()
@@ -82,17 +83,17 @@ def test_collision(self):
         n.add_object('cube0', cube, tf2)
 
         ret = m.in_collision_other(n)
-        self.assertTrue(ret == False)
+        assert ret == False
 
         n.add_object('cube3', cube, tf1)
 
         ret = m.in_collision_other(n)
-        self.assertTrue(ret == True)
+        assert ret == True
 
         ret, names = m.in_collision_other(n, return_names=True)
-        self.assertTrue(ret == True)
-        self.assertTrue(('cube1', 'cube3') in names)
-        self.assertTrue(('cube3', 'cube1') not in names)
+        assert ret == True
+        assert ('cube1', 'cube3') in names
+        assert ('cube3', 'cube1') not in names
 
     def test_distance(self):
         # Ensure that FCL is importable
@@ -121,42 +122,42 @@ def test_distance(self):
         m.add_object('cube1', cube, tf1)
 
         dist = m.min_distance_single(cube)
-        self.assertTrue(g.np.isclose(dist, 4.0))
+        assert g.np.isclose(dist, 4.0)
 
         dist, name = m.min_distance_single(cube, return_name=True)
-        self.assertTrue(g.np.isclose(dist, 4.0))
-        self.assertTrue(name == 'cube1')
+        assert g.np.isclose(dist, 4.0)
+        assert name == 'cube1'
 
         m.add_object('cube2', cube, tf2)
 
         dist, name = m.min_distance_single(cube, tf3, return_name=True)
-        self.assertTrue(g.np.isclose(dist, 2.0))
-        self.assertTrue(name == 'cube1')
+        assert g.np.isclose(dist, 2.0)
+        assert name == 'cube1'
 
         dist, name = m.min_distance_single(cube, tf4, return_name=True)
-        self.assertTrue(g.np.isclose(dist, 2.0))
-        self.assertTrue(name == 'cube2')
+        assert g.np.isclose(dist, 2.0)
+        assert name == 'cube2'
 
         # Test internal distance checking and object
         # addition/removal/modification
         dist = m.min_distance_internal()
-        self.assertTrue(g.np.isclose(dist, 9.0))
+        assert g.np.isclose(dist, 9.0)
 
         dist, names = m.min_distance_internal(return_names=True)
-        self.assertTrue(g.np.isclose(dist, 9.0))
-        self.assertTrue(names == ('cube1', 'cube2'))
+        assert g.np.isclose(dist, 9.0)
+        assert names == ('cube1', 'cube2')
 
         m.add_object('cube3', cube, tf3)
 
         dist, names = m.min_distance_internal(return_names=True)
-        self.assertTrue(g.np.isclose(dist, 2.0))
-        self.assertTrue(names == ('cube1', 'cube3'))
+        assert g.np.isclose(dist, 2.0)
+        assert names == ('cube1', 'cube3')
 
         m.set_transform('cube3', tf4)
 
         dist, names = m.min_distance_internal(return_names=True)
-        self.assertTrue(g.np.isclose(dist, 2.0))
-        self.assertTrue(names == ('cube2', 'cube3'))
+        assert g.np.isclose(dist, 2.0)
+        assert names == ('cube2', 'cube3')
 
         # Test manager-to-manager distance checking
         m = g.trimesh.collision.CollisionManager()
@@ -167,14 +168,14 @@ def test_distance(self):
         n.add_object('cube0', cube, tf2)
 
         dist, names = m.min_distance_other(n, return_names=True)
-        self.assertTrue(g.np.isclose(dist, 4.0))
-        self.assertTrue(names == ('cube0', 'cube0'))
+        assert g.np.isclose(dist, 4.0)
+        assert names == ('cube0', 'cube0')
 
         n.add_object('cube4', cube, tf4)
 
         dist, names = m.min_distance_other(n, return_names=True)
-        self.assertTrue(g.np.isclose(dist, 1.0))
-        self.assertTrue(names == ('cube0', 'cube4'))
+        assert g.np.isclose(dist, 1.0)
+        assert names == ('cube0', 'cube4')
 
     def test_scene(self):
         try:

tests/test_loaded.py

@@ -20,6 +20,17 @@ def test_obj_groups(self):
         # check to make sure there is signal not just zeros
         assert mesh.metadata['face_groups'].ptp() > 0
 
+    def test_remote(self):
+        """
+        Try loading a remote mesh using requests
+        """
+        # get a unit cube from project's github
+        mesh = g.trimesh.io.load.load_remote(
+            url='https://github.com/mikedh/trimesh/raw/master/models/unit_cube.STL')
+
+        assert g.np.isclose(mesh.volume, 1.0)
+        assert isinstance(mesh, g.trimesh.Trimesh)
+
     def test_obj_quad(self):
         mesh = g.get_mesh('quadknot.obj')
         # make sure some data got loaded

tests/test_voxel.py

@@ -7,9 +7,9 @@
 class VoxelTest(g.unittest.TestCase):
 
     def test_voxel(self):
-        '''
+        """
         Test that voxels work at all
-        '''
+        """
         for m in [g.get_mesh('featuretype.STL'),
                   g.trimesh.primitives.Box(),
                   g.trimesh.primitives.Sphere()]:
@@ -72,6 +72,34 @@ def test_marching(self):
         except ImportError:
             g.log.info('no skimage, skipping marching cubes test')
 
+    def test_local(self):
+        """
+        Try calling local voxel functions
+        """
+        mesh = g.trimesh.creation.box()
+
+        # it should have some stuff
+        voxel = g.trimesh.voxel.local_voxelize(mesh=mesh,
+                                               point=[.5, .5, .5],
+                                               pitch=.1,
+                                               radius=5,
+                                               fill=True)
+
+        assert len(voxel[0].shape) == 3
+
+        # try it when it definitly doesn't hit anything
+        empty = g.trimesh.voxel.local_voxelize(mesh=mesh,
+                                               point=[10, 10, 10],
+                                               pitch=.1,
+                                               radius=5,
+                                               fill=True)
+
+        # try it when it is in the center of a volume
+        center = g.trimesh.voxel.local_voxelize(mesh=mesh,
+                                                point=[0, 0, 0],
+                                                pitch=.1,
+                                                radius=2,
+                                                fill=True)
 
 if __name__ == '__main__':
     g.trimesh.util.attach_to_log()

trimesh/io/load.py

@@ -104,7 +104,7 @@ def load(file_obj, file_type=None, **kwargs):
      file_type,  # str, what kind of file
      metadata,  # dict, any metadata from file name
      opened     # bool, did we open the file ourselves
-     ) = _parse_file_args(file_obj, file_type)
+     ) = parse_file_args(file_obj, file_type)
 
     if isinstance(file_obj, dict):
         # if we've been passed a dict treat it as kwargs
@@ -167,7 +167,7 @@ def load_mesh(file_obj, file_type=None, **kwargs):
     (file_obj,
      file_type,
      metadata,
-     opened) = _parse_file_args(file_obj, file_type)
+     opened) = parse_file_args(file_obj, file_type)
 
     # make sure we keep passed kwargs to loader
     # but also make sure loader keys override passed keys
@@ -221,7 +221,7 @@ def load_compressed(file_obj, file_type=None, mixed=False):
     (file_obj,
      file_type,
      metadata,
-     opened) = _parse_file_args(file_obj, file_type)
+     opened) = parse_file_args(file_obj, file_type)
 
     # a dict of 'name' : file-like object
     files = util.decompress(file_obj=file_obj,
@@ -274,6 +274,34 @@ def load_compressed(file_obj, file_type=None, mixed=False):
     return result
 
 
+def load_remote(url, **kwargs):
+    """
+    Load a mesh at a remote URL into a local trimesh object.
+
+    This must be called explicitly rather than automatically
+    from trimesh.load to ensure users don't accidentally make
+    network requests.
+
+    Parameters
+    ------------
+    url : string
+      URL containing mesh file
+    **kwargs : passed to `load`
+    """
+    # import here to keep requirement soft
+    import requests
+
+    # download the mesh
+    response = requests.get(url)
+    # wrap as file object
+    file_obj = util.wrap_as_stream(response.content)
+    # actually load
+    loaded = load(file_obj=file_obj,
+                  file_type=url,
+                  **kwargs)
+    return loaded
+
+
 def load_kwargs(*args, **kwargs):
     """
     Load geometry from a properly formatted dict or kwargs
@@ -339,10 +367,12 @@ def handle_trimesh_export():
     return handler()
 
 
-def _parse_file_args(file_obj, file_type, **kwargs):
+def parse_file_args(file_obj,
+                    file_type,
+                    **kwargs):
     """
-    Given a file_obj and a file_type, try to turn them into a file-like object
-    and a lowercase string of file type
+    Given a file_obj and a file_type try to turn them into a file-like
+    object and a lowercase string of file type.
 
     Parameters
     -----------
@@ -356,6 +386,11 @@ def _parse_file_args(file_obj, file_type, **kwargs):
                     file_obj:   the same string passed as file_obj
                     file_type:  set to 'json'
 
+               str: string is a valid URL
+                    -------------------------------------------
+                    file_obj: an open 'rb' file object with retrieved data
+                    file_type: from the extension
+
                str: string is not an existing path or a JSON-like object
                     -------------------------------------------
                     ValueError will be raised as we can't do anything with input
@@ -416,9 +451,11 @@ def _parse_file_args(file_obj, file_type, **kwargs):
                 # if a dict bracket is in the string, its probably a straight
                 # JSON
                 file_type = 'json'
+            elif 'https://' in file_obj or 'http://' in file_obj:
+                # we've been passed a URL so retrieve it
+                raise ValueError('use load_remote to load URL!')
             else:
-                raise ValueError(
-                    'File object passed as string that is not a file!')
+                raise ValueError('string is not a file!')
 
     if file_type is None:
         file_type = file_obj.__class__.__name__

trimesh/version.py

@@ -1 +1 @@
-__version__ = '2.33.19'
+__version__ = '2.33.21'