Refactor material property handling in the Blender exporter

[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 4ce892dbba742bb711d76eab69c09da3d40e218a..2df04ff6e4b5512228697d48c92ea2580e9f9707 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -36,7 +36,7 @@ class MaterialExporter:
                material = Material(material)
 
                if self.use_textures:
-                       for p in material.properties:
+                       for p in material.properties.values():
                                if p.texture:
                                        tex_name = p.texture.image.name+".tex2d"
                                        if tex_name not in resources:
@@ -58,13 +58,12 @@ class MaterialExporter:
                mat_res = Resource(material.name+".mat", "material")
 
                st = Statement("pbr")
-               st.sub.append(self.create_property_statement(mat_res, material.base_color, "base_color", resources))
-               st.sub.append(self.create_property_statement(mat_res, material.metalness, "metalness", resources))
-               st.sub.append(self.create_property_statement(mat_res, material.roughness, "roughness", resources))
-               st.sub.append(self.create_property_statement(mat_res, material.normal, "normal", resources, tex_only=True))
-               st.sub.append(self.create_property_statement(mat_res, material.emission, "emission", resources))
+               for kw, p in material.properties.items():
+                       ss = self.create_property_statement(mat_res, p, kw, resources)
+                       if ss:
+                               st.sub.append(ss)
                if self.use_textures:
-                       first_tex = (p.texture for p in material.properties if p.texture).__next__
+                       first_tex = (p.texture for p in material.properties.values() if p.texture).__next__()
                        if first_tex and not first_tex.default_filter:
                                from .export_texture import SamplerExporter
                                sampler_export = SamplerExporter()
@@ -73,7 +72,7 @@ class MaterialExporter:
 
                return mat_res
 
-       def create_property_statement(self, mat_res, prop, keyword, resources, *, tex_only=False):
+       def create_property_statement(self, mat_res, prop, keyword, resources):
                from .datafile import Statement
                if self.use_textures and prop.texture:
                        tex_res = resources[prop.texture.image.name+".tex2d"]
@@ -82,7 +81,7 @@ class MaterialExporter:
                                return Statement(keyword+"_map", fn)
                        else:
                                return mat_res.create_reference_statement(keyword+"_map", tex_res)
-               elif tex_only:
+               elif prop.value is None:
                        return
                elif type(prop.value)==tuple:
                        return Statement(keyword, *prop.value)