1 files changed, 173 insertions, 72 deletions

diff --git a/tools/export/blender25/godot_export_manager.py b/tools/export/blender25/godot_export_manager.py
index 293e0173e..c91f55b51 100644
--- a/tools/export/blender25/godot_export_manager.py
+++ b/tools/export/blender25/godot_export_manager.py
@@ -18,24 +18,27 @@
 
 # Script copyright (c) Andreas Esau
 
+import bpy
+from bpy.props import (StringProperty, BoolProperty, EnumProperty,
+                       FloatProperty, IntProperty, CollectionProperty)
+import os
+from bpy.app.handlers import persistent
+from mathutils import Matrix
+
 bl_info = {
     "name": "Godot Export Manager",
     "author": "Andreas Esau",
     "version": (1, 0),
     "blender": (2, 7, 0),
     "location": "Scene Properties > Godot Export Manager",
-    "description": "Godot Export Manager uses the Better Collada Exporter to manage Export Groups and automatically export the objects groups to Collada Files.",
+    "description": "Godot Export Manager uses the Better Collada Exporter"
+    "to manage Export Groups and automatically export the objects groups"
+    "to Collada Files.",
     "warning": "",
     "wiki_url": ("http://www.godotengine.org"),
     "tracker_url": "",
     "category": "Import-Export"}
 
-import bpy
-from bpy.props import StringProperty, BoolProperty, EnumProperty, FloatProperty, FloatVectorProperty, IntProperty, CollectionProperty, PointerProperty
-import os
-from bpy.app.handlers import persistent
-from mathutils import Vector, Matrix
-
 
 class godot_export_manager(bpy.types.Panel):
     bl_label = "Godot Export Manager"
@@ -45,8 +48,8 @@ class godot_export_manager(bpy.types.Panel):
 
     bpy.types.Scene.godot_export_on_save = BoolProperty(default=False)
 
-    ### draw function for all ui elements
     def draw(self, context):
+        """ Draw function for all ui elements """
         layout = self.layout
         split = self.layout.split()
         scene = bpy.data.scenes[0]
@@ -59,9 +62,13 @@ class godot_export_manager(bpy.types.Panel):
 
         row = layout.row()
         col = row.column(align=True)
-        op = col.operator("scene.godot_add_objects_to_group", text="Add selected objects to Group", icon="COPYDOWN")
+        op = col.operator("scene.godot_add_objects_to_group",
+                          text="Add selected objects to Group",
+                          icon="COPYDOWN")
 
-        op = col.operator("scene.godot_delete_objects_from_group", text="Delete selected objects from Group", icon="PASTEDOWN")
+        op = col.operator("scene.godot_delete_objects_from_group",
+                          text="Delete selected objects from Group",
+                          icon="PASTEDOWN")
 
         row = layout.row()
         col = row.column()
@@ -70,11 +77,15 @@ class godot_export_manager(bpy.types.Panel):
         row = layout.row()
         col = row.column()
 
-        col.template_list("UI_List_Godot", "dummy", scene, "godot_export_groups", scene, "godot_export_groups_index", rows=1, maxrows=10, type='DEFAULT')
+        col.template_list("UI_List_Godot", "dummy", scene,
+                          "godot_export_groups", scene,
+                          "godot_export_groups_index", rows=1, maxrows=10,
+                          type='DEFAULT')
 
         col = row.column(align=True)
         col.operator("scene.godot_add_export_group", text="", icon="ZOOMIN")
-        col.operator("scene.godot_delete_export_group", text="", icon="ZOOMOUT")
+        col.operator("scene.godot_delete_export_group", text="",
+                     icon="ZOOMOUT")
         col.operator("scene.godot_export_all_groups", text="", icon="EXPORT")
 
         if len(scene.godot_export_groups) > 0:
@@ -113,9 +124,10 @@ class godot_export_manager(bpy.types.Panel):
             col.prop(group, "use_metadata")
 
 
