Adjust scene export code

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

diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py
index b2c3a2e671b6f12c8ded80ee8a1dbee098b9d7ed..02566ef6a3dc68b7691741d5cb47ab9bf101f693 100644 (file)
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -4,8 +4,8 @@ import os
 class SceneExporter:
        def __init__(self):
                self.selected_only = False
-               self.visible_collections = True
-               self.resource_collection = True
+               self.visible_only = True
+               self.collection = True
                self.skip_existing = True
                self.show_progress = True
 
@@ -14,19 +14,16 @@ class SceneExporter:
                        objs = context.selected_objects
                else:
                        objs = context.scene.objects
-               if self.visible_collections:
+               if self.visible_only:
                        collections = [c.collection for c in context.view_layer.layer_collection.children if not (c.hide_viewport or c.collection.hide_viewport)]
                        objs = [o for o in objs if any((o.name in c.all_objects) for c in collections)]
-               objs = [o for o in objs if o.type=="MESH" and not o.lod_for_parent]
+               objs = [o for o in objs if o.type=="MESH" and not o.lod_for_parent and o.data.vertices]
                objs = [o for o in objs if (not o.compound or o.parent not in objs)]
                objs.sort(key=lambda x:x.name)
 
                path, base = os.path.split(out_fn)
                base, ext = os.path.splitext(base)
 
-               from .export_object import ObjectExporter
-               object_export = ObjectExporter()
-
                object_prototypes = {}
                unique_objects = []
                export_names = {}
@@ -75,8 +72,11 @@ class SceneExporter:
                from .util import Progress
                progress = Progress(self.show_progress and context)
 
+               from .export import DataExporter
+               data_exporter = DataExporter()
+
                resources = {}
-               self.export_scene_resources(context, unique_objects, resources, progress)
+               data_exporter.export_resources(context, unique_objects, resources, None, progress)
                for n, r in resources.items():
                        if r.name in export_names:
                                r.name = export_names[r.name]
@@ -84,37 +84,19 @@ class SceneExporter:
                scene_res = self.export_scene(context, objs, resources, object_prototypes, progress)
                refs = scene_res.collect_references()
 
-               if self.resource_collection:
-                       filter = None
+               if self.collection:
+                       existing = None
                        if self.skip_existing:
-                               filter = lambda r: not os.path.exists(os.path.join(path, r.name))
-                       scene_res.write_collection(os.path.join(path, base+"_resources.mdc"), exclude_self=True, filter=filter)
+                               existing = lambda r: not os.path.exists(os.path.join(path, r.name))
+                       scene_res.write_collection(out_fn, filter=existing)
                else:
-                       res_dir = os.path.join(path, base+"_resources")
-                       if not os.path.exists(res_dir):
-                               os.makedirs(res_dir)
+                       scene_res.write_to_file(out_fn)
                        for r in refs:
-                               r.write_to_file(os.path.join(res_dir, r.name))
-
-               scene_res.write_to_file(out_fn)
-
-       def export_scene_resources(self, context, objs, resources, progress):
-               from .export_object import ObjectExporter
-               object_export = ObjectExporter()
-               object_export.single_file = False
-
-               material_atlases = {}
-
-               for i, o in enumerate(objs):
-                       progress.push_task_slice(o.name, i, len(objs))
-                       object_export.export_object_resources(context, o, resources, material_atlases, progress)
-                       obj_name = o.name+".object"
-                       resources[obj_name] = object_export.export_object(context, o, resources, progress)
-                       progress.pop_task()
+                               r.write_to_file(os.path.join(path, r.name))
 
        def export_scene(self, context, objs, resources, prototypes, progress):
                from .datafile import Resource, Statement, Token
-               scene_res = Resource("scene.scene", "scene")
+               scene_res = Resource(context.scene.name+".scene", "scene")
 
                scene_res.statements.append(Statement("type", Token(context.scene.scene_type.lower())))