X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=54bde96a5d29962f2ad9bac4279d0fe77d67a2ce;hb=f241ccca7d0d3f3073a948377bd557a70aa8f1d2;hp=dcb5623f06a24bd632e43c82bdba2a9bd887f2b7;hpb=b35fe097720395c09332cf0813ef6218acb551b6;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py index dcb5623f..54bde96a 100644 --- a/blender/io_mspgl/export_object.py +++ b/blender/io_mspgl/export_object.py @@ -4,13 +4,9 @@ import mathutils class ObjectExporter: def __init__(self): self.show_progress = True - self.use_strips = True - self.use_degen_tris = False - self.use_textures = True self.export_all = False self.collection = False self.shared_resources = True - self.export_lods = True def compute_bounding_sphere(self, obj): p1 = max(((v.co, v.co.length) for v in obj.data.vertices), key=lambda x:x[1])[0] @@ -27,31 +23,27 @@ class ObjectExporter: def collect_object_lods(self, obj): lods = [obj] - if self.export_lods: - lods += sorted([c for c in obj.children if c.lod_for_parent], key=(lambda l: l.lod_index)) - for i, l in enumerate(lods): - if i>0 and l.lod_index!=i: - raise Exception("Inconsistent LOD indices") + lods += sorted([c for c in obj.children if c.lod_for_parent], key=(lambda l: l.lod_index)) + for i, l in enumerate(lods): + if i>0 and l.lod_index!=i: + raise Exception("Inconsistent LOD indices") return lods def create_mesh_exporter(self): from .export_mesh import MeshExporter mesh_export = MeshExporter() - mesh_export.use_strips = self.use_strips - mesh_export.use_degen_tris = self.use_degen_tris return mesh_export def create_material_exporter(self): from .export_material import MaterialExporter material_export = MaterialExporter() - 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() - return material_map_export + def create_material_atlas_exporter(self): + from .export_material import MaterialAtlasExporter + material_atlas_export = MaterialAtlasExporter() + return material_atlas_export def export_to_file(self, context, out_fn): if self.export_all: @@ -71,9 +63,9 @@ class ObjectExporter: out_fn = os.path.join(path, obj.name+ext) progress.push_task_slice(obj.name, i, len(objs)) - self.export_object_resources(context, obj, resources, progress) + self.export_object_resources(context, obj, resources, None, progress) - obj_res = self.export_object(context, obj, progress, resources=resources) + obj_res = self.export_object(context, obj, resources, progress) refs = obj_res.collect_references() if not self.shared_resources: numbers = {} @@ -95,63 +87,63 @@ class ObjectExporter: progress.pop_task() - def export_object_resources(self, context, obj, resources, progress, material_maps=None): - if material_maps is None: - material_maps = {} + def export_object_resources(self, context, obj, resources, material_atlases, progress): + if material_atlases is None: + material_atlases = {} lods = self.collect_object_lods(obj) from .mesh import create_mesh_from_object - from .material import create_material_map + from .material import create_material_atlas mesh_export = self.create_mesh_exporter() material_export = self.create_material_exporter() - material_map_export = self.create_material_map_exporter() + material_atlas_export = self.create_material_atlas_exporter() for i, l in enumerate(lods): lod_index = l.lod_index if l.lod_for_parent else 0 progress.push_task_slice("LOD {}".format(lod_index), i, len(lods)) - material_map = None - mapped_count = sum(m.render_mode!='EXTERNAL' and m.material_map for m in l.data.materials if m) - if mapped_count: + material_atlas = None + atlas_flags = [m.render_mode!='EXTERNAL' and m.material_atlas for m in l.data.materials if m] + if any(atlas_flags): 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: + material_atlas_key = mmk(l.data.materials[0]) + key_mismatch = any(mmk(m)!=material_atlas_key for m in l.data.materials) + if not all(atlas_flags) or key_mismatch: raise Exception("Conflicting settings in object materials") - if material_map_key in material_maps: - material_map = material_maps[material_map_key] + if material_atlas_key in material_atlases: + material_atlas = material_atlases[material_atlas_key] else: - material_map = create_material_map(context, l.data.materials[0]) - material_maps[material_map_key] = material_map + material_atlas = create_material_atlas(context, l.data.materials[0]) + material_atlases[material_atlas_key] = material_atlas - tech_name = "{}.tech".format(material_map.name) + tech_name = "{}.tech".format(material_atlas.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) + material_atlas_export.export_technique_resources(material_atlas, resources) + resources[tech_name] = material_atlas_export.export_technique(material_atlas, resources) elif l.material_slots and l.material_slots[0].material: material = l.material_slots[0].material 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) + resources[tech_name] = material_export.export_technique(material, resources) elif "stub.tech" not in resources: resources["stub.tech"] = self.export_stub_technique() mesh_name = l.data.name+".mesh" if mesh_name not in resources: - mesh = create_mesh_from_object(context, l, progress, material_map=material_map) + mesh = create_mesh_from_object(context, l, material_atlas, progress) mesh_res = mesh_export.export_mesh(context, mesh, progress) resources[mesh_name] = mesh_res progress.pop_task() - def export_object(self, context, obj, progress, *, resources=None): + def export_object(self, context, obj, resources, progress): if resources is None: resources = {} - self.export_object_resources(context, obj, resources, progress) + self.export_object_resources(context, obj, resources, None, progress) lods = self.collect_object_lods(obj) @@ -177,19 +169,21 @@ class ObjectExporter: if l.material_slots: material = l.material_slots[0].material if material: - if material.material_map: - tech_res = resources["material_map_{}.tech".format(os.path.splitext(material.technique)[0])] + if material.render_mode=='EXTERNAL': + tech_name = material.technique + elif material.material_atlas: + tech_name = "material_atlas_{}.tech".format(os.path.splitext(material.technique)[0]) else: - tech_res = resources[material.name+".tech"] + tech_name = material.name+".tech" else: - tech_res = resources["stub.tech"] + tech_name = "stub.tech" - if tech_res.name!=prev_tech: + if tech_name!=prev_tech: if material and material.render_mode=='EXTERNAL': lod_st.append(Statement("technique", material.technique)) else: - lod_st.append(obj_res.create_reference_statement("technique", tech_res)) - prev_tech = tech_res.name + lod_st.append(obj_res.create_reference_statement("technique", resources[tech_name])) + prev_tech = tech_name if i>0: st = Statement("level_of_detail", i)