-### Custom template_list look
 class UI_List_Godot(bpy.types.UIList):
-    def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
+    """ Custom template_list look """
+    def draw_item(self, context, layout, data, item, icon, active_data,
+                  active_propname, index):
         ob = data
         slot = item
         col = layout.row(align=True)
@@ -123,11 +135,14 @@ class UI_List_Godot(bpy.types.UIList):
         col.label(text=item.name, icon="GROUP")
         col.prop(item, "active", text="")
 
-        op = col.operator("scene.godot_select_group_objects", text="", emboss=False, icon="RESTRICT_SELECT_OFF")
+        op = col.operator("scene.godot_select_group_objects",
+                          text="", emboss=False, icon="RESTRICT_SELECT_OFF")
         op.idx = index
-        op = col.operator("scene.godot_export_group", text="", emboss=False, icon="EXPORT")
+        op = col.operator("scene.godot_export_group", text="", emboss=False,
+                          icon="EXPORT")
         op.idx = index
 
+
 class add_objects_to_group(bpy.types.Operator):
     bl_idname = "scene.godot_add_objects_to_group"
     bl_label = "Add Objects to Group"
@@ -141,20 +156,24 @@ class add_objects_to_group(bpy.types.Operator):
         objects_str = ""
         if len(scene.godot_export_groups) > 0:
             for i, object in enumerate(context.selected_objects):
-                if object.name not in scene.godot_export_groups[scene.godot_export_groups_index].nodes:
-                    node = scene.godot_export_groups[scene.godot_export_groups_index].nodes.add()
+                if object.name not in scene.godot_export_groups[
+                        scene.godot_export_groups_index].nodes:
+                    node = scene.godot_export_groups[
+                        scene.godot_export_groups_index].nodes.add()
                     node.name = object.name
                     if i == 0:
                         objects_str += object.name
                     else:
                         objects_str += ", "+object.name
 
-            self.report({'INFO'}, objects_str + " added to group." )
+            self.report({'INFO'}, objects_str + " added to group.")
             if self.undo:
                 bpy.ops.ed.undo_push(message="Objects added to group")
         else:
-            self.report({'WARNING'}, "Create a group first." )
-        return{'FINISHED'}
+            self.report({'WARNING'}, "Create a group first.")
+
+        return {'FINISHED'}
+
 
 class del_objects_from_group(bpy.types.Operator):
     bl_idname = "scene.godot_delete_objects_from_group"
@@ -172,21 +191,25 @@ class del_objects_from_group(bpy.types.Operator):
 
             objects_str = ""
             j = 0
-            for i, node in enumerate(scene.godot_export_groups[scene.godot_export_groups_index].nodes):
+            for i, node in enumerate(scene.godot_export_groups[
+                    scene.godot_export_groups_index].nodes):
                 if node.name in selected_objects:
-                    scene.godot_export_groups[scene.godot_export_groups_index].nodes.remove(i)
+                    scene.godot_export_groups[
+                        scene.godot_export_groups_index].nodes.remove(i)
 
                     if j == 0:
                             objects_str += object.name
                     else:
                         objects_str += ", "+object.name
-                    j+=1
+                    j += 1
 
-            self.report({'INFO'}, objects_str + " deleted from group." )
+            self.report({'INFO'}, objects_str + " deleted from group.")
             bpy.ops.ed.undo_push(message="Objects deleted from group")
         else:
-            self.report({'WARNING'}, "There is no group to delete from." )
-        return{'FINISHED'}
+            self.report({'WARNING'}, "There is no group to delete from.")
+
+        return {'FINISHED'}
+
 
 class select_group_objects(bpy.types.Operator):
     bl_idname = "scene.godot_select_group_objects"
@@ -203,7 +226,8 @@ class select_group_objects(bpy.types.Operator):
             if node.name in bpy.data.objects:
                 bpy.data.objects[node.name].select = True
                 context.scene.objects.active = bpy.data.objects[node.name]
