X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mesh_mspgl%2F__init__.py;h=e7fa07ce1928512b293c241ae3a5fb5a0fcdc53c;hb=95cc5788bd736be92b3810d3fea398fadc8865b1;hp=c6d250fb87061d9d9665b54a5281c810f96b8add;hpb=6abd9639c56e263c92d1ccc4f772d7f0fca5ce6a;p=libs%2Fgl.git

diff --git a/blender/io_mesh_mspgl/__init__.py b/blender/io_mesh_mspgl/__init__.py
index c6d250fb..e7fa07ce 100644
--- a/blender/io_mesh_mspgl/__init__.py
+++ b/blender/io_mesh_mspgl/__init__.py
@@ -14,12 +14,7 @@ if "bpy" in locals():
 import bpy
 from bpy_extras.io_utils import ExportHelper
 
-class ExportMspGL(bpy.types.Operator, ExportHelper):
-	bl_idname = "export_mesh.mspgl"
-	bl_label = "Export Msp GL data"
-
-	filename_ext = ".mesh"
-
+class ExportMspGLBase(ExportHelper):
 	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)
@@ -33,8 +28,6 @@ class ExportMspGL(bpy.types.Operator, ExportHelper):
 	tbn_vecs = bpy.props.BoolProperty(name="TBN vectors", description="Compute tangent and binormal vectors for vertices", default=False)
 	tbn_uvtex = bpy.props.StringProperty(name="TBN UV layer", description="UV layer to use as basis for TBN vectors", default="")
 	compound = bpy.props.BoolProperty(name="Compound", description="Combine all selected objects into one for exporting", default=False)
-	object = bpy.props.BoolProperty(name="Object", description="Export an object instead of a mesh", default=False)
-	material_tex = bpy.props.BoolProperty(name="Material texture", description="Generate a texture based on material colors", default=False)
 	smoothing = bpy.props.EnumProperty(name="Smoothing", description="Smoothing method to use", default="MSPGL",
 		items=(("NONE", "None", "No smoothing"),
 			("BLENDER", "Blender", "Use Blender's vertex normals"),
@@ -43,13 +36,69 @@ class ExportMspGL(bpy.types.Operator, ExportHelper):
 	def execute(self, context):
 		from . import export_mspgl
 		exporter = export_mspgl.Exporter()
-		for k, v in self.as_keywords().items():
-			setattr(exporter, k, v)
+		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)
+
+	def draw(self, context):
+		col = self.layout.column()
+		col.prop(self, "export_lines")
+		col.prop(self, "compound")
+		col.prop(self, "smoothing")
+		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("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, ExportMspGLBase):
+	bl_idname = "export_mesh.mspgl_mesh"
+	bl_label = "Export Msp GL mesh"
+
+	filename_ext = ".mesh"
+
+class ExportMspGLObject(bpy.types.Operator, ExportMspGLBase):
+	bl_idname = "export_mesh.mspgl_object"
+	bl_label = "Export Msp GL object"
+
+	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")))
+	material_tex = bpy.props.BoolProperty(name="Material texture", description="Generate a texture based on material colors", default=False)
+
+	def prepare_exporter(self, exporter):
+		super().prepare_exporter(exporter)
+		exporter.object = True
+
+	def draw(self, context):
+		super().draw(context)
+		self.layout.separator()
+		col = self.layout.column()
+		col.label("Texturing")
+		col.prop(self, "textures")
+		col.prop(self, "material_tex")
+
 def menu_func_export(self, context):
-	self.layout.operator(ExportMspGL.bl_idname, text="Msp GL")
+	self.layout.operator(ExportMspGLMesh.bl_idname, text="Msp GL mesh")
+	self.layout.operator(ExportMspGLObject.bl_idname, text="Msp GL object")
 
 def register():
 	bpy.utils.register_module(__name__)