X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=6e399b0199f9f77b10175fe5a4a86027d29a88cc;hp=6e91df8db2d0a0b8bf302576c0624486744945f1;hb=HEAD;hpb=64450cf937a26e267a6e7bb001b04971f3bfd35e diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py index 6e91df8d..989d6758 100644 --- a/blender/io_mspgl/export_object.py +++ b/blender/io_mspgl/export_object.py @@ -1,20 +1,6 @@ import os -import mathutils class ObjectExporter: - 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] - center = (p1+p2)/2 - radius = (p1-p2).length/2 - for v in obj.data.vertices: - d = v.co-center - if d.length>radius: - center += d*(1-radius/d.length)/2 - radius = (radius+d.length)/2 - - return center, radius - def collect_object_lods(self, obj): lods = [obj] lods += sorted([c for c in obj.children if c.lod_for_parent], key=(lambda l: l.lod_index)) @@ -24,75 +10,41 @@ class ObjectExporter: return lods - def create_mesh_exporter(self): - from .export_mesh import MeshExporter - mesh_export = MeshExporter() - return mesh_export - - def create_material_exporter(self): - from .export_material import MaterialExporter - material_export = MaterialExporter() - return material_export - - def create_material_atlas_exporter(self): - from .export_material import MaterialAtlasExporter - material_atlas_export = MaterialAtlasExporter() - return material_atlas_export - - def export_object_resources(self, context, obj, resources, material_atlases, progress): - if material_atlases is None: - material_atlases = {} - + def export_object_resources(self, ctx, obj, resources): lods = self.collect_object_lods(obj) + from .export_mesh import MeshExporter + from .export_material import 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 + mesh_export = MeshExporter() + material_export = MaterialExporter() - for i, l in enumerate(lods): + ctx.set_slices(len(lods)) + for l in 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_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_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("Invalid configuration on object {}: Mixed material atlas state") - - 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_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) - elif l.material_slots and l.material_slots[0].material: + task = ctx.next_slice("LOD {}".format(lod_index)) + + if l.material_slots and l.material_slots[0].material: material = l.material_slots[0].material + subtask = task.task(material, 0.1) if material.render_mode!='EXTERNAL': tech_name = material.name+".tech" if tech_name not in resources: - material_export.export_technique_resources(material, resources) + material = Material(material) + material_export.export_technique_resources(subtask, material, 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, material_atlas, progress) - mesh_res = mesh_export.export_mesh(context, mesh, progress) + subtask = task.task(l.data, 1.0) + mesh = create_mesh_from_object(subtask, l) + mesh_res = mesh_export.export_mesh(subtask, mesh) resources[mesh_name] = mesh_res - progress.pop_task() - - def export_object(self, obj, resources, progress): + def export_object(self, obj, resources): if obj.type!='MESH': raise ValueError("Object {} is not a mesh".format(obj.name)) @@ -102,7 +54,8 @@ class ObjectExporter: obj_res = Resource(obj.name+".object", "object") statements = obj_res.statements - center, radius = self.compute_bounding_sphere(obj) + from .util import compute_bounding_sphere + center, radius = compute_bounding_sphere([v.co for v in obj.data.vertices]) statements.append(Statement("bounding_sphere_hint", *center, radius)) prev_mesh = None @@ -122,8 +75,6 @@ class ObjectExporter: if material: 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_name = material.name+".tech" else: @@ -143,8 +94,6 @@ class ObjectExporter: else: statements += lod_st - progress.set_progress(1.0) - return obj_res def export_stub_technique(self):