-        return{'FINISHED'}
+
+        return {'FINISHED'}
 
 
 class export_groups_autosave(bpy.types.Operator):
@@ -217,9 +241,10 @@ class export_groups_autosave(bpy.types.Operator):
             for i in range(len(scene.godot_export_groups)):
                 if scene.godot_export_groups[i].active:
                     bpy.ops.scene.godot_export_group(idx=i)
-        self.report({'INFO'}, "All Groups exported." )
+        self.report({'INFO'}, "All Groups exported.")
         bpy.ops.ed.undo_push(message="Export all Groups")
-        return{'FINISHED'}
+
+        return {'FINISHED'}
 
 
 class export_all_groups(bpy.types.Operator):
@@ -233,46 +258,49 @@ class export_all_groups(bpy.types.Operator):
         for i in range(0, len(scene.godot_export_groups)):
             bpy.ops.scene.godot_export_group(idx=i, export_all=True)
 
-        self.report({'INFO'}, "All Groups exported." )
-        return{'FINISHED'}
+        self.report({'INFO'}, "All Groups exported.")
+
+        return {'FINISHED'}
 
 
 class export_group(bpy.types.Operator):
     bl_idname = "scene.godot_export_group"
     bl_label = "Export Group"
-    bl_description = "Exports the active group to destination folder as Collada file."
+    bl_description = "Exports the active group to destination folder"\
+                     " as Collada file."
 
     idx = IntProperty(default=0)
     export_all = BoolProperty(default=False)
 
-    def copy_object_recursive(self, ob, parent, single_user = True):
+    def copy_object_recursive(self, ob, parent, single_user=True):
         new_ob = bpy.data.objects[ob.name].copy()
-        if single_user or ob.type=="ARMATURE":
+        if single_user or ob.type == "ARMATURE":
             new_mesh_data = new_ob.data.copy()
             new_ob.data = new_mesh_data
         bpy.context.scene.objects.link(new_ob)
 
         if ob != parent:
-           new_ob.parent = parent
+            new_ob.parent = parent
         else:
             new_ob.parent = None
 
         for child in ob.children:
             self.copy_object_recursive(child, new_ob, single_user)
         new_ob.select = True
+
         return new_ob
 
     def delete_object(self, ob):
-        if ob != None:
+        if ob is not None:
             for child in ob.children:
                 self.delete_object(child)
             bpy.context.scene.objects.unlink(ob)
             bpy.data.objects.remove(ob)
 
     def convert_group_to_node(self, group):
-        if group.dupli_group != None:
+        if group.dupli_group is not None:
             for object in group.dupli_group.objects:
-                if object.parent == None:
+                if object.parent is None:
                     object = self.copy_object_recursive(object, object, True)
                     matrix = Matrix(object.matrix_local)
                     object.matrix_local = Matrix()
@@ -297,15 +325,16 @@ class export_group(bpy.types.Operator):
         bpy.ops.ed.undo_push(message="Clear not existent Group Nodes.")
 
         path = group[self.idx].export_path
-        if (path.find("//")==0 or path.find("\\\\")==0):
-            #if relative, convert to absolute
+        if (path.find("//") == 0 or path.find("\\\\") == 0):
+            # If relative, convert to absolute
             path = bpy.path.abspath(path)
             path = path.replace("\\", "/")
 
-        ### if path exists and group export name is set the group will be exported
-        if os.path.exists(path) and  group[self.idx].export_name != "":
+        # If path exists and group export name is set the group will be
+        # exported
+        if os.path.exists(path) and group[self.idx].export_name != "":
 
-            context.scene.layers = [True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True, True]
+            context.scene.layers = [True] * 20
 
             if group[self.idx].export_name.endswith(".dae"):
                 path = os.path.join(path, group[self.idx].export_name)
@@ -319,17 +348,19 @@ class export_group(bpy.types.Operator):
                 object.select = False
             context.scene.objects.active = None
 
-            ### make particle duplicates, parent and select them
+            # Make particle duplicates, parent and select them
             nodes_to_be_added = []
             if group[self.idx].use_include_particle_duplicates:
                 for i, object in enumerate(group[self.idx].nodes):
                     if bpy.data.objects[object.name].type != "EMPTY":
-                        context.scene.objects.active = bpy.data.objects[object.name]
+                        context.scene.objects.active = bpy.data.objects[
+                            object.name]
                         bpy.data.objects[object.name].select = True
                         bpy.ops.object.duplicates_make_real()
                         for object in context.selected_objects:
                             nodes_to_be_added.append(object)
-                        bpy.ops.object.parent_set(type="OBJECT", keep_transform=False)
+                        bpy.ops.object.parent_set(type="OBJECT",
+                                                  keep_transform=False)
 
                         for object in context.selected_objects:
                             object.select = False
@@ -338,17 +369,35 @@ class export_group(bpy.types.Operator):
             for object in nodes_to_be_added:
                 object.select = True
 
-            ### select all other nodes from the group
+            # Select all other nodes from the group
             for i, object in enumerate(group[self.idx].nodes):
                 if bpy.data.objects[object.name].type == "EMPTY":
                     self.convert_group_to_node(bpy.data.objects[object.name])
                 else:
                     bpy.data.objects[object.name].select = True
 
-            bpy.ops.object.transform_apply(location=group[self.idx].apply_loc, rotation=group[self.idx].apply_rot, scale=group[self.idx].apply_scale)
-            bpy.ops.export_scene.dae(check_existing=True, filepath=path, filter_glob="*.dae", object_types=group[self.idx].object_types, use_export_selected=group[self.idx].use_export_selected, use_mesh_modifiers=group[self.idx].use_mesh_modifiers, use_tangent_arrays=group[self.idx].use_tangent_arrays, use_triangles=group[self.idx].use_triangles, use_copy_images=group[self.idx].use_copy_images, use_active_layers=group[self.idx].use_active_layers, use_anim=group[self.idx].use_anim, use_anim_action_all=group[self.idx].use_anim_action_all, use_anim_skip_noexp=group[self.idx].use_anim_skip_noexp, use_anim_optimize=group[self.idx].use_anim_optimize, anim_optimize_precision=group[self.idx].anim_optimize_precision, use_metadata=group[self.idx].use_metadata)
+            bpy.ops.object.transform_apply(location=group[self.idx].apply_loc,
+                                           rotation=group[self.idx].apply_rot,
+                                           scale=group[self.idx].apply_scale)
+            bpy.ops.export_scene.dae(
+                check_existing=True, filepath=path, filter_glob="*.dae",
+                object_types=group[self.idx].object_types,
+                use_export_selected=group[self.idx].use_export_selected,
+                use_mesh_modifiers=group[self.idx].use_mesh_modifiers,
+                use_tangent_arrays=group[self.idx].use_tangent_arrays,
+                use_triangles=group[self.idx].use_triangles,
+                use_copy_images=group[self.idx].use_copy_images,
+                use_active_layers=group[self.idx].use_active_layers,
+                use_anim=group[self.idx].use_anim,
+                use_anim_action_all=group[self.idx].use_anim_action_all,
+                use_anim_skip_noexp=group[self.idx].use_anim_skip_noexp,
+                use_anim_optimize=group[self.idx].use_anim_optimize,
+                anim_optimize_precision=group[
+                    self.idx].anim_optimize_precision,
+                use_metadata=group[self.idx].use_metadata)
 
-            self.report({'INFO'}, '"'+group[self.idx].name+'"' + " Group exported." )
+            self.report({'INFO'},
+                        '"' + group[self.idx].name + '" Group exported.')
             msg = "Export Group "+group[self.idx].name
 
             bpy.ops.ed.undo_push(message="")
@@ -356,14 +405,16 @@ class export_group(bpy.types.Operator):
             bpy.ops.ed.undo_push(message=msg)
 
         else:
