Revise export function parameter orders

[libs/gl.git] / blender / io_mspgl / export_object.py

diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py
index 68a8e93823737c5d695d3065978c30deb3c5ce76..54bde96a5d29962f2ad9bac4279d0fe77d67a2ce 100644 (file)
--- 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,25 +23,21 @@ 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_atlas_exporter(self):
@@ -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,7 +87,7 @@ class ObjectExporter:
 
                        progress.pop_task()
 
-       def export_object_resources(self, context, obj, resources, progress, material_atlases=None):
+       def export_object_resources(self, context, obj, resources, material_atlases, progress):
                if material_atlases is None:
                        material_atlases = {}
 
@@ -129,29 +121,29 @@ class ObjectExporter:
                                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_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):
+       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)