X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=blender%2Fio_mspgl%2F__init__.py;h=bcb196c3a87db1128cebec1f1045577b8a8dfa1f;hb=a25ac71f574649a95cf7f05f3ccad1b5d8ef2655;hp=4c5fa8c22ce735f4322396ed01e120ee0827e14e;hpb=8cea7c616aa74f2bb23d41ece5e4ef1f59f9e4b4;p=libs%2Fgl.git diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py index 4c5fa8c2..bcb196c3 100644 --- a/blender/io_mspgl/__init__.py +++ b/blender/io_mspgl/__init__.py @@ -1,5 +1,6 @@ bl_info = { "name": "Msp GL datafiles", + "blender": (2, 80, 0), "author": "Mikko Rasa", "location": "File > Export", "description": "Export Msp GL data", @@ -17,6 +18,14 @@ from bpy_extras.io_utils import ExportHelper class ExportMspGLBase(ExportHelper): show_progress = bpy.props.BoolProperty(name="Show progress", description="Display progress indicator while exporting", default=True) + def set_extension(self, ext): + ext_changed = (ext!=self.filename_ext) + if ext_changed: + if self.filepath.endswith(self.filename_ext): + self.filepath = self.filepath[:-len(self.filename_ext)] + self.filename_ext = ext + return ext_changed + def execute(self, context): exporter = self.create_exporter() self.prepare_exporter(exporter) @@ -38,7 +47,7 @@ class ExportMspGLMeshBase(ExportMspGLBase): self.general_col = self.layout.column() col = self.layout.column() - col.label("Triangle strips") + col.label(text="Triangle strips") col.prop(self, "use_strips") col.prop(self, "use_degen_tris") @@ -58,12 +67,17 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase): filename_ext = ".object" - single_file = bpy.props.BoolProperty(name="Single file", description="Write all data into a single file", default=True) + collection = bpy.props.BoolProperty(name="As a collection", description="Write all data into a single collection file", default=False) 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 check(self, context): + ext_changed = self.set_extension(".mdc" if self.collection else ".object") + super_result = super().check(context) + return ext_changed or super_result + def create_exporter(self): from .export_object import ObjectExporter return ObjectExporter() @@ -75,10 +89,9 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase): self.general_col.prop(self, "use_textures") col = self.layout.column() - col.label("Files") - col.prop(self, "single_file") - if not self.single_file: - col.prop(self, "shared_resources") + col.label(text="Files") + col.prop(self, "collection") + col.prop(self, "shared_resources") class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase): bl_idname = "export.mspgl_armature" @@ -101,17 +114,8 @@ class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase): looping_threshold = bpy.props.FloatProperty(name="Looping threshold", description="Tolerance for curve beginning and end values for looping", min=0.0, soft_max=1.0, precision=4, default=0.001) def check(self, context): - result = False - - ext = ".mdc" if self.export_all and self.collection else ".anim" - ext_changed = (ext!=self.filename_ext) - if ext_changed: - if self.filepath.endswith(self.filename_ext): - self.filepath = self.filepath[:-len(self.filename_ext)] - self.filename_ext = ext - + ext_changed = self.set_extension(".mdc" if self.export_all and self.collection else ".anim") super_result = super().check(context) - return ext_changed or super_result def create_exporter(self): @@ -132,7 +136,7 @@ class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase): filename_ext = ".scene" selected_only = bpy.props.BoolProperty(name="Selected objects only", description="Only export the selected objects") - active_layers = bpy.props.BoolProperty(name="Active layers only", description="Only export objects on the active layers", default=True) + visible_collections = bpy.props.BoolProperty(name="Visible collections only", description="Only export objects in visible collections", default=True) resource_collection = bpy.props.BoolProperty(name="Resource collection", description="Put resources to a single collection file", default=True) skip_existing = bpy.props.BoolProperty(name="Skip existing files", description="Skip resources that already exist as files", default=True) @@ -143,7 +147,7 @@ class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase): def draw(self, context): col = self.layout.column() col.prop(self, "selected_only") - col.prop(self, "active_layers") + col.prop(self, "visible_collections") col.prop(self, "resource_collection") if self.resource_collection: col.prop(self, "skip_existing") @@ -166,20 +170,22 @@ def menu_func_export(self, context): self.layout.operator(ExportMspGLScene.bl_idname, text="Msp GL scene") self.layout.operator(ExportMspGLCamera.bl_idname, text="Msp GL camera") -from .properties import MspGLMeshProperties, MspGLObjectProperties +classes = [ExportMspGLMesh, ExportMspGLObject, ExportMspGLArmature, ExportMspGLAnimation, ExportMspGLScene, ExportMspGLCamera] def register(): - bpy.utils.register_module(__name__) + for c in classes: + bpy.utils.register_class(c) - bpy.types.INFO_MT_file_export.append(menu_func_export) + bpy.types.TOPBAR_MT_file_export.append(menu_func_export) from .properties import register_properties register_properties() def unregister(): - bpy.utils.unregister_module(__name__) + for c in classes: + bpy.utils.unregister_class(c) - bpy.types.INFO_MT_file_export.remove(menu_func_export) + bpy.types.TOPBAR_MT_file_export.remove(menu_func_export) -if __name__=="__main__": - register() + from .properties import unregister_properties + unregister_properties()