-            self.report({'INFO'}, "Define Export Name and Export Path." )
+            self.report({'INFO'}, "Define Export Name and Export Path.")
+
         return{'FINISHED'}
 
 
 class add_export_group(bpy.types.Operator):
     bl_idname = "scene.godot_add_export_group"
     bl_label = "Adds a new export Group"
-    bl_description = "Creates a new Export Group with the selected Objects assigned to it."
+    bl_description = "Creates a new Export Group with the selected"\
+                     " Objects assigned to it."
 
     def execute(self, context):
         scene = context.scene
@@ -375,6 +426,7 @@ class add_export_group(bpy.types.Operator):
             node.name = object.name
         scene.godot_export_groups_index = len(scene.godot_export_groups)-1
         bpy.ops.ed.undo_push(message="Create New Export Group")
+
         return{'FINISHED'}
 
 
@@ -385,6 +437,7 @@ class del_export_group(bpy.types.Operator):
 
     def invoke(self, context, event):
         wm = context.window_manager
+
         return wm.invoke_confirm(self, event)
 
     def execute(self, context):
@@ -394,7 +447,8 @@ class del_export_group(bpy.types.Operator):
         if scene.godot_export_groups_index > 0:
             scene.godot_export_groups_index -= 1
         bpy.ops.ed.undo_push(message="Delete Export Group")
-        return{'FINISHED'}
+
+        return {'FINISHED'}
 
 
 class godot_node_list(bpy.types.PropertyGroup):
@@ -408,28 +462,74 @@ class godot_export_groups(bpy.types.PropertyGroup):
     export_path = StringProperty(subtype="DIR_PATH")
     active = BoolProperty(default=True, description="Export Group")
 
-    object_types = EnumProperty(name="Object Types", options={'ENUM_FLAG'}, items=(('EMPTY', "Empty", ""), ('CAMERA', "Camera", ""), ('LAMP', "Lamp", ""), ('ARMATURE', "Armature", ""), ('MESH', "Mesh", ""), ('CURVE', "Curve", ""), ), default={'EMPTY', 'CAMERA', 'LAMP', 'ARMATURE', 'MESH', 'CURVE'})
+    object_types = EnumProperty(name="Object Types", options={'ENUM_FLAG'},
+                                items=(('EMPTY', "Empty", ""),
+                                       ('CAMERA', "Camera", ""),
+                                       ('LAMP', "Lamp", ""),
+                                       ('ARMATURE', "Armature", ""),
+                                       ('MESH', "Mesh", ""),
+                                       ('CURVE', "Curve", ""), ),
+                                default={'EMPTY', 'CAMERA', 'LAMP',
+                                         'ARMATURE', 'MESH', 'CURVE'})
 
-    apply_scale = BoolProperty(name="Apply Scale", description="Apply Scale before export.", default=False)
-    apply_rot = BoolProperty(name="Apply Rotation", description="Apply Rotation before export.", default=False)
-    apply_loc = BoolProperty(name="Apply Location", description="Apply Location before export.", default=False)
+    apply_scale = BoolProperty(name="Apply Scale",
+                               description="Apply Scale before export.",
+                               default=False)
+    apply_rot = BoolProperty(name="Apply Rotation",
+                             description="Apply Rotation before export.",
+                             default=False)
+    apply_loc = BoolProperty(name="Apply Location",
+                             description="Apply Location before export.",
+                             default=False)
 
