Rework Blender material and texture export

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

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 6e399b0199f9f77b10175fe5a4a86027d29a88cc..5b81ace45e6cce1a01416e3acb49f4e51d331a78 100644 (file)
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -105,29 +105,31 @@ class ObjectExporter:
                        progress.push_task_slice("LOD {}".format(lod_index), i, len(lods))
 
                        material_map = None
-                       mapped_count = sum(m.material_map for m in l.data.materials if m)
+                       mapped_count = sum(m.render_mode!='EXTERNAL' and m.material_map for m in l.data.materials if m)
                        if mapped_count:
-                               material_map_tech = l.data.materials[0].technique
-                               tech_mismatch = any(m.technique!=material_map_tech for m in l.data.materials)
-                               if mapped_count!=len(l.data.materials) or tech_mismatch:
+                               mmk = lambda m: m.shader if m.render_mode=='CUSTOM' else ""
+                               material_map_key = mmk(l.data.materials[0])
+                               key_mismatch = any(mmk(m)!=material_map_key for m in l.data.materials)
+                               if mapped_count!=len(l.data.materials) or key_mismatch:
                                        raise Exception("Conflicting settings in object materials")
 
-                               if material_map_tech in material_maps:
-                                       material_map = material_maps[material_map_tech]
+                               if material_map_key in material_maps:
+                                       material_map = material_maps[material_map_key]
                                else:
                                        material_map = create_material_map(context, l.data.materials[0])
-                                       material_maps[material_map_tech] = material_map
+                                       material_maps[material_map_key] = material_map
 
-                               tech_name = "material_map_{}.tech".format(os.path.splitext(material_map_tech)[0])
+                               tech_name = "{}.tech".format(material_map.name)
                                if tech_name not in resources:
                                        material_map_export.export_technique_resources(material_map, resources)
                                        resources[tech_name] = material_map_export.export_technique(material_map, resources=resources)
                        elif l.material_slots and l.material_slots[0].material:
                                material = l.material_slots[0].material
-                               tech_name = material.name+".tech"
-                               if tech_name not in resources:
-                                       material_export.export_technique_resources(material, resources)
-                                       resources[tech_name] = material_export.export_technique(material, resources=resources)
+                               if material.render_mode!='EXTERNAL':
+                                       tech_name = material.name+".tech"
+                                       if tech_name not in resources:
+                                               material_export.export_technique_resources(material, resources)
+                                               resources[tech_name] = material_export.export_technique(material, resources=resources)
                        elif "stub.tech" not in resources:
                                resources["stub.tech"] = self.export_stub_technique()
 
@@ -179,7 +181,7 @@ class ObjectExporter:
                                tech_res = resources["stub.tech"]
 
                        if tech_res.name!=prev_tech:
-                               if material and not material.material_map and material.technique and not material.inherit_tech:
+                               if material and material.render_mode=='EXTERNAL':
                                        lod_st.append(Statement("technique", material.technique))
                                elif not self.single_file:
                                        lod_st.append(obj_res.create_reference_statement("technique", tech_res))
@@ -201,5 +203,9 @@ class ObjectExporter:
        def export_stub_technique(self):
                from .datafile import Resource, Statement
                tech_res = Resource("stub.tech")
-               tech_res.statements.append(Statement("pass", ""))
+               pass_st = Statement("pass", "")
+               tech_res.statements.append(pass_st)
+               mat_st = Statement("material")
+               pass_st.sub.append(mat_st)
+               mat_st.sub.append(Statement("basic"))
                return tech_res