Merge pull request #38 from einarf/parser-revamp

Parser revamp preparing to support different vertex formats

Author: Kurt Yoder

.gitignore

@@ -5,3 +5,7 @@ build
 MANIFEST
 dist
 *.swp
+.idea
+*.egg-info
+.venv
+

example/pyglet_demo.py

@@ -1,22 +1,22 @@
 #!/usr/bin/env python
 """This script shows an example of using the PyWavefront module."""
+import ctypes
 import sys
+
 sys.path.append('..')
-import ctypes
 
 import pyglet
 from pyglet.gl import *
 
-import pywavefront.visualization
+from pywavefront import visualization
+import pywavefront
 
 rotation = 0
-
 meshes = pywavefront.Wavefront('uv_sphere.obj')
-
 window = pyglet.window.Window()
-
 lightfv = ctypes.c_float * 4
 
+
 @window.event
 def on_resize(width, height):
     glMatrixMode(GL_PROJECTION)
@@ -25,6 +25,7 @@ def on_resize(width, height):
     glMatrixMode(GL_MODELVIEW)
     return True
 
+
 @window.event
 def on_draw():
     window.clear()
@@ -33,19 +34,23 @@ def on_draw():
     glLightfv(GL_LIGHT0, GL_POSITION, lightfv(-1.0, 1.0, 1.0, 0.0))
     glEnable(GL_LIGHT0)
 
-    glTranslated(0, 0, -3)
-    glRotatef(rotation, 0, 1, 0)
-    glRotatef(-25, 1, 0, 0)
-    glRotatef(45, 0, 0, 1)
+    glTranslated(0.0, 0.0, -3.0)
+    glRotatef(rotation, 0.0, 1.0, 0.0)
+    glRotatef(-25.0, 1.0, 0.0, 0.0)
+    glRotatef(45.0, 0.0, 0.0, 1.0)
+
     glEnable(GL_LIGHTING)
 
-    meshes.draw()
+    visualization.draw(meshes)
+
 
 def update(dt):
     global rotation
-    rotation += 90*dt
-    if rotation > 720: rotation = 0
+    rotation += 90.0 * dt
+
+    if rotation > 720.0:
+        rotation = 0.0
 
-pyglet.clock.schedule(update)
 
+pyglet.clock.schedule(update)
 pyglet.app.run()

example/pyglet_demo2.py

@@ -1,62 +1,78 @@
 #!/usr/bin/env python
 """This script shows another example of using the PyWavefront module."""
 # This example was created by intrepid94
+import ctypes
 import sys
 sys.path.append('..')
-import ctypes
 
 import pyglet
 from pyglet.gl import *
 
+from pywavefront import visualization
 from pywavefront import Wavefront
-import pywavefront.visualization
-
-rotation = 0
 
+rotation = 0.0
 meshes = Wavefront('earth.obj')
+window = pyglet.window.Window(1024, 720, caption='Demo', resizable=True)
+lightfv = ctypes.c_float * 4
+label = pyglet.text.Label(
+    'Hello, world',
+    font_name='Times New Roman',
+    font_size=12,
+    x=800, y=700,
+    anchor_x='center', anchor_y='center')
 
-window = pyglet.window.Window(1024, 720, caption = 'Demo', resizable = True)
 
-lightfv = ctypes.c_float * 4
-label = pyglet.text.Label('Hello, world', font_name = 'Times New Roman', font_size = 12, x = 800, y = 700, anchor_x = 'center', anchor_y = 'center')
 @window.event
 def on_resize(width, height):
     glMatrixMode(GL_PROJECTION)
     glLoadIdentity()
-    gluPerspective(40.0, float(width)/height, 1, 100.0)
+    gluPerspective(40.0, float(width) / height, 1.0, 100.0)
     glEnable(GL_DEPTH_TEST)
     glMatrixMode(GL_MODELVIEW)
     return True
 
+
 @window.event
 def on_draw():
     window.clear()
+
     glLoadIdentity()
-    glLightfv(GL_LIGHT0, GL_POSITION, lightfv(-40, 200, 100, 0.0))
+
+    glLightfv(GL_LIGHT0, GL_POSITION, lightfv(-40.0, 200.0, 100.0, 0.0))
     glLightfv(GL_LIGHT0, GL_AMBIENT, lightfv(0.2, 0.2, 0.2, 1.0))
     glLightfv(GL_LIGHT0, GL_DIFFUSE, lightfv(0.5, 0.5, 0.5, 1.0))
     glEnable(GL_LIGHT0)
     glEnable(GL_LIGHTING)
+
     glEnable(GL_COLOR_MATERIAL)
     glEnable(GL_DEPTH_TEST)
     glShadeModel(GL_SMOOTH)
+
     glMatrixMode(GL_MODELVIEW)
+
     # glTranslated(0, 4, -8)
- #    glRotatef(90, 0, 1, 0)
- #    glRotatef(-60, 0, 0, 1)
-   # Rotations for sphere on axis - useful
+    # glRotatef(90, 0, 1, 0)
+    # glRotatef(-60, 0, 0, 1)
+
+    # Rotations for sphere on axis - useful
     glTranslated(0, .8, -20)
     glRotatef(-66.5, 0, 0, 1)
     glRotatef(rotation, 1, 0, 0)
     glRotatef(90, 0, 0, 1)
     glRotatef(0, 0, 1, 0)
-    meshes.draw()
+
+    visualization.draw(meshes)
+
+
 def update(dt):
     global rotation
+
     rotation += 45 * dt
-    if rotation > 720: 
-       rotation = 0
 
-pyglet.clock.schedule(update)
+    if rotation > 720.0:
+        rotation = 0.0
 
+
+pyglet.clock.schedule(update)
 pyglet.app.run()

profiler.py

@@ -0,0 +1,27 @@
+import cProfile
+import pstats
+import sys
+
+try:
+    from StringIO import StringIO
+except:
+    from io import StringIO
+
+
+if len(sys.argv) < 2:
+    print("Usage: profiler.py <obj file>")
+    exit(1)
+
+# Run the profiler
+pr = cProfile.Profile()
+pr.enable()
+import pywavefront
+pywavefront.Wavefront(sys.argv[1])
+pr.disable()
+
+# Print the stats
+s = StringIO()
+sortby = 'tottime'
+ps = pstats.Stats(pr, stream=s).sort_stats(sortby)
+ps.print_stats()
+print(s.getvalue())

pywavefront/__init__.py

@@ -31,121 +31,6 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 # ----------------------------------------------------------------------------
-import os
-
-import pywavefront.material
-import pywavefront.mesh
-import pywavefront.parser
-
-
-class PywavefrontException(Exception):
-    pass
-
-
-class Wavefront(object):
-    """Import a wavefront .obj file."""
-    def __init__(self, file_name):
-        self.file_name = file_name
-
-        self.materials = {}
-        self.meshes = {}        # Name mapping
-        self.mesh_list = []     # Also includes anonymous meshes
-
-        ObjParser(self, self.file_name)
-
-    def draw(self):
-        for this_mesh in self.mesh_list:
-            this_mesh.draw()
-
-    def add_mesh(self, the_mesh):
-        self.mesh_list.append(the_mesh)
-        self.meshes[the_mesh.name] = the_mesh
-
-
-class ObjParser(parser.Parser):
-    """This parser parses lines from .obj files."""
-
-    def __init__(self, wavefront, file_name):
-        super(ObjParser, self).__init__(file_name)
-        self.wavefront = wavefront
-
-        self.mesh = None
-        self.material = None
-        self.vertices = [[0., 0., 0.]]
-        self.normals = [[0., 0., 0.]]
-        self.tex_coords = [[0., 0.]]
-        self.read_file()
-
-    # methods for parsing types of wavefront lines
-    def parse_v(self, args):
-        self.vertices.append(list(map(float, args[0:3])))
-
-    def parse_vn(self, args):
-        self.normals.append(list(map(float, args[0:3])))
-
-    def parse_vt(self, args):
-        self.tex_coords.append(list(map(float, args[0:2])))
-
-    def parse_mtllib(self, args):
-        mtllib = os.path.join(self.dir, " ".join(args))
-        materials = material.MaterialParser(mtllib).materials
-        for material_name, material_object in materials.items():
-            self.wavefront.materials[material_name] = material_object
-
-    def parse_usemtl(self, args):
-        [usemtl] = args
-        self.material = self.wavefront.materials.get(usemtl, None)
-        if self.material is None:
-            raise PywavefrontException('Unknown material: %s' % args[0])
-        if self.mesh is not None:
-            self.mesh.add_material(self.material)
-
-    def parse_usemat(self, args):
-        self.parse_usemtl(args)
-
-    def parse_o(self, args):
-        [o] = args
-        self.mesh = mesh.Mesh(o)
-        self.wavefront.add_mesh(self.mesh)
-
-    def parse_f(self, args):
-        if (len(self.tex_coords) > 1) and (len(self.normals) == 1): 
-            # does the spec allow for texture coordinates without normals?
-            # if we allow this condition, the user will get a black screen
-            # which is really confusing
-            raise PywavefrontException('Found texture coordinates, but no normals')
-
-        if self.mesh is None:
-            self.mesh = mesh.Mesh()
-            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
-        v1 = None
-        vlast = None
-        for i, v in enumerate(args[0:]):
-            if type(v) is bytes:
-                v = v.decode()
-            v_index, t_index, n_index = \
-                (list(map(int, [j or 0 for j in v.split('/')])) + [0, 0])[:3]
-            if v_index < 0:
-                v_index += len(self.vertices) - 1
-            if t_index < 0:
-                t_index += len(self.tex_coords) - 1
-            if n_index < 0:
-                n_index += len(self.normals) - 1
-            vertex = list(self.tex_coords[t_index]) + \
-                     list(self.normals[n_index]) + \
-                     list(self.vertices[v_index]) 
-
-            if i >= 3:
-                # Triangulate
-                self.material.vertices += v1 + vlast
-            self.material.vertices += vertex
-
-            if i == 0:
-                v1 = vertex
-            vlast = vertex
+from pywavefront.exceptions import PywavefrontException
+from pywavefront.obj import ObjParser
+from pywavefront.wavefront import Wavefront

pywavefront/exceptions.py

@@ -0,0 +1,5 @@
+
+
+class PywavefrontException(Exception):
+    """Generic exception for this package to separate from common ones"""
+    pass