X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=473750a53441ec3abb591d374e25b80c16f830e3;hb=9f8b7c740f3251ba5c6d94954431709d149aafae;hp=bccff00526270aa2128d61e6d20ecd144488991c;hpb=b35fe097720395c09332cf0813ef6218acb551b6;p=libs%2Fgl.git

diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py
index bccff005..473750a5 100644
--- a/blender/io_mspgl/__init__.py
+++ b/blender/io_mspgl/__init__.py
@@ -41,8 +41,6 @@ class ExportMspGLBase(ExportHelper):
 
 class ExportMspGLMeshBase(ExportMspGLBase):
 	export_all: bpy.props.BoolProperty(name="Export all selected", description="Export all selected objects (use generated filenames)", default=False)
-	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)
 
 	def draw(self, context):
 		self.general_col = self.layout.column()
@@ -51,13 +49,11 @@ class ExportMspGLMeshBase(ExportMspGLBase):
 		if len(context.selected_objects)>1:
 			col.label(text="Object selection")
 			col.prop(self, "export_all")
-		col.label(text="Triangle strips")
-		col.prop(self, "use_strips")
-		col.prop(self, "use_degen_tris")
 
 class ExportMspGLMesh(bpy.types.Operator, ExportMspGLMeshBase):
 	bl_idname = "export_mesh.mspgl_mesh"
 	bl_label = "Export Msp GL mesh"
+	bl_description = "Export one or more meshes in Msp GL format"
 
 	filename_ext = ".mesh"
 
@@ -68,15 +64,13 @@ class ExportMspGLMesh(bpy.types.Operator, ExportMspGLMeshBase):
 class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 	bl_idname = "export_mesh.mspgl_object"
 	bl_label = "Export Msp GL object"
+	bl_description = "Export one or more objects in Msp GL format"
 
 	filename_ext = ".object"
 
 	collection: bpy.props.BoolProperty(name="As a collection", description="Write all data into a single collection file", default=False)
 	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)
-	use_textures: bpy.props.BoolProperty(name="Use textures", description="Use textures in the exported object", default=True)
-
 	def check(self, context):
 		ext_changed = self.set_extension(".mdc" if self.collection else ".object")
 		super_result = super().check(context)
@@ -89,9 +83,6 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 	def draw(self, context):
 		super().draw(context)
 
-		self.general_col.prop(self, "export_lods")
-		self.general_col.prop(self, "use_textures")
-
 		col = self.layout.column()
 		col.label(text="Files")
 		col.prop(self, "collection")
@@ -100,6 +91,7 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase):
 	bl_idname = "export.mspgl_armature"
 	bl_label = "Export Msp GL armature"
+	bl_description = "Export an armature in Msp GL format"
 
 	filename_ext = ".arma"
 
@@ -110,6 +102,7 @@ class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase):
 class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase):
 	bl_idname = "export.mspgl_animation"
 	bl_label = "Export Msp GL animation"
+	bl_description = "Export one or more animations in Msp GL format"
 
 	filename_ext = ".anim"
 
@@ -136,6 +129,7 @@ class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase):
 class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase):
 	bl_idname = "export_scene.mspgl_scene"
 	bl_label = "Export Msp GL scene"
+	bl_description = "Export the active scene in Msp GL format"
 
 	filename_ext = ".scene"
 
@@ -159,6 +153,7 @@ class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase):
 class ExportMspGLCamera(bpy.types.Operator, ExportMspGLBase):
 	bl_idname = "export.mspgl_camera"
 	bl_label = "Export Msp GL camera"
+	bl_description = "Export a camera in Msp GL format"
 
 	filename_ext = ".camera"
 
@@ -166,6 +161,30 @@ class ExportMspGLCamera(bpy.types.Operator, ExportMspGLBase):
 		from .export_camera import CameraExporter
 		return CameraExporter()
 
+class AddUniform(bpy.types.Operator):
+	bl_idname = "material.add_uniform"
+	bl_label = "Add Uniform"
+	bl_description = "Add a new uniform value to the material"
+
+	def execute(self, context):
+		mat = context.active_object.active_material
+		mat.uniforms.add()
+		mat.active_uniform_index = len(mat.uniforms)-1
+
+		return {"FINISHED"}
+
+class RemoveUniform(bpy.types.Operator):
+	bl_idname = "material.remove_uniform"
+	bl_label = "Remove Uniform"
+	bl_description = "Remove the selected uniform from the material"
+
+	def execute(self, context):
+		mat = context.active_object.active_material
+		mat.uniforms.remove(mat.active_uniform_index)
+		mat.active_uniform_index = min(mat.active_uniform_index, len(mat.uniforms)-1)
+
+		return {"FINISHED"}
+
 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")
@@ -174,7 +193,7 @@ def menu_func_export(self, context):
 	self.layout.operator(ExportMspGLScene.bl_idname, text="Msp GL scene")
 	self.layout.operator(ExportMspGLCamera.bl_idname, text="Msp GL camera")
 
-classes = [ExportMspGLMesh, ExportMspGLObject, ExportMspGLArmature, ExportMspGLAnimation, ExportMspGLScene, ExportMspGLCamera]
+classes = [ExportMspGLMesh, ExportMspGLObject, ExportMspGLArmature, ExportMspGLAnimation, ExportMspGLScene, ExportMspGLCamera, AddUniform, RemoveUniform]
 
 def register():
 	for c in classes: