Numerous changes, including pep8 conformence

commit e44929d0c9496c431cf892687e6515fd3134dfaa
Author: muraj <killogge@gmail.com>
Date:   Mon Jan 10 13:30:10 2011 -0500

    Updated meta information for blender tracker url

commit c699da0117693f8f3135b9e9013d7aefac29ae8b
Author: muraj <killogge@gmail.com>
Date:   Mon Jan 10 11:47:36 2011 -0500

    pep8 conformance

commit abdd2b41d06da2d82f6cb8207f55f65f149ec7e6
Author: Cory Perry <killogge@gmail.com>
Date:   Fri Dec 24 20:22:39 2010 -0500

    Fixed a dumb bug with vertex struct sizes not being properly calculated.  Thor now imports properly as a result.

1 files changed, 46 insertions, 72 deletions

diff --git a/io_scene_m3/__init__.py b/io_scene_m3/__init__.py
index a24a239a..8b04c939 100644
--- a/io_scene_m3/__init__.py
+++ b/io_scene_m3/__init__.py
@@ -1,101 +1,75 @@
 # ##### BEGIN GPL LICENSE BLOCK #####
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # ##### END GPL LICENSE BLOCK #####
 
+MAJOR_VERSION = 0
+MINOR_VERSION = 2
+BLENDER_VERSION = (2, 54, 0)
+__version__ = "%d.%d.0" % (MAJOR_VERSION, MINOR_VERSION)
 bl_addon_info = {
-    "name": "M3 Import",
-    "author": "Cory Perry (muraj)",
-    "version": (0, 0, 2),
-    "blender": (2, 5, 4),
+    'name': 'Import: M3 (.m3)',
+    'author': 'Cory Perry',
+    'version': (0, 2, 0),
+    'blender': (2, 5, 4),
     "api": 31878,
-    "location": "File > Import-Export > M3 Import ",
-    "description": "Import Blizzard M3 models (.m3 format)",
-    "warning": "Alpha version",
-    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
-        "Scripts/Import-Export/M3_Import",
+    "location": "File > Import",
+    "warning": "",
+    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/Scripts/"\
+        "Import-Export/M3_Import",
     "tracker_url": "http://projects.blender.org/tracker/index.php?"\
         "func=detail&aid=24017",
-    "category": "Import-Export"}
+    "category": "Import/Export",
+    "description": "This script imports m3 format files to Blender."}
 
-"""
-This script imports m3 format files to Blender.
-
-The m3 file format, used by Blizzard in several games, is based around the mdx and m2 file format.  Thanks to the efforts of Volcore, madyavic and the people working on libm3, the file format has been reversed engineered enough to make this script possible (Thanks guys!).
-
-This script currently imports the following:
-- Geometry data (vertices, faces, submeshes [in vertex groups])
-- Model Textures (currently only the first material is supported)
-   
-    Blender supports the DDS file format and needs the image in the same
-    directory.  This script will notify you of any missing textures.
-
-TODO:
-- Documentation & clean up
-- Import *ALL* materials and bind accordingly
-- Bind specular, normal, and emissive maps following new API
-- Adjust vertices to bind pose (import IREF matrices)
-- Import Armature data
-- Get acquainted with 2.54 Armature API.
-- Import Animation data
-
-Known Bugs:
-    Thor isn't parsable for some reason, will look into.
-
-Usage:
-    Execute this script from the "File->Import" menu and choose a m3 file to open.
+import bpy
 
-Notes:
-    Generates the standard verts and faces lists.
+try:
+    init_data
 
-"""
+    reload(import_m3)
+    #reload(export_m3)
+except:
+    from io_mesh_m3 import import_m3
+    #from io_mesh_m3 import export_m3
 
-if "bpy" in locals():
-    import imp
-    imp.reload(import_m3)
-    #imp.reload(export_m3)
-else:
-    from . import import_m3
-    #from . import export_m3
+init_data = True
 
-import bpy
 
-def menu_import(self, context): 
-    from io_scene_pmd import import_pmd
-    self.layout.operator(
-            import_m3.M3Importer.bl_idname, 
-            text="Blizzard M3 (.m3)",
-            icon='PLUGIN'
-            )
+def menu_import(self, context):
+    from io_mesh_m3 import import_m3
+    self.layout.operator(import_m3.M3Importer.bl_idname, \
+        text="Blizzard M3 (.m3)").filepath = "*.m3"
 
 
 #def menu_export(self, context):
-# from io_mesh_raw import export_raw
-# import os
-# default_path = os.path.splitext(bpy.data.filepath)[0] + ".raw"
-# self.layout.operator(export_raw.RawExporter.bl_idname, text="Raw Faces (.raw)").filepath = default_path
-
+#    from io_mesh_raw import export_raw
+#    import os
+#    default_path = os.path.splitext(bpy.data.filepath)[0] + ".raw"
+#    self.layout.operator(export_raw.RawExporter.bl_idname, \
+#        text="Raw Faces (.raw)").filepath = default_path
 
 def register():
     bpy.types.INFO_MT_file_import.append(menu_import)
-    # bpy.types.INFO_MT_file_export.append(menu_export)
+#    bpy.types.INFO_MT_file_export.append(menu_export)
+
 
 def unregister():
     bpy.types.INFO_MT_file_import.remove(menu_import)
-    # bpy.types.INFO_MT_file_export.remove(menu_export)
+#    bpy.types.INFO_MT_file_export.remove(menu_export)
 
 if __name__ == "__main__":
     register()