X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=a3bedab51e95c70cdd28a62a50c7626177ca8b9d;hb=9d8e4aa5a9573b34fe06455af249c762433d47c0;hp=b7e14fdad19d0bae3ae027c31f67fb6f87ed38a4;hpb=de5d710b87879d6a0b06407da096ec505f8b7679;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py
index b7e14fda..a3bedab5 100644
--- a/blender/io_mspgl/__init__.py
+++ b/blender/io_mspgl/__init__.py
@@ -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)
@@ -34,26 +36,11 @@ class ExportMspGLMeshBase(ExportMspGLBase):
 	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)
-	export_lines = bpy.props.BoolProperty(name="Export lines", description="Export edges without faces as lines", default=False)
-	export_uv = bpy.props.EnumProperty(name="Export UV", description="Export UV coordinates", default="UNIT0",
-		items=(("NONE", "None", "No UV coordinates are exported"),
-			("UNIT0", "Unit 0", "UV coordinates for unit 0 are exported"),
-			("ALL", "All", "All UV coordinates are exported")))
-	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)
-	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"),
-			("MSPGL", "MspGL", "Compute vertex normals internally")))
-	export_groups = bpy.props.BoolProperty(name="Vertex groups", description="Export vertex groups and weights", default=False)
 
 	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.general_col = col
 
 		self.layout.separator()
@@ -66,15 +53,6 @@ class ExportMspGLMeshBase(ExportMspGLBase):
 
 		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")
@@ -102,13 +80,14 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 		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)
-	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
 		return ObjectExporter()
@@ -118,17 +97,16 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 
 		col = self.general_col
 		col.prop(self, "external_tech")
-
-		col = self.texturing_col
+		col.prop(self, "export_lods")
 		col.prop(self, "textures")
-		col.prop(self, "material_tex")
-		col.prop(self, "srgb_colors")
 
 		self.layout.separator();
 
 		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")
@@ -144,7 +122,7 @@ class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase):
 		return ArmatureExporter()
 
 class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase):
-	bl_idname = "export.mspgl_scene"
+	bl_idname = "export_scene.mspgl_scene"
 	bl_label = "Export Msp GL scene"
 
 	filename_ext = ".scene"
@@ -166,7 +144,7 @@ def menu_func_export(self, context):
 	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__)