Merge pull request #47 from einarf/fixes

Various bug fixes

Author: Kurt Yoder

pywavefront/obj.py

@@ -62,6 +62,9 @@ def consume_vertices(self):
                 )
 
             self.next_line()
+            if not self.values:
+                break
+
             if self.values[0] != "v":
                 break
 
@@ -70,7 +73,7 @@ def parse_vn(self):
 
         # Since list() also consumes StopIteration we need to sanity check the line
         # to make sure the parser advances
-        if self.values[0] == "vn":
+        if self.values and self.values[0] == "vn":
             self.next_line()
 
     def consume_normals(self):
@@ -85,6 +88,9 @@ def consume_normals(self):
             )
 
             self.next_line()
+            if not self.values:
+                break
+
             if self.values[0] != "vn":
                 break
 
@@ -107,6 +113,9 @@ def consume_texture_coordinates(self):
             )
 
             self.next_line()
+            if not self.values:
+                break
+
             if self.values[0] != "vt":
                 break
 
@@ -154,7 +163,7 @@ def parse_f(self):
 
         # Since list() also consumes StopIteration we need to sanity check the line
         # to make sure the parser advances
-        if self.values[0] == "f":
+        if self.values and self.values[0] == "f":
             self.next_line()
 
     def consume_faces(self):
@@ -178,9 +187,6 @@ def consume_faces(self):
         has_vn = False
         has_colors = False
 
-        # If the face contains elements
-        triangulate = len(self.values) - 1 >= 4
-
         parts = self.values[1].split('/')
         # We assume texture coordinates are present
         if len(parts) == 2:
@@ -194,7 +200,7 @@ def consume_faces(self):
             has_vn = True
 
         # Are we referencing vertex with color info?
-        vertex = self.vertices[int(parts[0])]
+        vertex = self.vertices[int(parts[0]) - 1]
         has_colors = len(vertex) == 6
 
         # Prepare vertex format string
@@ -216,6 +222,9 @@ def consume_faces(self):
         while True:
             v1, vlast = None, None
 
+            # Do we need to triangulate? Each line may contain a varying amount of elements
+            triangulate = (len(self.values) - 1) > 3
+
             for i, v in enumerate(self.values[1:]):
                 parts = v.split('/')
                 v_index = (int(parts[0]) - 1)
@@ -269,5 +278,8 @@ def consume_faces(self):
 
             # Break out of the loop when there are no more f statements
             self.next_line()
+            if not self.values:
+                break
+
             if self.values[0] != "f":
                 break

pywavefront/parser.py

@@ -82,8 +82,6 @@ def create_line_generator(self):
                 gz = gzip.open(self.file_name, mode='rt')
 
             for line in gz.readlines():
-                if line == '':
-                    continue
                 yield line
 
             gz.close()
@@ -96,8 +94,6 @@ def create_line_generator(self):
                 file = codecs.open(self.file_name, mode='r', encoding=self.encoding)
 
             for line in file:
-                if line == '':  # Skip empty lines
-                    continue
                 yield line
 
             file.close()