Redesign the way shader programs are loaded

[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 2df04ff6e4b5512228697d48c92ea2580e9f9707..41ed287bd3ab1c154ad146c2d760053ff9340455 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,7 +64,10 @@ class MaterialExporter:
                from .datafile import Resource, Statement
                mat_res = Resource(material.name+".mat", "material")
 
-               st = Statement("pbr")
+               if material.type!="pbr":
+                       raise Exception("Can't export unknown material type "+material.type)
+
+               st = Statement(material.type)
                for kw, p in material.properties.items():
                        ss = self.create_property_statement(mat_res, p, kw, resources)
                        if ss:
@@ -76,7 +86,8 @@ class MaterialExporter:
                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)
                        else: