Merge pull request #59 from einarf/texture-loading

Texture loading improvements

Author: Kurt Yoder

pywavefront/texture.py

@@ -33,13 +33,22 @@
 # ----------------------------------------------------------------------------
 import os
 
-from pywavefront.exceptions import PywavefrontException
-
 
 class Texture(object):
     def __init__(self, path):
-        self.image_name = path
+        # Treat path as part of a file uri always using forward slashes
+        self.path = path.replace('\\', os.path.sep)
         self.image = None
 
-        if not os.path.exists(path):
-            raise PywavefrontException("Requested file does not exist")
+    @property
+    def image_name(self):
+        """Wrap the old property name to not break compatibility"""
+        return self.path
+
+    @image_name.setter
+    def image_name(self, value):
+        """Wrap the old property name to not break compatibility"""
+        self.path = value
+
+    def exists(self):
+        return os.path.exists(self.path)

pywavefront/visualization.py

@@ -119,7 +119,7 @@ def gl_light(lighting):
 def bind_texture(texture):
     """Draw a single texture"""
     if not getattr(texture, 'image', None):
-        texture.image = load_image(texture.image_name)
+        texture.image = load_image(texture.path)
 
     glEnable(texture.image.target)
     glBindTexture(texture.image.target, texture.image.id)

test/test_material.py

@@ -60,7 +60,8 @@ def testSetEmissive(self):
 
 class TestInvalidMaterial(unittest.TestCase):
 
-    def testSetInvalidTexture(self):
+    def test_missing_texture(self):
         """Running set_texture with a nonexistent file should raise an exception."""
         material = pywavefront.material.Material('material')
-        self.assertRaises(Exception, material.set_texture, 'missing.file.do.not.create')
+        material.set_texture('missing.file.do.not.create')
+        self.assertFalse(material.texture.exists())

test/test_parser.py

@@ -175,7 +175,7 @@ def testMtlSpecular(self):
     def testMtlTextureName(self):
         """Parsing an obj file with known material texture should set its name."""
         # also tests d
-        self.assertEqual(self.material1.texture.image_name,
+        self.assertEqual(self.material1.texture.path,
                          prepend_dir('4x4.png'))
 
 

test/test_texture.py

@@ -13,8 +13,9 @@ class TestTexture(unittest.TestCase):
     def testPathedImageName(self):
         """For Texture objects, the image name should be the last component of the path."""
         my_texture = pywavefront.texture.Texture(prepend_dir('4x4.png'))
-        self.assertEqual(my_texture.image_name, prepend_dir('4x4.png'))
+        self.assertEqual(my_texture.path, prepend_dir('4x4.png'))
 
     def testMissingFile(self):
         """Referencing a missing texture file should raise an exception."""
-        self.assertRaises(Exception, pywavefront.texture.Texture, 'missing.file.do.not.create')
+        texture = pywavefront.texture.Texture('missing.file.do.not.create')
+        self.assertFalse(texture.exists())