X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=a8f55e92c34834a01ac0f17115b44b2d1343fd31;hb=2680cc0bf251db566753dbe9bf947ba6a4b083d2;hp=541572f5da9c309d047215d1e6f2f286147d48bd;hpb=5bf3c7175c359ad8509702a4e0790609b39e6aec;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py index 541572f5..a8f55e92 100644 --- a/blender/io_mspgl/export_object.py +++ b/blender/io_mspgl/export_object.py @@ -2,16 +2,6 @@ import os 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] p2 = max(((v.co, (v.co-p1).length) for v in obj.data.vertices), key=lambda x:x[1])[0] @@ -27,85 +17,26 @@ 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("Invalid configuration on object {}: Inconsistent LOD indices".format(obj.name)) 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_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: - objs = [o for o in context.selected_objects if o.type=="MESH"] - else: - objs = [context.active_object] - - from .util import Progress - progress = Progress(self.show_progress and context) - - path, base = os.path.split(out_fn) - base, ext = os.path.splitext(base) - - resources = {} - for i, obj in enumerate(objs): - if self.export_all: - 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) - - obj_res = self.export_object(context, obj, progress, resources=resources) - refs = obj_res.collect_references() - if not self.shared_resources: - numbers = {} - for r in refs: - res_ext = os.path.splitext(r.name)[1] - n = numbers.get(res_ext, 0) - if n>0: - r.name = "{}_{}{}".format(base, n, res_ext) - else: - r.name = base+res_ext - numbers[res_ext] = n+1 - - 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) - - progress.pop_task() - - def export_object_resources(self, context, obj, resources, progress, material_atlass=None): - if material_atlass is None: - material_atlass = {} + 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 .export_mesh import MeshExporter + from .export_material import MaterialAtlasExporter, MaterialExporter from .mesh import create_mesh_from_object - from .material import create_material_atlas - mesh_export = self.create_mesh_exporter() - material_export = self.create_material_exporter() - material_atlas_export = self.create_material_atlas_exporter() + from .material import Material, create_material_atlas + mesh_export = MeshExporter() + material_export = MaterialExporter() + material_atlas_export = MaterialAtlasExporter() for i, l in enumerate(lods): lod_index = l.lod_index if l.lod_for_parent else 0 @@ -118,40 +49,40 @@ class ObjectExporter: 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") + raise Exception("Invalid configuration on object {}: Mixed material atlas state") - if material_atlas_key in material_atlass: - material_atlas = material_atlass[material_atlas_key] + if material_atlas_key in material_atlases: + material_atlas = material_atlases[material_atlas_key] else: material_atlas = create_material_atlas(context, l.data.materials[0]) - material_atlass[material_atlas_key] = material_atlas + material_atlases[material_atlas_key] = material_atlas tech_name = "{}.tech".format(material_atlas.name) if tech_name not in resources: material_atlas_export.export_technique_resources(material_atlas, resources) - resources[tech_name] = material_atlas_export.export_technique(material_atlas, resources=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 = Material(material) 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_atlas=material_atlas) + 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): - if resources is None: - resources = {} - self.export_object_resources(context, obj, resources, progress) + def export_object(self, obj, resources, progress): + if obj.type!='MESH': + raise ValueError("Object {} is not a mesh".format(obj.name)) lods = self.collect_object_lods(obj) @@ -205,11 +136,11 @@ class ObjectExporter: return obj_res def export_stub_technique(self): - from .datafile import Resource, Statement + from .datafile import Resource, Statement, Token tech_res = Resource("stub.tech", "technique") - pass_st = Statement("pass", "") + pass_st = Statement("method", "") tech_res.statements.append(pass_st) mat_st = Statement("material") pass_st.sub.append(mat_st) - mat_st.sub.append(Statement("basic")) + mat_st.sub.append(Statement("type", Token("basic"))) return tech_res