X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=a86ee26b878dd67596c5fba58a01f8d545136a4b;hb=4cb7dfca6cf5b2b9fcffd0107181f0c5410adf87;hp=cbd009a150080a9f9ec67369a47b9299a69c184b;hpb=bde3ec824d300e9aff11914406fb76dd9016e387;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py index cbd009a1..a86ee26b 100644 --- a/blender/io_mspgl/export_object.py +++ b/blender/io_mspgl/export_object.py @@ -7,7 +7,7 @@ class ObjectExporter: self.use_strips = True self.use_degen_tris = False self.use_textures = True - self.single_file = True + self.collection = False self.shared_resources = True self.export_lods = True @@ -44,14 +44,12 @@ class ObjectExporter: def create_material_exporter(self): from .export_material import MaterialExporter material_export = MaterialExporter() - material_export.single_file = self.single_file material_export.use_textures = self.use_textures return material_export def create_material_map_exporter(self): from .export_material import MaterialMapExporter material_map_export = MaterialMapExporter() - material_map_export.single_file = self.single_file return material_map_export def export_to_file(self, context, out_fn): @@ -79,14 +77,12 @@ class ObjectExporter: r.name = base+ext numbers[ext] = n+1 - for r in refs: - with open(os.path.join(path, r.name), "w") as out_file: - for s in r.statements: - s.write_to_file(out_file) - - with open(out_fn, "w") as out_file: - for s in obj_res.statements: - s.write_to_file(out_file) + if self.collection: + obj_res.write_collection(out_fn) + else: + for r in refs: + r.write_to_file(os.path.join(path, r.name)) + obj_res.write_to_file(out_fn) def export_object_resources(self, context, obj, resources, progress, material_maps=None): if material_maps is None: @@ -105,29 +101,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) + 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() @@ -147,7 +145,7 @@ class ObjectExporter: lods = self.collect_object_lods(obj) from .datafile import Resource, Statement - obj_res = Resource(obj.name+".object") + obj_res = Resource(obj.name+".object", "object") statements = obj_res.statements center, radius = self.compute_bounding_sphere(obj) @@ -160,10 +158,7 @@ class ObjectExporter: if l.data.name!=prev_mesh: mesh_res = resources[l.data.name+".mesh"] - if not self.single_file: - lod_st.append(obj_res.create_reference_statement("mesh", mesh_res)) - else: - lod_st.append(obj_res.create_embed_statement("mesh", mesh_res)) + lod_st.append(obj_res.create_reference_statement("mesh", mesh_res)) prev_mesh = l.data.name @@ -172,19 +167,17 @@ class ObjectExporter: material = l.material_slots[0].material if material: if material.material_map: - tech_res = resources["material_map_{}.tech".format(material.technique)] + tech_res = resources["material_map_{}.tech".format(os.path.splitext(material.technique)[0])] else: tech_res = resources[material.name+".tech"] else: 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)) else: - lod_st.append(obj_res.create_embed_statement("technique", tech_res)) + lod_st.append(obj_res.create_reference_statement("technique", tech_res)) prev_tech = tech_res.name if i>0: @@ -200,6 +193,10 @@ class ObjectExporter: def export_stub_technique(self): from .datafile import Resource, Statement - tech_res = Resource("stub.tech") - tech_res.statements.append(Statement("pass", "")) + tech_res = Resource("stub.tech", "technique") + 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