From: Mikko Rasa Date: Thu, 15 Apr 2021 16:20:37 +0000 (+0300) Subject: Revise export function parameter orders X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=f241ccca7d0d3f3073a948377bd557a70aa8f1d2;p=libs%2Fgl.git Revise export function parameter orders --- diff --git a/blender/io_mspgl/export_material.py b/blender/io_mspgl/export_material.py index 81c5e8bf..6abd78c2 100644 --- a/blender/io_mspgl/export_material.py +++ b/blender/io_mspgl/export_material.py @@ -57,14 +57,14 @@ class MaterialExporter: mat_name = material.name+".mat" if mat_name not in resources: if material.type: - resources[mat_name] = self.export_material(material, resources=resources) + resources[mat_name] = self.export_material(material, resources) else: resources[mat_name] = None - def export_technique(self, material, *, resources): + def export_technique(self, material, resources): return create_technique_resource(material, resources) - def export_material(self, material, *, resources): + def export_material(self, material, resources): from .datafile import Resource, Statement, Token mat_res = Resource(material.name+".mat", "material") @@ -137,5 +137,5 @@ class MaterialAtlasExporter: resources[mat_name] = mat_res - def export_technique(self, material_atlas, *, resources): + def export_technique(self, material_atlas, resources): return create_technique_resource(material_atlas, resources) diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py index 70109753..54bde96a 100644 --- a/blender/io_mspgl/export_object.py +++ b/blender/io_mspgl/export_object.py @@ -63,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 = {} @@ -87,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 = {} @@ -121,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) diff --git a/blender/io_mspgl/export_scene.py b/blender/io_mspgl/export_scene.py index 0ba4ad76..b2c3a2e6 100644 --- a/blender/io_mspgl/export_scene.py +++ b/blender/io_mspgl/export_scene.py @@ -81,7 +81,7 @@ 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: @@ -107,12 +107,12 @@ class SceneExporter: 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) + 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): + def export_scene(self, context, objs, resources, prototypes, progress): from .datafile import Resource, Statement, Token scene_res = Resource("scene.scene", "scene") diff --git a/blender/io_mspgl/mesh.py b/blender/io_mspgl/mesh.py index ca2848b6..3f9ab02e 100644 --- a/blender/io_mspgl/mesh.py +++ b/blender/io_mspgl/mesh.py @@ -795,7 +795,7 @@ class Mesh: e.key = make_edge_key(e.vertices[0].index, e.vertices[1].index) -def create_mesh_from_object(context, obj, progress, *, material_atlas=None): +def create_mesh_from_object(context, obj, material_atlas, progress): if obj.type!="MESH": raise Exception("Object is not a mesh")