X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=133b844c2a7d6152f833c58f320f2b54b3c94779;hb=f77259ba680e73daee6008f53dafe92e84a0b5f5;hp=a3bedab51e95c70cdd28a62a50c7626177ca8b9d;hpb=9d8e4aa5a9573b34fe06455af249c762433d47c0;p=libs%2Fgl.git diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py index a3bedab5..133b844c 100644 --- a/blender/io_mspgl/__init__.py +++ b/blender/io_mspgl/__init__.py @@ -7,7 +7,7 @@ bl_info = { if "bpy" in locals(): import imp - for sub in "armature", "export_armature", "export_mesh", "export_object", "export_scene", "mesh", "outfile", "properties", "util": + for sub in "armature", "datafile", "export_armature", "export_material", "export_mesh", "export_object", "export_scene", "export_texture", "mesh", "properties", "util": if sub in locals(): imp.reload(locals()[sub]) @@ -20,7 +20,7 @@ class ExportMspGLBase(ExportHelper): def execute(self, context): exporter = self.create_exporter() self.prepare_exporter(exporter) - exporter.export(context, self.filepath) + exporter.export_to_file(context, self.filepath) return {"FINISHED"} def create_exporter(self): @@ -33,30 +33,14 @@ class ExportMspGLBase(ExportHelper): class ExportMspGLMeshBase(ExportMspGLBase): use_strips = bpy.props.BoolProperty(name="Use strips", description="Combine faces into triangle strips", default=True) use_degen_tris = bpy.props.BoolProperty(name="Use degen tris", description="Concatenate triangle strips with degenerate triangles", default=False) - max_strip_len = bpy.props.IntProperty(name="Max strip length", description="Maximum length for a triangle strip", default=1024, min=4, max=16384) - optimize_cache = bpy.props.BoolProperty(name="Optimize cache", description="Optimize element order for vertex cache", default=True) - cache_size = bpy.props.IntProperty(name="Cache size", description="Simulated vertex cache size used in optimization", default=64, min=8, max=1024) - compound = bpy.props.BoolProperty(name="Compound", description="Combine all selected objects into one for exporting", default=False) def draw(self, context): - col = self.layout.column() - col.prop(self, "compound") - self.general_col = col - - self.layout.separator() + self.general_col = self.layout.column() col = self.layout.column() col.label("Triangle strips") col.prop(self, "use_strips") col.prop(self, "use_degen_tris") - col.prop(self, "max_strip_len") - - self.layout.separator() - - col = self.layout.column() - col.label("Vertex cache") - col.prop(self, "optimize_cache") - col.prop(self, "cache_size") class ExportMspGLMesh(bpy.types.Operator, ExportMspGLMeshBase): bl_idname = "export_mesh.mspgl_mesh" @@ -74,19 +58,11 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase): filename_ext = ".object" - external_tech = bpy.props.BoolProperty(name="External technique", description="Use an external technique specified in the object's properties", default=True) - - textures = bpy.props.EnumProperty(name="Textures", description="Export textures", default="REF", - items=(("NONE", "None", "Ignore textures"), - ("REF", "Referenced", "Reference external data"), - ("INLINE", "Inline", "Embed textures in the object"))) - - separate_mesh = bpy.props.BoolProperty(name="Separate mesh", description="Write mesh data into a separate file", default=False) - shared_mesh = bpy.props.BoolProperty(name="Shared mesh", description="Use mesh name for mesh file to enable sharing", default=True) - separate_tech = bpy.props.BoolProperty(name="Separate technique", description="Write technique data into a separate file", default=False) - shared_tech = bpy.props.BoolProperty(name="Shared technique", description="Use material name for technique file to enable sharing", default=True) + single_file = bpy.props.BoolProperty(name="Single file", description="Write all data into a single file", default=True) + shared_resources = bpy.props.BoolProperty(name="Shared resources", description="Use global names for resource files to enable sharing", default=True) export_lods = bpy.props.BoolProperty(name="Export LoDs", description="Export all levels of detail", default=True) + use_textures = bpy.props.BoolProperty(name="Use textures", description="Use textures in the exported object", default=True) def create_exporter(self): from .export_object import ObjectExporter @@ -95,21 +71,14 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase): def draw(self, context): super().draw(context) - col = self.general_col - col.prop(self, "external_tech") - col.prop(self, "export_lods") - col.prop(self, "textures") - - self.layout.separator(); + self.general_col.prop(self, "export_lods") + self.general_col.prop(self, "use_textures") col = self.layout.column() col.label("Files") - col.prop(self, "separate_mesh") - if self.separate_mesh: - col.prop(self, "shared_mesh") - col.prop(self, "separate_tech") - if self.separate_tech: - col.prop(self, "shared_tech") + col.prop(self, "single_file") + if not self.single_file: + col.prop(self, "shared_resources") class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase): bl_idname = "export.mspgl_armature" @@ -127,7 +96,6 @@ class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase): filename_ext = ".scene" - external_tech = bpy.props.BoolProperty(name="External techniques", description="Use external techniques specified in objects' properties", default=True) resource_collection = bpy.props.BoolProperty(name="Resource collection", description="Put resources to a single collection file", default=True) def create_exporter(self): @@ -152,7 +120,7 @@ def register(): bpy.types.INFO_MT_file_export.append(menu_func_export) from .properties import register_properties - register_properties(); + register_properties() def unregister(): bpy.utils.unregister_module(__name__)