Merge pull request #23 from SergioRAgostinho/object-less

Add support to object-less obj files

Author: Kurt Yoder

pywavefront/__init__.py

@@ -58,7 +58,6 @@ def draw(self):
 
     def add_mesh(self, the_mesh):
         self.mesh_list.append(the_mesh)
-        if not the_mesh.name: return
         self.meshes[the_mesh.name] = the_mesh
 
 class ObjParser(parser.Parser):
@@ -118,6 +117,7 @@ def parse_f(self, args):
             self.wavefront.add_mesh(self.mesh)
         if self.material is None:
             self.material = material.Material()
+            self.wavefront.materials[self.material.name] = self.material
         self.mesh.add_material(self.material)
 
         # For fan triangulation, remember first and latest vertices

pywavefront/mesh.py

@@ -39,7 +39,7 @@ class Mesh(object):
     """This is a basic mesh for drawing using OpenGL. Interestingly, it does
     not contain its own vertices. These are instead drawn via materials."""
 
-    def __init__(self, name=''):
+    def __init__(self, name=None):
         self.name = name
         self.materials = []
 

test/simple_no_object_no_mtl.obj

@@ -0,0 +1,21 @@
+# Comment
+v 0.040000 0.050000 0.060000
+v 0.010000 0.020000 0.030000
+v 0.070000 0.080000 0.090000
+vt 14.000000 15.000000
+vt 12.000000 13.000000
+vt 10.000000 11.000000
+vn 0.879800 0.471100 0.063200
+vn 0.577400 0.577400 0.577400
+vn 0.894200 0.267700 -0.359000
+v 0.040000 0.050000 0.060000
+v 0.010000 0.020000 0.030000
+v 0.070000 0.080000 0.090000
+vt 14.000000 15.000000
+vt 12.000000 13.000000
+vt 10.000000 11.000000
+vn 0.879800 0.471100 0.063200
+vn 0.577400 0.577400 0.577400
+vn 0.894200 0.267700 -0.359000
+f 1/1/1 2/2/2 3/3/3
+f 4/4/4 5/5/5 6/6/6

test/test_wavefront.py

@@ -8,35 +8,37 @@ class TestWavefront(unittest.TestCase):
     def setUp(self):
         pyglet.resource.path.append('@' + __name__)
         pyglet.resource.reindex()
+        self.mesh_names = ['Simple', 'SimpleB']
+        self.material_names = ['Material.simple', 'Material2.simple']
         self.meshes = pywavefront.Wavefront('simple.obj')
 
     def testMaterials(self):
         "Ensure parsed wavefront materials match known values."
-        self.assertEqual(len(self.meshes.materials), 2)
-        self.assertEqual(self.meshes.materials['Material.simple'].__class__,
-                pywavefront.material.Material)
+        self.assertEqual(len(self.meshes.materials), len(self.material_names))
+        self.assertEqual(self.meshes.materials[self.material_names[0]].__class__,
+                        pywavefront.material.Material)
 
     def testMeshes(self):
         "Ensure parsed wavefront meshes match known values."
-        self.assertEqual(len(self.meshes.meshes), 2)
-        self.assertEqual(self.meshes.meshes['Simple'].__class__,
+        self.assertEqual(len(self.meshes.meshes), len(self.mesh_names))
+        self.assertEqual(self.meshes.meshes[self.mesh_names[0]].__class__,
                 pywavefront.mesh.Mesh)
 
     def testMeshList(self):
         "Ensure parsed wavefront mesh list matches known values."
-        self.assertEqual(len(self.meshes.mesh_list), 2)
+        self.assertEqual(len(self.meshes.mesh_list), len(self.mesh_names))
         self.assertEqual(self.meshes.mesh_list[0].__class__,
                 pywavefront.mesh.Mesh)
 
     def testAddDuplicateMesh(self):
         "Adding a duplicate mesh should increment the mesh list, but not the meshes hash."
-        self.meshes.add_mesh(self.meshes.meshes['Simple'])
-        self.assertEqual(len(self.meshes.meshes), 2)
-        self.assertEqual(len(self.meshes.mesh_list), 3)
+        self.meshes.add_mesh(self.meshes.meshes[self.mesh_names[0]])
+        self.assertEqual(len(self.meshes.meshes), len(self.mesh_names))
+        self.assertEqual(len(self.meshes.mesh_list), len(self.mesh_names) + 1)
 
     def testMeshMaterialVertices(self):
         "Mesh vertices should have known values."
-        self.assertEqual(len(self.meshes.meshes['Simple'].materials[0].vertices), 24)
+        self.assertEqual(len(self.meshes.meshes[self.mesh_names[0]].materials[0].vertices), 24)
 
 class TestBrokenWavefront(unittest.TestCase):
     def setUp(self):
@@ -58,12 +60,19 @@ def setUp(self):
         pyglet.resource.path.append('@' + __name__)
         pyglet.resource.reindex()
         # reset the obj file to new file with no mtl line
+        self.mesh_names = ['Simple', 'SimpleB']
+        self.material_names = [None]
         self.meshes = pywavefront.Wavefront('simple_no_mtl.obj')
 
-    def testMaterials(self):
-        """Override this test"""
-        pass
-
     def testMeshMaterialVertices(self):
         "Mesh vertices should have known values."
-        self.assertEqual(len(self.meshes.meshes['Simple'].materials[0].vertices), 48)
+        self.assertEqual(len(self.meshes.meshes[self.mesh_names[0]].materials[0].vertices), 48)
+
+class TestNoObjectNoMaterial(TestNoMaterial):
+    def setUp(self):
+        pyglet.resource.path.append('@' + __name__)
+        pyglet.resource.reindex()
+        # reset the obj file to new file with no mtl line
+        self.mesh_names = [None]
+        self.material_names = [None]
+        self.meshes = pywavefront.Wavefront('simple_no_object_no_mtl.obj')