X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=13375e2426795d4995e1505987210dd3c4f75476;hb=814b21ea340f17321658c4ab41e1692bea7d5198;hp=8ff358448875ad3e0b1c3b922eb3fc0d1fdc603a;hpb=4cb7dfca6cf5b2b9fcffd0107181f0c5410adf87;p=libs%2Fgl.git diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py index 8ff35844..13375e24 100644 --- a/blender/io_mspgl/__init__.py +++ b/blender/io_mspgl/__init__.py @@ -8,10 +8,11 @@ bl_info = { if "bpy" in locals(): import imp - for sub in "animation", "armature", "datafile", "export_animation", "export_armature", "export_camera", "export_material", "export_mesh", "export_object", "export_scene", "export_texture", "material", "mesh", "properties", "util": + for sub in "animation", "armature", "datafile", "export", "export_animation", "export_armature", "export_camera", "export_material", "export_mesh", "export_object", "export_scene", "export_texture", "material", "mesh", "properties", "util": if sub in locals(): imp.reload(locals()[sub]) +import os import bpy from bpy_extras.io_utils import ExportHelper @@ -39,73 +40,46 @@ class ExportMspGLBase(ExportHelper): for k, v in self.as_keywords().items(): setattr(exporter, k, v) -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) +class ExportMspGLData(bpy.types.Operator): + bl_idname = "export.mspgl_data" + bl_label = "Export Msp GL data" + bl_description = "Export object data in Msp GL format" - def draw(self, context): - self.general_col = self.layout.column() - - col = self.layout.column() - col.label(text="Triangle strips") - col.prop(self, "use_strips") - col.prop(self, "use_degen_tris") - -class ExportMspGLMesh(bpy.types.Operator, ExportMspGLMeshBase): - bl_idname = "export_mesh.mspgl_mesh" - bl_label = "Export Msp GL mesh" - - filename_ext = ".mesh" - - def create_exporter(self): - from .export_mesh import MeshExporter - return MeshExporter() - -class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase): - bl_idname = "export_mesh.mspgl_object" - bl_label = "Export Msp GL object" - - filename_ext = ".object" - - collection: bpy.props.BoolProperty(name="As a collection", description="Write all data into a single collection file", default=False) + filepath: bpy.props.StringProperty(name="File path", description="File path for exporting the data", subtype='FILE_PATH') + collection: bpy.props.BoolProperty(name="As a collection", description="Export all data as 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) + @classmethod + def poll(cls, context): + return len(context.selected_objects)>0 - 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 invoke(self, context, event): + blend_filepath = context.blend_data.filepath + if blend_filepath: + self.filepath = os.path.splitext(blend_filepath)[0]+".mdc" + else: + self.filepath = "data.mdc" + context.window_manager.fileselect_add(self) + return {'RUNNING_MODAL'} - def create_exporter(self): - from .export_object import ObjectExporter - return ObjectExporter() + def execute(self, context): + from .export import DataExporter + exporter = DataExporter() + exporter.collection = self.collection + exporter.shared_resources = self.shared_resources + exporter.export_to_file(context, self.filepath) + return {'FINISHED'} def draw(self, context): - super().draw(context) - - self.general_col.prop(self, "export_lods") - self.general_col.prop(self, "use_textures") - col = self.layout.column() col.label(text="Files") col.prop(self, "collection") col.prop(self, "shared_resources") -class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase): - bl_idname = "export.mspgl_armature" - bl_label = "Export Msp GL armature" - - filename_ext = ".arma" - - def create_exporter(self): - from .export_armature import ArmatureExporter - return ArmatureExporter() - class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase): bl_idname = "export.mspgl_animation" bl_label = "Export Msp GL animation" + bl_description = "Export one or more animations in Msp GL format" filename_ext = ".anim" @@ -132,11 +106,12 @@ class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase): class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase): bl_idname = "export_scene.mspgl_scene" bl_label = "Export Msp GL scene" + bl_description = "Export the active scene in Msp GL format" filename_ext = ".scene" selected_only: bpy.props.BoolProperty(name="Selected objects only", description="Only export the selected objects") - visible_collections: bpy.props.BoolProperty(name="Visible collections only", description="Only export objects in visible collections", default=True) + visible_only: bpy.props.BoolProperty(name="Visible 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) @@ -147,30 +122,41 @@ class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase): def draw(self, context): col = self.layout.column() col.prop(self, "selected_only") - col.prop(self, "visible_collections") + col.prop(self, "visible_only") col.prop(self, "resource_collection") if self.resource_collection: col.prop(self, "skip_existing") -class ExportMspGLCamera(bpy.types.Operator, ExportMspGLBase): - bl_idname = "export.mspgl_camera" - bl_label = "Export Msp GL camera" +class AddUniform(bpy.types.Operator): + bl_idname = "material.add_uniform" + bl_label = "Add Uniform" + bl_description = "Add a new uniform value to the material" - filename_ext = ".camera" + def execute(self, context): + mat = context.active_object.active_material + mat.uniforms.add() + mat.active_uniform_index = len(mat.uniforms)-1 - def create_exporter(self): - from .export_camera import CameraExporter - return CameraExporter() + return {"FINISHED"} + +class RemoveUniform(bpy.types.Operator): + bl_idname = "material.remove_uniform" + bl_label = "Remove Uniform" + bl_description = "Remove the selected uniform from the material" + + def execute(self, context): + mat = context.active_object.active_material + mat.uniforms.remove(mat.active_uniform_index) + mat.active_uniform_index = min(mat.active_uniform_index, len(mat.uniforms)-1) + + return {"FINISHED"} def menu_func_export(self, context): - self.layout.operator(ExportMspGLMesh.bl_idname, text="Msp GL mesh") - self.layout.operator(ExportMspGLObject.bl_idname, text="Msp GL object") - self.layout.operator(ExportMspGLArmature.bl_idname, text="Msp GL armature") + self.layout.operator(ExportMspGLData.bl_idname, text="Msp GL data") self.layout.operator(ExportMspGLAnimation.bl_idname, text="Msp GL animation") self.layout.operator(ExportMspGLScene.bl_idname, text="Msp GL scene") - self.layout.operator(ExportMspGLCamera.bl_idname, text="Msp GL camera") -classes = [ExportMspGLMesh, ExportMspGLObject, ExportMspGLArmature, ExportMspGLAnimation, ExportMspGLScene, ExportMspGLCamera] +classes = [ExportMspGLData, ExportMspGLAnimation, ExportMspGLScene, AddUniform, RemoveUniform] def register(): for c in classes: