[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1322] trunk/py/scripts/addons: SVN maintenance.

gsr b3d gsr.b3d at infernal-iceberg.com
Wed Dec 29 23:25:50 CET 2010


Revision: 1322
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-extensions&revision=1322
Author:   gsrb3d
Date:     2010-12-29 23:25:50 +0100 (Wed, 29 Dec 2010)

Log Message:
-----------
SVN maintenance.

Modified Paths:
--------------
    trunk/py/scripts/addons/io_scene_m3/__init__.py
    trunk/py/scripts/addons/io_scene_m3/import_m3.py
    trunk/py/scripts/addons/text_editor_api_navigator.py

Property Changed:
----------------
    trunk/py/scripts/addons/animation_add_corrective_shape_key.py
    trunk/py/scripts/addons/io_scene_m3/__init__.py
    trunk/py/scripts/addons/io_scene_m3/import_m3.py
    trunk/py/scripts/addons/text_editor_api_navigator.py


Property changes on: trunk/py/scripts/addons/animation_add_corrective_shape_key.py
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/py/scripts/addons/io_scene_m3/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_scene_m3/__init__.py	2010-12-29 21:22:35 UTC (rev 1321)
+++ trunk/py/scripts/addons/io_scene_m3/__init__.py	2010-12-29 22:25:50 UTC (rev 1322)
@@ -1,101 +1,101 @@
-# ##### 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 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.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-bl_addon_info = {
-    "name": "M3 Import",
-    "author": "Cory Perry (muraj)",
-    "version": (0, 0, 2),
-    "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",
-    "tracker_url": "http://projects.blender.org/tracker/index.php?"\
-        "func=detail&aid=24017&group_id=153&atid=469",
-    "category": "Import-Export"}
-
-"""
-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.
-
-Notes:
-    Generates the standard verts and faces lists.
-
-"""
-
-if "bpy" in locals():
-    import imp
-    imp.reload(import_m3)
-    #imp.reload(export_m3)
-else:
-    from . import import_m3
-    #from . import export_m3
-
-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_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
-
-
-def register():
-    bpy.types.INFO_MT_file_import.append(menu_import)
-    # 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)
-
-if __name__ == "__main__":
-    register()
+# ##### 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 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.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+bl_addon_info = {
+    "name": "M3 Import",
+    "author": "Cory Perry (muraj)",
+    "version": (0, 0, 2),
+    "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",
+    "tracker_url": "http://projects.blender.org/tracker/index.php?"\
+        "func=detail&aid=24017&group_id=153&atid=469",
+    "category": "Import-Export"}
+
+"""
+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.
+
+Notes:
+    Generates the standard verts and faces lists.
+
+"""
+
+if "bpy" in locals():
+    import imp
+    imp.reload(import_m3)
+    #imp.reload(export_m3)
+else:
+    from . import import_m3
+    #from . import export_m3
+
+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_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
+
+
+def register():
+    bpy.types.INFO_MT_file_import.append(menu_import)
+    # 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)
+
+if __name__ == "__main__":
+    register()


Property changes on: trunk/py/scripts/addons/io_scene_m3/__init__.py
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/py/scripts/addons/io_scene_m3/import_m3.py
===================================================================
--- trunk/py/scripts/addons/io_scene_m3/import_m3.py	2010-12-29 21:22:35 UTC (rev 1321)
+++ trunk/py/scripts/addons/io_scene_m3/import_m3.py	2010-12-29 22:25:50 UTC (rev 1322)
@@ -1,308 +1,308 @@
-# ##### 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 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.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-
-import bpy, mathutils, time, struct, os.path
-from bpy.props import *
-
-##################
-## Struct setup ##
-##################
-
-verFlag = False        #Version flag (MD34 == True, MD33 == False)
-
-class ref:
-    fmt = 'LL'
-    def __init__(self, file):
-        global verFlag
-        if verFlag: self.fmt += 'L'    #Extra unknown...
-        _s=file.read(struct.calcsize(self.fmt))
-        self.entries, self.refid = struct.unpack(self.fmt, _s)[:2]
-    @classmethod
-    def size(cls):
-        global verFlag
-        return struct.calcsize(cls.fmt + ('L' if verFlag else ''))
-
-
-class animref:
-    fmt = 'HHL'
-    def __init__(self, file):
-        _s=file.read(struct.calcsize(self.fmt))
-        self.flags, self.animflags, self.animid = struct.unpack(self.fmt, _s)
-
-
-class Tag:
-    fmt = '4sLLL'
-    def __init__(self, file):
-        _s=file.read(struct.calcsize(self.fmt))
-        self.name, self.ofs, self.nTag, self.version = struct.unpack(self.fmt, _s)
-
-
-class matrix:
-    fmt='f'*16
-    def __init__(self, file):
-        _s=file.read(struct.calcsize(self.fmt))
-        self.mat = struct.unpack(self.fmt, _s)
-
-
-class vect:
-    fmt='fff'
-    def __init__(self, file):
-        _s=file.read(struct.calcsize(self.fmt))
-        self.v = struct.unpack(self.fmt, _s)
-
-
-class vertex:
-    fmt="4B4b4B%dH4B"
-    ver = { 0x020000: 2, 0x060000: 4, 0x0A0000: 6, 0x120000: 8 }
-    def __init__(self, file, flag):
-        self.pos = vect(file)
-        fmt = self.fmt % (self.ver[flag])

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-extensions-cvs mailing list