X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=30dc6406402c328efbba1f02ac70ccea2ec2aaab;hb=6ee541fd39de1e1368134cb8a98a14f2f5ddd767;hp=11a22e9f4ff992be980f29bceb0732866e2c0b6d;hpb=35f3540e50fdb9f45cd8e53cbe131610aa030a68;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py
index 11a22e9f..30dc6406 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 "armature", "datafile", "export_armature", "export_mesh", "export_object", "export_scene", "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"
@@ -75,9 +64,8 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 			("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)
+	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)
 
@@ -93,16 +81,14 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 		col.prop(self, "textures")
 		col.separator()
 
-		self.layout.separator();
+		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")
+		if self.separate_mesh or self.separate_tech:
+			col.prop(self, "shared_resources")
 
 class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase):
 	bl_idname = "export.mspgl_armature"
@@ -144,7 +130,7 @@ def register():
 	bpy.types.INFO_MT_file_export.append(menu_func_export)
 
 	from .properties import register_properties
-	register_properties();
+	register_properties()
 
 def unregister():
 	bpy.utils.unregister_module(__name__)