X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2Fexport_object.py;h=040f5302f060536c708c0bb9a0300a3c12444317;hb=3e4e6a2c15b5a61f6e713e12290cd10e82b20513;hp=177641c83ddf21eecfe7bfd6d9dd4f2659d800b1;hpb=160293feec7b0b976856685153cd24c7f1ce9492;p=libs%2Fgl.git diff --git a/blender/io_mspgl/export_object.py b/blender/io_mspgl/export_object.py index 177641c8..040f5302 100644 --- a/blender/io_mspgl/export_object.py +++ b/blender/io_mspgl/export_object.py @@ -24,32 +24,19 @@ class ObjectExporter: return lods - def create_mesh_exporter(self): - from .export_mesh import MeshExporter - mesh_export = MeshExporter() - return mesh_export - - def create_material_exporter(self): - from .export_material import MaterialExporter - material_export = MaterialExporter() - return material_export - - def create_material_atlas_exporter(self): - from .export_material import MaterialAtlasExporter - material_atlas_export = MaterialAtlasExporter() - return material_atlas_export - def export_object_resources(self, context, obj, resources, material_atlases, progress): if material_atlases is None: material_atlases = {} lods = self.collect_object_lods(obj) + from .export_mesh import MeshExporter + from .export_material import MaterialAtlasExporter, MaterialExporter from .mesh import create_mesh_from_object - from .material import create_material_atlas - mesh_export = self.create_mesh_exporter() - material_export = self.create_material_exporter() - material_atlas_export = self.create_material_atlas_exporter() + from .material import Material, create_material_atlas + mesh_export = MeshExporter() + material_export = MaterialExporter() + material_atlas_export = MaterialAtlasExporter() for i, l in enumerate(lods): lod_index = l.lod_index if l.lod_for_parent else 0 @@ -148,11 +135,11 @@ class ObjectExporter: return obj_res def export_stub_technique(self): - from .datafile import Resource, Statement + from .datafile import Resource, Statement, Token tech_res = Resource("stub.tech", "technique") - pass_st = Statement("pass", "") + pass_st = Statement("method", "") tech_res.statements.append(pass_st) mat_st = Statement("material") pass_st.sub.append(mat_st) - mat_st.sub.append(Statement("basic")) + mat_st.sub.append(Statement("type", Token("basic"))) return tech_res