Separate texture name and path

The fact that we only store the absulte path to the texture creates a lot of problems for users.

Author: einarf

pywavefront/material.py

@@ -130,23 +130,23 @@ def set_specular(self, values=None):
     def set_emissive(self, values=None):
         self.emissive = self.pad_light(values or [])
 
-    def set_texture(self, path):
-        self.texture = Texture(path)
+    def set_texture(self, name, path=None):
+        self.texture = Texture(name, path)
 
-    def set_texture_ambient(self, path):
-        self.texture_ambient = Texture(path)
+    def set_texture_ambient(self, name, path=None):
+        self.texture_ambient = Texture(name, path)
 
-    def set_texture_specular_color(self, path):
-        self.texture_specular_color = Texture(path)
+    def set_texture_specular_color(self, name, path=None):
+        self.texture_specular_color = Texture(name, path)
 
-    def set_texture_specular_highlight(self, path):
-        self.texture_specular_highlight = Texture(path)
+    def set_texture_specular_highlight(self, name, path=None):
+        self.texture_specular_highlight = Texture(name, path)
 
-    def set_texture_alpha(self, path):
-        self.texture_alpha = Texture(path)
+    def set_texture_alpha(self, name, path=None):
+        self.texture_alpha = Texture(name, path)
 
-    def set_texture_bump(self, path):
-        self.texture_bump = Texture(path)
+    def set_texture_bump(self, name, path=None):
+        self.texture_bump = Texture(name, path)
 
     def unset_texture(self):
         self.texture = None
@@ -210,38 +210,44 @@ def parse_Tr(self):
     @auto_consume
     def parse_map_Kd(self):
         """Diffuse map"""
-        Kd = os.path.join(self.dir, " ".join(self.values[1:]))
-        self.this_material.set_texture(Kd)
+        name = "".join(self.values[1:])
+        path = os.path.join(self.dir, name)
+        self.this_material.set_texture(name, path)
 
     @auto_consume
     def parse_map_Ka(self):
         """Ambient map"""
-        Kd = os.path.join(self.dir, " ".join(self.values[1:]))
-        self.this_material.set_texture_ambient(Kd)
+        name = "".join(self.values[1:])
+        path = os.path.join(self.dir, name)
+        self.this_material.set_texture_ambient(name, path)
 
     @auto_consume
     def parse_map_Ks(self):
         """Specular color map"""
-        Kd = os.path.join(self.dir, " ".join(self.values[1:]))
-        self.this_material.set_texture_specular_color(Kd)
+        name = "".join(self.values[1:])
+        path = os.path.join(self.dir, name)
+        self.this_material.set_texture_specular_color(name, path)
 
     @auto_consume
     def parse_map_Ns(self):
         """Specular color map"""
-        Kd = os.path.join(self.dir, " ".join(self.values[1:]))
-        self.this_material.set_texture_specular_highlight(Kd)
+        name = "".join(self.values[1:])
+        path = os.path.join(self.dir, name)
+        self.this_material.set_texture_specular_highlight(name, path)
 
     @auto_consume
     def parse_map_d(self):
         """Alpha map"""
-        Kd = os.path.join(self.dir, " ".join(self.values[1:]))
-        self.this_material.set_texture_alpha(Kd)
+        name = "".join(self.values[1:])
+        path = os.path.join(self.dir, name)
+        self.this_material.set_texture_alpha(name, path)
 
     @auto_consume
     def parse_map_bump(self):
         """Bump map"""
-        Kd = os.path.join(self.dir, " ".join(self.values[1:]))
-        self.this_material.set_texture_bump(Kd)
+        name = "".join(self.values[1:])
+        path = os.path.join(self.dir, name)
+        self.this_material.set_texture_bump(name, path)
 
     def parse_bump(self):
         self.parse_map_bump()

pywavefront/texture.py

@@ -35,20 +35,39 @@
 
 
 class Texture(object):
-    def __init__(self, path):
+    def __init__(self, name, path=None):
         # Treat path as part of a file uri always using forward slashes
-        self.path = path.replace('\\', os.path.sep)
+        self._name = name
+        self._path = path or name
+
+        # Unsed externtally by visualization
         self.image = None
 
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, value):
+        self._name = value
+
+    @property
+    def path(self):
+        return self._path
+
+    @path.setter
+    def path(self, value):
+        self._path = value
+
     @property
     def image_name(self):
         """Wrap the old property name to not break compatibility"""
-        return self.path
+        return self._name
 
     @image_name.setter
     def image_name(self, value):
         """Wrap the old property name to not break compatibility"""
-        self.path = value
+        self._name = value
 
     def exists(self):
         return os.path.exists(self.path)