X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=43a3fac8f691270bae32a61bd9447bd2059ad5ef;hp=a275110ee0cc2cd6b76682b526dd0c0a8fb867e8;hb=d3813a0ab6ee2f8b9af775c28b51b512abe6cd09;hpb=211d5ec0e55778ab023b1bc6bb54e2c9afa7df0c diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py index a275110e..43a3fac8 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 "animation", "armature", "datafile", "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]) @@ -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,9 +33,6 @@ 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) def draw(self, context): self.general_col = self.layout.column() @@ -44,14 +41,6 @@ class ExportMspGLMeshBase(ExportMspGLBase): 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" @@ -69,17 +58,11 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase): filename_ext = ".object" - 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 @@ -88,21 +71,14 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase): def draw(self, context): super().draw(context) - col = self.general_col - col.prop(self, "export_lods") - col.prop(self, "textures") - col.separator() - - 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" @@ -114,12 +90,49 @@ class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase): from .export_armature import ArmatureExporter return ArmatureExporter() +class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase): + bl_idname = "export.mspgl_animation" + bl_label = "Export Msp GL animation" + + filename_ext = ".anim" + + export_all = bpy.props.BoolProperty(name="Export all animations", description="Export all animations present on the selected objects' NLA tracks") + collection = bpy.props.BoolProperty(name="As a collection", description="Export the animations as a single collection file", default=True) + 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 + + super_result = super().check(context) + + return ext_changed or super_result + + def create_exporter(self): + from .export_animation import AnimationExporter + return AnimationExporter() + + def draw(self, context): + col = self.layout.column() + col.prop(self, "export_all") + if self.export_all: + col.prop(self, "collection") + col.prop(self, "looping_threshold") + class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase): bl_idname = "export_scene.mspgl_scene" bl_label = "Export Msp GL scene" 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) resource_collection = bpy.props.BoolProperty(name="Resource collection", description="Put resources to a single collection file", default=True) def create_exporter(self): @@ -128,13 +141,27 @@ 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, "resource_collection") +class ExportMspGLCamera(bpy.types.Operator, ExportMspGLBase): + bl_idname = "export.mspgl_camera" + bl_label = "Export Msp GL camera" + + filename_ext = ".camera" + + def create_exporter(self): + from .export_camera import CameraExporter + return CameraExporter() + 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(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") from .properties import MspGLMeshProperties, MspGLObjectProperties