X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=blender%2Fio_mspgl%2F__init__.py;h=d555ab4b30d54e59f48f5453c2612dfef73ec2ba;hp=b24f28d988578c1b17637f18b69c901367723134;hb=f2cab83d5704f3f4a91f551f402187637e5063d2;hpb=ea3e95735fcd9d6a80d23dbd90667eb2f1c95ef4

diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py
index b24f28d9..d555ab4b 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", "datafile", "export_armature", "export_material", "export_mesh", "export_object", "export_scene", "export_texture", "mesh", "properties", "util":
+	for sub in "animation", "armature", "datafile", "export_animation", "export_armature", "export_camera", "export_material", "export_mesh", "export_object", "export_scene", "export_texture", "material", "mesh", "properties", "util":
 		if sub in locals():
 			imp.reload(locals()[sub])
 
@@ -58,16 +58,11 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 
 	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")))
-
-	separate_mesh = bpy.props.BoolProperty(name="Separate mesh", description="Write mesh data into a separate file", default=False)
-	separate_tech = bpy.props.BoolProperty(name="Separate technique", description="Write technique data into a separate file", default=False)
+	single_file = bpy.props.BoolProperty(name="Single file", description="Write all data into a single file", 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)
+	use_textures = bpy.props.BoolProperty(name="Use textures", description="Use textures in the exported object", default=True)
 
 	def create_exporter(self):
 		from .export_object import ObjectExporter
@@ -76,18 +71,13 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
 	def draw(self, context):
 		super().draw(context)
 
-		col = self.general_col
-		col.prop(self, "export_lods")
-		col.prop(self, "textures")
-		col.separator()
-
-		self.layout.separator()
+		self.general_col.prop(self, "export_lods")
+		self.general_col.prop(self, "use_textures")
 
 		col = self.layout.column()
 		col.label("Files")
-		col.prop(self, "separate_mesh")
-		col.prop(self, "separate_tech")
-		if self.separate_mesh or self.separate_tech:
+		col.prop(self, "single_file")
+		if not self.single_file:
 			col.prop(self, "shared_resources")
 
 class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase):
@@ -100,6 +90,16 @@ class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase):
 		from .export_armature import ArmatureExporter
 		return ArmatureExporter()
 
+class ExportMspGLAnimation(bpy.types.Operator, ExportMspGLBase):
+	bl_idname = "export.mspgl_animation"
+	bl_label = "Export Msp GL animation"
+
+	filename_ext = ".anim"
+
+	def create_exporter(self):
+		from .export_animation import AnimationExporter
+		return AnimationExporter()
+
 class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase):
 	bl_idname = "export_scene.mspgl_scene"
 	bl_label = "Export Msp GL scene"
@@ -116,11 +116,23 @@ class ExportMspGLScene(bpy.types.Operator, ExportMspGLBase):
 		col = self.layout.column()
 		col.prop(self, "resource_collection")
 
+class ExportMspGLCamera(bpy.types.Operator, ExportMspGLBase):
+	bl_idname = "export.mspgl_camera"
+	bl_label = "Export Msp GL camera"
+
+	filename_ext = ".camera"
+
+	def create_exporter(self):
+		from .export_camera import CameraExporter
+		return CameraExporter()
+
 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")
+	self.layout.operator(ExportMspGLAnimation.bl_idname, text="Msp GL animation")
 	self.layout.operator(ExportMspGLScene.bl_idname, text="Msp GL scene")
+	self.layout.operator(ExportMspGLCamera.bl_idname, text="Msp GL camera")
 
 from .properties import MspGLMeshProperties, MspGLObjectProperties