]> git.tdb.fi Git - libs/gl.git/blobdiff - blender/io_mspgl/export_object.py
Use mesh as the task object when exporting it
[libs/gl.git] / blender / io_mspgl / export_object.py
index 3ee06fc218c3fe1a618826eb22668b4687739e26..476927af733619b7ed9754ef3f18f71eae593b4a 100644 (file)
@@ -1,59 +1,33 @@
 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))
                for i, l in enumerate(lods):
                        if i>0 and l.lod_index!=i:
-                               raise Exception("Inconsistent LOD indices")
+                               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()
-               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):
+       def export_object_resources(self, ctx, obj, resources, material_atlases):
                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):
+               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))
+                       task = ctx.next_slice("LOD {}".format(lod_index))
 
                        material_atlas = None
                        atlas_flags = [m.render_mode!='EXTERNAL' and m.material_atlas for m in l.data.materials if m]
@@ -62,12 +36,12 @@ 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_atlases:
                                        material_atlas = material_atlases[material_atlas_key]
                                else:
-                                       material_atlas = create_material_atlas(context, l.data.materials[0])
+                                       material_atlas = create_material_atlas(task.context, l.data.materials[0])
                                        material_atlases[material_atlas_key] = material_atlas
 
                                tech_name = "{}.tech".format(material_atlas.name)
@@ -76,25 +50,26 @@ class ObjectExporter:
                                        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
+                               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, material_atlas)
+                               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")
+                       raise ValueError("Object {} is not a mesh".format(obj.name))
 
                lods = self.collect_object_lods(obj)
 
@@ -102,7 +77,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
@@ -143,16 +119,14 @@ class ObjectExporter:
                        else:
                                statements += lod_st
 
-               progress.set_progress(1.0)
-
                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