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..1df5347098571a3a84d25db46f1df91c3626d229 100644 (file)
--- a/blender/io_mspgl/export_material.py
+++ b/blender/io_mspgl/export_material.py
@@ -7,10 +7,14 @@ def create_technique_resource(material, resources):
        mat_res = resources[material.name+".mat"]
 
        st = Statement("pass", "")
-       st.sub.append(tech_res.create_embed_statement("material", mat_res))
+       if mat_res:
+               st.sub.append(tech_res.create_embed_statement("material", mat_res))
 
        if material.render_mode=='CUSTOM':
-               st.sub.append(Statement("shader", material.shader))
+               shader = material.shader
+               if shader.endswith(".glsl"):
+                       shader += ".shader"
+               st.sub.append(Statement("shader", shader))
 
        tech_res.statements.append(st)
 
@@ -48,7 +52,10 @@ class MaterialExporter:
 
                mat_name = material.name+".mat"
                if mat_name not in resources:
-                       resources[mat_name] = self.export_material(material, resources=resources)
+                       if material.type:
+                               resources[mat_name] = self.export_material(material, resources=resources)
+                       else:
+                               resources[mat_name] = None
 
        def export_technique(self, material, *, resources):
                return create_technique_resource(material, resources)
@@ -57,14 +64,16 @@ class MaterialExporter:
                from .datafile import Resource, Statement
                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))
+               if material.type!="pbr":
+                       raise Exception("Can't export unknown material type "+material.type)
+
+               st = Statement(material.type)
+               for p in material.properties:
+                       ss = self.create_property_statement(mat_res, p, 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 if p.texture).__next__()
                        if first_tex and not first_tex.default_filter:
                                from .export_texture import SamplerExporter
                                sampler_export = SamplerExporter()
@@ -73,21 +82,22 @@ 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, resources):
                from .datafile import Statement
                if self.use_textures and prop.texture:
                        tex_res = resources[prop.texture.image.name+".tex2d"]
-                       fn = os.path.basename(prop.texture.image.filepath)
+                       from .util import basename
+                       fn = basename(prop.texture.image.filepath)
                        if prop.texture.default_filter and fn:
-                               return Statement(keyword+"_map", fn)
+                               return Statement(prop.tex_keyword, fn)
                        else:
-                               return mat_res.create_reference_statement(keyword+"_map", tex_res)
-               elif tex_only:
+                               return mat_res.create_reference_statement(prop.tex_keyword, tex_res)
+               elif not prop.keyword:
                        return
                elif type(prop.value)==tuple:
-                       return Statement(keyword, *prop.value)
+                       return Statement(prop.keyword, *prop.value)
                else:
-                       return Statement(keyword, prop.value)
+                       return Statement(prop.keyword, prop.value)
 
 
 class MaterialMapExporter: