Refactor object exporter to a separate class

[libs/gl.git] / blender / io_mspgl / __init__.py

diff --git a/blender/io_mspgl/__init__.py b/blender/io_mspgl/__init__.py
index f43d3c01ea63f7cae545d65025f58e8256fc8a7f..9b49da8ffa370f42f0ed129a2f5cd8d6dc20b313 100644 (file)
--- 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", "mesh", "outfile", "util":
+       for sub in "armature", "export_armature", "export_mesh", "export_object", "mesh", "outfile", "util":
                if sub in locals():
                        imp.reload(locals()[sub])
 
@@ -48,32 +48,36 @@ class ExportMspGLMeshBase(ExportMspGLBase):
                        ("MSPGL", "MspGL", "Compute vertex normals internally")))
        export_groups = bpy.props.BoolProperty(name="Vertex groups", description="Export vertex groups and weights", default=False)
 
-       def create_exporter(self):
-               from .export_mesh import MeshExporter
-               return MeshExporter()
-
        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.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("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")
                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, ExportMspGLMeshBase):
        bl_idname = "export_mesh.mspgl_mesh"
@@ -81,6 +85,10 @@ class ExportMspGLMesh(bpy.types.Operator, ExportMspGLMeshBase):
 
        filename_ext = ".mesh"
 
+       def create_exporter(self):
+               from .export_mesh import MeshExporter
+               return MeshExporter()
+
 class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
        bl_idname = "export_mesh.mspgl_object"
        bl_label = "Export Msp GL object"
@@ -92,18 +100,18 @@ class ExportMspGLObject(bpy.types.Operator, ExportMspGLMeshBase):
                        ("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)
 
-       def prepare_exporter(self, exporter):
-               super().prepare_exporter(exporter)
-               exporter.object = True
+       def create_exporter(self):
+               from .export_object import ObjectExporter
+               return ObjectExporter()
 
        def draw(self, context):
                super().draw(context)
-               self.layout.separator()
-               col = self.layout.column()
-               col.label("Texturing")
+               col = self.texturing_col
                col.prop(self, "textures")
                col.prop(self, "material_tex")
+               col.prop(self, "srgb_colors")
 
 class ExportMspGLArmature(bpy.types.Operator, ExportMspGLBase):
        bl_idname = "export.mspgl_armature"