Remove the show_progress flag

[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 70109753518b14723001048a4de275f5642e343f..3ee06fc218c3fe1a618826eb22668b4687739e26 100644 (file)
--- a/blender/io_mspgl/export_object.py
+++ b/blender/io_mspgl/export_object.py
@@ -2,12 +2,6 @@ import os
 import mathutils
 
 class ObjectExporter:
-       def __init__(self):
-               self.show_progress = True
-               self.export_all = False
-               self.collection = False
-               self.shared_resources = 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]
@@ -45,49 +39,7 @@ class ObjectExporter:
                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_atlases=None):
+       def export_object_resources(self, context, obj, resources, material_atlases, progress):
                if material_atlases is None:
                        material_atlases = {}
 
@@ -121,29 +73,28 @@ 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):
-               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")
 
                lods = self.collect_object_lods(obj)