Update the Blender exporter for version 2.80

[libs/gl.git] / blender / io_mspgl / export_material.py

diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py
index 336ca31698e9d7b401305198040ca6da92f1d195..356186df17c5b2341e525322cc69f3607ce4513f 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -18,7 +18,7 @@ class MaterialExporter:
                if mat_name not in resources:
                        resources[mat_name] = self.export_material(material)
 
-               if self.use_textures:
+               if False and self.use_textures:
                        for s in material.texture_slots:
                                if s and s.texture.type=='IMAGE' and s.texture.image:
                                        tex_name = s.texture.name+".tex2d"
@@ -31,7 +31,7 @@ class MaterialExporter:
 
                mat_res = resources[material.name+".mat"]
                textures = {}
-               if self.use_textures:
+               if False and self.use_textures:
                        image_texture_slots = [s for s in material.texture_slots if s and s.texture.type=='IMAGE' and s.texture.image]
                        for s in image_texture_slots:
                                if s.use_map_color_diffuse:
@@ -91,18 +91,17 @@ class MaterialExporter:
                from .util import get_colormap
                cm = get_colormap(material.srgb_colors)
 
-               if any(s.use_map_color_diffuse for s in material.texture_slots if s):
+               if False and any(s.use_map_color_diffuse for s in material.texture_slots if s):
                        statements.append(Statement("diffuse", 1.0, 1.0, 1.0, 1.0))
                        amb = cm(material.ambient)
                        statements.append(Statement("ambient", amb, amb, amb, 1.0))
                else:
-                       diff = material.diffuse_color*material.diffuse_intensity
-                       statements.append(Statement("diffuse", cm(diff.r), cm(diff.g), cm(diff.b), 1.0))
-                       amb = diff*material.ambient
-                       statements.append(Statement("ambient", cm(amb.r), cm(amb.g), cm(amb.b), 1.0))
+                       diff = material.diffuse_color
+                       statements.append(Statement("diffuse", cm(diff[0]), cm(diff[1]), cm(diff[2]), 1.0))
+                       statements.append(Statement("ambient", cm(diff[0]), cm(diff[1]), cm(diff[2]), 1.0))
                spec = material.specular_color*material.specular_intensity
                statements.append(Statement("specular", cm(spec.r), cm(spec.g), cm(spec.g), 1.0))
-               statements.append(Statement("shininess", material.specular_hardness))
+               statements.append(Statement("shininess", min(2/material.roughness**2-2, 250)))
 
                return mat_res