X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=0731c32f92c938881f22248fa19a350534eed6f9;hp=9f7c48e1ed38493cb846397f3a3bc4cf5bfe43e8;hb=123985e47ac66903b94bd72c09d3d371f1aec61c;hpb=eb76b7a02f56d8bca6cb78a7c272b9670f7faace

diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py
index 9f7c48e1..0731c32f 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", "mesh", "outfile", "properties", "util":
+	for sub in "armature", "export_armature", "export_mesh", "export_object", "export_scene", "mesh", "outfile", "properties", "util":
 		if sub in locals():
 			imp.reload(locals()[sub])
 
@@ -15,6 +15,8 @@ import bpy
 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 execute(self, context):
 		exporter = self.create_exporter()
 		self.prepare_exporter(exporter)
@@ -54,6 +56,7 @@ class ExportMspGLMeshBase(ExportMspGLBase):
 		col.prop(self, "compound")
 		col.prop(self, "smoothing")
 		col.prop(self, "export_groups")
+		self.general_col = col
 
 		self.layout.separator()
 
@@ -95,6 +98,8 @@ 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"),
@@ -103,6 +108,11 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 	srgb_colors = bpy.props.BoolProperty(name="sRGB colors", description="Export material colors as sRGB instead of linear", default=True)
 
 	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)
+
+	export_lods = bpy.props.BoolProperty(name="Export LoDs", description="Export all levels of detail", default=True)
 
 	def create_exporter(self):
 		from .export_object import ObjectExporter
@@ -111,6 +121,10 @@ 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 = self.texturing_col
 		col.prop(self, "textures")
 		col.prop(self, "material_tex")
@@ -121,23 +135,46 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 		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")
 
 class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase):
 	bl_idname = "export.mspgl_armature"
 	bl_label = "Export Msp GL armature"
 
-	filename_ext = ".armature"
+	filename_ext = ".arma"
 
 	def create_exporter(self):
 		from .export_armature import ArmatureExporter
 		return ArmatureExporter()
 
+class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase):
+	bl_idname = "export_scene.mspgl_scene"
+	bl_label = "Export Msp GL scene"
+
+	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):
+		from .export_scene import SceneExporter
+		return SceneExporter()
+
+	def draw(self, context):
+		col = self.layout.column()
+		col.prop(self, "resource_collection")
+
 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(ExportMspGLScene.bl_idname, text="Msp GL scene")
 
-from .properties import MspGLProperties
+from .properties import MspGLMeshProperties, MspGLObjectProperties
 
 def register():
 	bpy.utils.register_module(__name__)