X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_scene.py;h=b2c3a2e671b6f12c8ded80ee8a1dbee098b9d7ed;hb=f241ccca7d0d3f3073a948377bd557a70aa8f1d2;hp=ac812abf7b115766ab0c08af3848614a4ff99ab4;hpb=475c875fd12e264f093a88c8c4dc52ee13991569;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py index ac812abf..b2c3a2e6 100644 --- 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.active_layers = True + self.visible_collections = True self.resource_collection = True self.skip_existing = True self.show_progress = True @@ -14,9 +14,9 @@ class SceneExporter: objs = context.selected_objects else: objs = context.scene.objects - if self.active_layers: - layers = context.scene.layers - objs = [o for o in objs if any(a and b for a, b in zip(layers, o.layers))] + if self.visible_collections: + 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 (not o.compound or o.parent not in objs)] objs.sort(key=lambda x:x.name) @@ -30,21 +30,21 @@ class SceneExporter: object_prototypes = {} unique_objects = [] export_names = {} + used_names = set() for o in objs: if o.name in object_prototypes: continue clones = [o] - if not any(s.link=="OBJECT" for s in o.material_slots): - for u in objs: - if u is o: - continue - if u.data.name!=o.data.name: - continue - if any(s.link=="OBJECT" for s in u.material_slots): - continue + for u in objs: + if u is o: + continue + if u.data.name!=o.data.name: + continue + if any(m1.name!=m2.name for m1, m2 in zip(o.material_slots, u.material_slots)): + continue - clones.append(u) + clones.append(u) prefix = o.name for c in clones: @@ -55,12 +55,23 @@ class SceneExporter: prefix = prefix[:pos] if prefix: - export_names[o.name+".object"] = prefix.strip(" .")+".object" + export_names[o.name+".object"] = prefix.strip(" .") + else: + used_names.add(o.name) unique_objects.append(o) for c in clones: object_prototypes[c.name] = o + for n, e in export_names.items(): + if e in used_names: + number = 1 + while "{}_{}".format(e, number) in used_names: + number += 1 + e += "_{}".format(number) + export_names[n] = e+".object" + used_names.add(e) + from .util import Progress progress = Progress(self.show_progress and context) @@ -70,54 +81,42 @@ class SceneExporter: 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: - from .datafile import Statement - keywords = { ".mat": "material", - ".mesh": "mesh", - ".object": "object", - ".tech": "technique", - ".tex2d": "texture2d" } - with open(os.path.join(path, base+"_resources.mdc"), "w") as res_out: - for r in refs: - if self.skip_existing and os.path.exists(os.path.join(path, r.name)): - continue - - st = Statement(keywords[os.path.splitext(r.name)[1]], r.name) - st.sub = r.statements - st.write_to_file(res_out) + filter = 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) else: res_dir = os.path.join(path, base+"_resources") if not os.path.exists(res_dir): os.makedirs(res_dir) for r in refs: - with open(os.path.join(res_dir, r.name), "w") as res_out: - for s in r.statements: - s.write_to_file(res_out) + r.write_to_file(os.path.join(res_dir, r.name)) - with open(out_fn, "w") as out_file: - for s in scene_res.statements: - s.write_to_file(out_file) + 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_maps = {} + 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_maps=material_maps) + 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, progress, resources=resources) + resources[obj_name] = object_export.export_object(context, o, resources, progress) progress.pop_task() - def export_scene(self, context, objs, progress, *, prototypes, resources): - from .datafile import Resource, Statement - scene_res = Resource("scene.scene") + 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"]