X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=cf15002b096545b2e04b8783ff790407cc075f1e;hb=f657e545d461948f9d014d65c7546b26671f2828;hp=2ac3bd19f48d6f58731dbccb958218d267a66eca;hpb=fcdc70624618488c514676874006f5eddc4e63df;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py
index 2ac3bd19..cf15002b 100644
--- a/blender/io_mspgl/__init__.py
+++ b/blender/io_mspgl/__init__.py
@@ -7,14 +7,28 @@ bl_info = {
 
 if "bpy" in locals():
 	import imp
-	for sub in "export_mesh", "mesh", "outfile", "util":
+	for sub in "armature", "export_armature", "export_mesh", "mesh", "outfile", "util":
 		if sub in locals():
 			imp.reload(locals()[sub])
 
 import bpy
 from bpy_extras.io_utils import ExportHelper
 
-class ExportMspGLMeshBase(ExportHelper):
+class ExportMspGLBase(ExportHelper):
+	def execute(self, context):
+		exporter = self.create_exporter()
+		self.prepare_exporter(exporter)
+		exporter.export(context, self.filepath)
+		return {"FINISHED"}
+
+	def create_exporter(self):
+		raise Exception("create_exporter must be overridden")
+
+	def prepare_exporter(self, exporter):
+		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)
 	max_strip_len = bpy.props.IntProperty(name="Max strip length", description="Maximum length for a triangle strip", default=1024, min=4, max=16384)
@@ -32,39 +46,42 @@ class ExportMspGLMeshBase(ExportHelper):
 		items=(("NONE", "None", "No smoothing"),
 			("BLENDER", "Blender", "Use Blender's vertex normals"),
 			("MSPGL", "MspGL", "Compute vertex normals internally")))
+	export_groups = bpy.props.BoolProperty(name="Vertex groups", description="Export vertex groups and weights", default=False)
 
-	def execute(self, context):
+	def create_exporter(self):
 		from .export_mesh import MeshExporter
-		exporter = MeshExporter()
-		self.prepare_exporter(exporter)
-		exporter.export(context, self.filepath)
-		return {"FINISHED"}
-
-	def prepare_exporter(self, exporter):
-		for k, v in self.as_keywords().items():
-			setattr(exporter, k, v)
+		return MeshExporter()
 
 	def draw(self, context):
 		col = self.layout.column()
 		col.prop(self, "export_lines")
 		col.prop(self, "compound")
 		col.prop(self, "smoothing")
+		col.prop(self, "export_groups")
+
 		self.layout.separator()
+
 		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("Texturing")
+		col.prop(self, "export_uv")
+		col.prop(self, "tbn_vecs")
+		col.prop(self, "tbn_uvtex")
+		self.texturing_col = col
+
 		self.layout.separator()
+
 		col = self.layout.column()
 		col.label("Vertex cache")
 		col.prop(self, "optimize_cache")
 		col.prop(self, "cache_size")
-		self.layout.separator()
-		col = self.layout.column()
-		col.label("TBN vectors")
-		col.prop(self, "tbn_vecs")
-		col.prop(self, "tbn_uvtex")
 
 class ExportMspGLMesh(bpy.types.Operator, ExportMspGLMeshBase):
 	bl_idname = "export_mesh.mspgl_mesh"
@@ -90,15 +107,24 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 
 	def draw(self, context):
 		super().draw(context)
-		self.layout.separator()
-		col = self.layout.column()
-		col.label("Texturing")
+		col = self.texturing_col
 		col.prop(self, "textures")
 		col.prop(self, "material_tex")
 
+class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase):
+	bl_idname = "export.mspgl_armature"
+	bl_label = "Export Msp GL armature"
+
+	filename_ext = ".armature"
+
+	def create_exporter(self):
+		from .export_armature import ArmatureExporter
+		return ArmatureExporter()
+
 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")
 
 def register():
 	bpy.utils.register_module(__name__)