Code review #1

Author: einarf

pywavefront/material.py

@@ -54,6 +54,21 @@ def __init__(self, name, is_default=False):
         self.emissive = [0., 0., 0., 1.]
         self.transparency = 1.0
         self.shininess = 0.
+        self.optical_density = 1.0
+        # Multiple illumination models are available, per material. These are enumerated as follows: 
+        # 0. Color on and Ambient off
+        # 1. Color on and Ambient on
+        # 2. Highlight on
+        # 3. Reflection on and Ray trace on
+        # 4. Transparency: Glass on, Reflection: Ray trace on
+        # 5. Reflection: Fresnel on and Ray trace on
+        # 6. Transparency: Refraction on, Reflection: Fresnel off and Ray trace on
+        # 7. Transparency: Refraction on, Reflection: Fresnel on and Ray trace on
+        # 8. Reflection on and Ray trace off
+        # 9. Transparency: Glass on, Reflection: Ray trace off
+        # 10. Casts shadows onto invisible surfaces
+        self.illumination_model = 0
+
         self.texture = None  # diffuse
         self.texture_ambient = None
         self.texture_specular_color = None
@@ -217,7 +232,7 @@ def parse_map_Ns(self):
 
     @auto_consume
     def parse_map_d(self):
-        """Aplha map"""
+        """Alpha map"""
         Kd = os.path.join(self.dir, " ".join(self.values[1:]))
         self.this_material.set_texture_alpha(Kd)
 
@@ -232,8 +247,8 @@ def parse_bump(self):
 
     @auto_consume
     def parse_Ni(self):
-        pass
+        self.this_material.optical_density = float(self.values[1])
 
     @auto_consume
     def parse_illum(self):
-        pass
+        self.this_material.illumination_model = float(self.values[1])

test/simple_parsetest.mtl

@@ -6,6 +6,8 @@ Kd 0.1 0.1 0.1
 Ks 0.2 0.2 0.2
 d 1.0
 Tr 0.0
+illum 2
+Ni 0.75
 map_Kd kd.png
 map_Ka ka.png
 map_Ks ks.png

test/test_material.py

@@ -17,8 +17,10 @@ def setUp(self):
 
     def testSetTexture(self):
         """Running set_texture should set a texture."""
-        self.assertEqual(self.material.texture.__class__, pywavefront.texture.Texture)
-        self.assertEqual(self.material.texture_ambient.__class__, pywavefront.texture.Texture)
+        self.assertEqual(self.material.texture.__class__,
+                         pywavefront.texture.Texture)
+        self.assertEqual(self.material.texture_ambient.__class__,
+                         pywavefront.texture.Texture)
 
         self.assertEqual(self.material.texture.path, prepend_dir('4x4.png'))
         self.assertEqual(self.material.texture_ambient.path, prepend_dir('4x4.png'))

test/test_parser.py

@@ -158,7 +158,6 @@ def setUp(self):
 
     def testMtlName(self):
         """Parsing an obj file with known material names should set those names."""
-        print(self.materials)
         self.assertIn('Material.simple', self.materials.keys())
         self.assertIn('Material2.simple', self.materials.keys())
 
@@ -184,6 +183,12 @@ def testMtlSpecular(self):
     def testMtlTransparency(self):
         self.assertEqual(self.material1.transparency, 1.0)
 
+    def testMtlIllum(self):
+        self.assertEqual(self.material1.illumination_model, 2)
+
+    def testMtlNi(self):
+        self.assertEqual(self.material1.optical_density, 0.75)
+
     def testTextures(self):
         self.assertEqual(self.material1.texture.path, prepend_dir('kd.png'))
         self.assertEqual(self.material1.texture_ambient.path, prepend_dir('ka.png'))