Rename visible_collections to visible_only

[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 2ec85ccbddbdef3ed708ddae330d5b713fb98bea..9590fc178563609a5762cc26d81f3345a75ddb07 100644 (file)
--- a/blender/io_mspgl/export_scene.py
+++ b/blender/io_mspgl/export_scene.py
@@ -4,7 +4,7 @@ import os
 class SceneExporter:
        def __init__(self):
                self.selected_only = False
-               self.visible_collections = True
+               self.visible_only = True
                self.resource_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,13 +72,16 @@ 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]
 
-               scene_res = self.export_scene(context, objs, progress, prototypes=object_prototypes, resources=resources)
+               scene_res = self.export_scene(context, objs, resources, object_prototypes, progress)
                refs = scene_res.collect_references()
 
                if self.resource_collection:
@@ -98,24 +98,12 @@ class SceneExporter:
 
                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, progress, material_atlases=material_atlases)
-                       obj_name = o.name+".object"
-                       resources[obj_name] = object_export.export_object(context, o, progress, resources=resources)
-                       progress.pop_task()
-
-       def export_scene(self, context, objs, progress, *, prototypes, resources):
-               from .datafile import Resource, Statement
+       def export_scene(self, context, objs, resources, prototypes, progress):
+               from .datafile import Resource, Statement, Token
                scene_res = Resource("scene.scene", "scene")
 
+               scene_res.statements.append(Statement("type", Token(context.scene.scene_type.lower())))
+
                for o in objs:
                        obj_res = resources[prototypes[o.name].name+".object"]
                        st = scene_res.create_reference_statement("object", obj_res, o.name)