[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3693] contrib/py/scripts/addons: SVN maintenance.
gsr b3d
gsr.b3d at infernal-iceberg.com
Fri Aug 31 04:07:15 CEST 2012
Revision: 3693
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3693
Author: gsrb3d
Date: 2012-08-31 02:07:14 +0000 (Fri, 31 Aug 2012)
Log Message:
-----------
SVN maintenance.
Modified Paths:
--------------
contrib/py/scripts/addons/io_scene_m3/__init__.py
contrib/py/scripts/addons/io_scene_m3/import_m3.py
Property Changed:
----------------
contrib/py/scripts/addons/development_geometry_index_display.py
contrib/py/scripts/addons/io_scene_m3/__init__.py
contrib/py/scripts/addons/io_scene_m3/import_m3.py
contrib/py/scripts/addons/mesh_insert_edge_ring.py
Property changes on: contrib/py/scripts/addons/development_geometry_index_display.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: contrib/py/scripts/addons/io_scene_m3/__init__.py
===================================================================
--- contrib/py/scripts/addons/io_scene_m3/__init__.py 2012-08-31 00:56:12 UTC (rev 3692)
+++ contrib/py/scripts/addons/io_scene_m3/__init__.py 2012-08-31 02:07:14 UTC (rev 3693)
@@ -1,97 +1,97 @@
-# ##### 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 #####
-
-# <pep8 compliant>
-
-bl_info = {
- 'name': 'Import Blizzard M3 format (.m3)',
- 'author': 'Cory Perry',
- 'version': (0, 2, 1),
- "blender": (2, 5, 7),
- 'location': 'File > Import > Blizzard M3 (.m3)',
- 'description': 'Imports the Blizzard M3 format (.m3)',
- 'warning': 'Broken',
- 'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/'\
- 'Import-Export/M3_Import',
- 'tracker_url': 'http://projects.blender.org/tracker/index.php?'\
- 'func=detail&aid=24017',
- 'category': 'Import-Export'}
-
-
-# To support reload properly, try to access a package var, if it's there,
-# reload everything
-if "bpy" in locals():
- import imp
- if 'import_m3' in locals():
- imp.reload(import_m3)
-# if 'export_m3' in locals():
-# imp.reload(export_m3)
-
-import time
-import datetime
-import bpy
-from bpy.props import StringProperty, BoolProperty
-from bpy_extras.io_utils import ImportHelper
-
-
-class ImportM3(bpy.types.Operator, ImportHelper):
- """Import from M3 file format (.m3)"""
- bl_idname = 'import_scene.blizzard_m3'
- bl_label = 'Import M3'
- bl_options = {'UNDO'}
-
- filename_ext = '.m3'
- filter_glob = StringProperty(default='*.m3', options={'HIDDEN'})
-
- use_image_search = BoolProperty(name='Image Search',
- description='Search subdirectories for any associated'\
- 'images', default=True)
-
- def execute(self, context):
- from . import import_m3
- print('Importing file', self.filepath)
- t = time.mktime(datetime.datetime.now().timetuple())
- with open(self.filepath, 'rb') as file:
- import_m3.read(file, context, self)
- t = time.mktime(datetime.datetime.now().timetuple()) - t
- print('Finished importing in', t, 'seconds')
- return {'FINISHED'}
-
-
-def menu_func_import(self, context):
- self.layout.operator(ImportM3.bl_idname, text='Blizzard M3 (.m3)')
-
-
-#def menu_func_export(self, context):
-# self.layout.operator(ExportM3.bl_idname, text='Blizzard M3 (.m3)')
-
-
-def register():
- bpy.utils.register_module(__name__)
- bpy.types.INFO_MT_file_import.append(menu_func_import)
-# bpy.types.INFO_MT_file_export.append(menu_func_export)
-
-
-def unregister():
- bpy.utils.unregister_module(__name__)
- bpy.types.INFO_MT_file_import.remove(menu_func_import)
-# bpy.types.INFO_MT_file_export.remove(menu_func_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 #####
+
+# <pep8 compliant>
+
+bl_info = {
+ 'name': 'Import Blizzard M3 format (.m3)',
+ 'author': 'Cory Perry',
+ 'version': (0, 2, 1),
+ "blender": (2, 5, 7),
+ 'location': 'File > Import > Blizzard M3 (.m3)',
+ 'description': 'Imports the Blizzard M3 format (.m3)',
+ 'warning': 'Broken',
+ 'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/'\
+ 'Import-Export/M3_Import',
+ 'tracker_url': 'http://projects.blender.org/tracker/index.php?'\
+ 'func=detail&aid=24017',
+ 'category': 'Import-Export'}
+
+
+# To support reload properly, try to access a package var, if it's there,
+# reload everything
+if "bpy" in locals():
+ import imp
+ if 'import_m3' in locals():
+ imp.reload(import_m3)
+# if 'export_m3' in locals():
+# imp.reload(export_m3)
+
+import time
+import datetime
+import bpy
+from bpy.props import StringProperty, BoolProperty
+from bpy_extras.io_utils import ImportHelper
+
+
+class ImportM3(bpy.types.Operator, ImportHelper):
+ """Import from M3 file format (.m3)"""
+ bl_idname = 'import_scene.blizzard_m3'
+ bl_label = 'Import M3'
+ bl_options = {'UNDO'}
+
+ filename_ext = '.m3'
+ filter_glob = StringProperty(default='*.m3', options={'HIDDEN'})
+
+ use_image_search = BoolProperty(name='Image Search',
+ description='Search subdirectories for any associated'\
+ 'images', default=True)
+
+ def execute(self, context):
+ from . import import_m3
+ print('Importing file', self.filepath)
+ t = time.mktime(datetime.datetime.now().timetuple())
+ with open(self.filepath, 'rb') as file:
+ import_m3.read(file, context, self)
+ t = time.mktime(datetime.datetime.now().timetuple()) - t
+ print('Finished importing in', t, 'seconds')
+ return {'FINISHED'}
+
+
+def menu_func_import(self, context):
+ self.layout.operator(ImportM3.bl_idname, text='Blizzard M3 (.m3)')
+
+
+#def menu_func_export(self, context):
+# self.layout.operator(ExportM3.bl_idname, text='Blizzard M3 (.m3)')
+
+
+def register():
+ bpy.utils.register_module(__name__)
+ bpy.types.INFO_MT_file_import.append(menu_func_import)
+# bpy.types.INFO_MT_file_export.append(menu_func_export)
+
+
+def unregister():
+ bpy.utils.unregister_module(__name__)
+ bpy.types.INFO_MT_file_import.remove(menu_func_import)
+# bpy.types.INFO_MT_file_export.remove(menu_func_export)
+
+
+if __name__ == "__main__":
+ register()
Property changes on: contrib/py/scripts/addons/io_scene_m3/__init__.py
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: contrib/py/scripts/addons/io_scene_m3/import_m3.py
===================================================================
--- contrib/py/scripts/addons/io_scene_m3/import_m3.py 2012-08-31 00:56:12 UTC (rev 3692)
+++ contrib/py/scripts/addons/io_scene_m3/import_m3.py 2012-08-31 02:07:14 UTC (rev 3693)
@@ -1,365 +1,365 @@
-# ##### 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 #####
-
-__author__ = "Cory Perry (muraj)"
-__version__ = "0.2.1"
-__bpydoc__ = """\
-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:<br>
- - 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:<br>
- - Documentation & clean up
- - Full MD34 and MD33 testing (possibly batch importing for a testing suite)
- - Import *ALL* materials and bind accordingly (currently supports diffuse,
- specular, and normal.
- - Adjust vertices to bind pose (import IREF matrices)
- - Import Bone data
- - Import Animation data
-
-Usage:<br>
- Execute this script from the "File->Import" menu and choose a m3 file to
-open.
-
-Notes:<br>
- Known issue with Thor.m3, seems to add a lot of unecessary verts.
- Generates the standard verts and faces lists.
-"""
-
-import bpy
-import struct
-import os.path
-from bpy.props import *
-from bpy_extras.image_utils import load_image
-
-##################
-## 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'
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list