-    use_export_selected = BoolProperty(name="Selected Objects", description="Export only selected objects (and visible in active layers if that applies).", default=True)
-    use_mesh_modifiers = BoolProperty(name="Apply Modifiers", description="Apply modifiers to mesh objects (on a copy!).", default=True)
-    use_tangent_arrays = BoolProperty(name="Tangent Arrays", description="Export Tangent and Binormal arrays (for normalmapping).", default=False)
-    use_triangles = BoolProperty(name="Triangulate", description="Export Triangles instead of Polygons.", default=False)
+    use_export_selected = BoolProperty(name="Selected Objects",
+                                       description="Export only selected"
+                                       "objects (and visible in active layers "
+                                       "if that applies).", default=True)
+    use_mesh_modifiers = BoolProperty(name="Apply Modifiers",
+                                      description="Apply modifiers to mesh"
+                                      " objects (on a copy!).", default=True)
+    use_tangent_arrays = BoolProperty(name="Tangent Arrays",
+                                      description="Export Tangent and Binormal"
+                                      " arrays (for normalmapping).",
+                                      default=False)
+    use_triangles = BoolProperty(name="Triangulate",
+                                 description="Export Triangles instead of"
+                                 " Polygons.", default=False)
 
-    use_copy_images = BoolProperty(name="Copy Images", description="Copy Images (create images/ subfolder)", default=False)
-    use_active_layers = BoolProperty(name="Active Layers", description="Export only objects on the active layers.", default=True)
-    use_anim = BoolProperty(name="Export Animation", description="Export keyframe animation", default=False)
-    use_anim_action_all = BoolProperty(name="All Actions", description=("Export all actions for the first armature found in separate DAE files"), default=False)
-    use_anim_skip_noexp = BoolProperty(name="Skip (-noexp) Actions", description="Skip exporting of actions whose name end in (-noexp). Useful to skip control animations.", default=True)
-    use_anim_optimize = BoolProperty(name="Optimize Keyframes", description="Remove double keyframes", default=True)
+    use_copy_images = BoolProperty(name="Copy Images",
+                                   description="Copy Images (create images/ "
+                                   "subfolder)", default=False)
+    use_active_layers = BoolProperty(name="Active Layers",
+                                     description="Export only objects on the"
+                                     " active layers.", default=True)
+    use_anim = BoolProperty(name="Export Animation",
+                            description="Export keyframe animation",
+                            default=False)
+    use_anim_action_all = BoolProperty(name="All Actions",
+                                       description=("Export all actions for "
+                                                    "the first armature found"
+                                                    " in separate DAE files"),
+                                       default=False)
+    use_anim_skip_noexp = BoolProperty(name="Skip (-noexp) Actions",
+                                       description="Skip exporting of"
+                                       " actions whose name end in (-noexp)."
+                                       " Useful to skip control animations.",
+                                       default=True)
+    use_anim_optimize = BoolProperty(name="Optimize Keyframes",
+                                     description="Remove double keyframes",
+                                     default=True)
 
-    anim_optimize_precision = FloatProperty(name="Precision", description=("Tolerence for comparing double keyframes (higher for greater accuracy)"), min=1, max=16, soft_min=1, soft_max=16, default=6.0)
+    anim_optimize_precision = FloatProperty(
+        name="Precision", description=("Tolerence for comparing double "
+                                       "keyframes (higher for greater "
+                                       "accuracy)"), min=1, max=16,
+        soft_min=1, soft_max=16, default=6.0)
 
-    use_metadata = BoolProperty(name="Use Metadata", default=True, options={'HIDDEN'})
-    use_include_particle_duplicates = BoolProperty(name="Include Particle Duplicates", default=True)
+    use_metadata = BoolProperty(name="Use Metadata", default=True,
+                                options={'HIDDEN'})
+    use_include_particle_duplicates = BoolProperty(
+        name="Include Particle Duplicates", default=True)
 
 
 def register():
@@ -446,7 +546,8 @@ def register():
     bpy.utils.register_class(select_group_objects)
     bpy.utils.register_class(UI_List_Godot)
 
-    bpy.types.Scene.godot_export_groups = CollectionProperty(type=godot_export_groups)
+    bpy.types.Scene.godot_export_groups = CollectionProperty(
+        type=godot_export_groups)
     bpy.types.Scene.godot_export_groups_index = IntProperty(default=0, min=0)