[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1311] contrib/py/scripts/addons: == formatting ==
Luca Bonavita
mindrones at gmail.com
Thu Dec 23 11:27:49 CET 2010
Revision: 1311
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-extensions&revision=1311
Author: mindrones
Date: 2010-12-23 11:27:48 +0100 (Thu, 23 Dec 2010)
Log Message:
-----------
== formatting ==
- in wiki page urls: "File_I-O/" -> "Import-Export/"
- in categories: "Import/Export" -> "Import-Export"
- 1 tab to 4 spaces
- some tuple formatting, just to be very picky :P
Modified Paths:
--------------
contrib/py/scripts/addons/io_export_md3.py
contrib/py/scripts/addons/io_export_pc2.py
contrib/py/scripts/addons/io_import_lipSync_Importer.py
contrib/py/scripts/addons/io_import_scene_dxf.py
contrib/py/scripts/addons/io_import_voodoo_camera.py
contrib/py/scripts/addons/io_scene_m3/__init__.py
Modified: contrib/py/scripts/addons/io_export_md3.py
===================================================================
--- contrib/py/scripts/addons/io_export_md3.py 2010-12-23 10:26:20 UTC (rev 1310)
+++ contrib/py/scripts/addons/io_export_md3.py 2010-12-23 10:27:48 UTC (rev 1311)
@@ -19,7 +19,7 @@
bl_addon_info = {
'name': 'Quake Model 3 (.md3)',
'author': 'Xembie',
- 'version': (0,7),
+ 'version': (0, 7),
'blender': (2, 5, 3),
'api': 31667,
'location': 'File > Export',
@@ -27,12 +27,10 @@
'warning': '', # used for warning icon and text in addons panel
'wiki_url': 'http://wiki.blender.org/index.php/Extensions:2.5/Py/'\
'Scripts/',
- 'tracker_url': 'http://projects.blender.org/tracker/index.php?func=detail&aid=23160&group_id=153&atid=468',
- 'category': 'Import/Export'}
+ 'tracker_url': 'http://projects.blender.org/tracker/index.php?'\
+ 'func=detail&aid=23160&group_id=153&atid=468',
+ 'category': 'Import-Export'}
-__author__ = ["Xembie"]
-__version__ = '0.7'
-__url__ = ["www.blender.org"]
import bpy,struct,math,os
@@ -49,355 +47,355 @@
MD3_XYZ_SCALE = 64.0
class md3Vert:
- xyz = []
- normal = 0
- binaryFormat = "<3hH"
-
- def __init__(self):
- self.xyz = [0.0, 0.0, 0.0]
- self.normal = 0
-
- def GetSize(self):
- return struct.calcsize(self.binaryFormat)
-
- # copied from PhaethonH <phaethon at linux.ucla.edu> md3.py
- def Decode(self, latlng):
- lat = (latlng >> 8) & 0xFF;
- lng = (latlng) & 0xFF;
- lat *= math.pi / 128;
- lng *= math.pi / 128;
- x = math.cos(lat) * math.sin(lng)
- y = math.sin(lat) * math.sin(lng)
- z = math.cos(lng)
- retval = [ x, y, z ]
- return retval
-
- # copied from PhaethonH <phaethon at linux.ucla.edu> md3.py
- def Encode(self, normal):
- x = normal[0]
- y = normal[1]
- z = normal[2]
- # normalize
- l = math.sqrt((x*x) + (y*y) + (z*z))
- if l == 0:
- return 0
- x = x/l
- y = y/l
- z = z/l
-
- if (x == 0.0) & (y == 0.0) :
- if z > 0.0:
- return 0
- else:
- return (128 << 8)
-
- lng = math.acos(z) * 255 / (2 * math.pi)
- lat = math.atan2(y, x) * 255 / (2 * math.pi)
- retval = ((int(lat) & 0xFF) << 8) | (int(lng) & 0xFF)
- return retval
-
- def Save(self, file):
- tmpData = [0] * 4
- tmpData[0] = int(self.xyz[0] * MD3_XYZ_SCALE)
- tmpData[1] = int(self.xyz[1] * MD3_XYZ_SCALE)
- tmpData[2] = int(self.xyz[2] * MD3_XYZ_SCALE)
- tmpData[3] = self.normal
- data = struct.pack(self.binaryFormat, tmpData[0], tmpData[1], tmpData[2], tmpData[3])
- file.write(data)
-
+ xyz = []
+ normal = 0
+ binaryFormat = "<3hH"
+
+ def __init__(self):
+ self.xyz = [0.0, 0.0, 0.0]
+ self.normal = 0
+
+ def GetSize(self):
+ return struct.calcsize(self.binaryFormat)
+
+ # copied from PhaethonH <phaethon at linux.ucla.edu> md3.py
+ def Decode(self, latlng):
+ lat = (latlng >> 8) & 0xFF;
+ lng = (latlng) & 0xFF;
+ lat *= math.pi / 128;
+ lng *= math.pi / 128;
+ x = math.cos(lat) * math.sin(lng)
+ y = math.sin(lat) * math.sin(lng)
+ z = math.cos(lng)
+ retval = [ x, y, z ]
+ return retval
+
+ # copied from PhaethonH <phaethon at linux.ucla.edu> md3.py
+ def Encode(self, normal):
+ x = normal[0]
+ y = normal[1]
+ z = normal[2]
+ # normalize
+ l = math.sqrt((x*x) + (y*y) + (z*z))
+ if l == 0:
+ return 0
+ x = x/l
+ y = y/l
+ z = z/l
+
+ if (x == 0.0) & (y == 0.0) :
+ if z > 0.0:
+ return 0
+ else:
+ return (128 << 8)
+
+ lng = math.acos(z) * 255 / (2 * math.pi)
+ lat = math.atan2(y, x) * 255 / (2 * math.pi)
+ retval = ((int(lat) & 0xFF) << 8) | (int(lng) & 0xFF)
+ return retval
+
+ def Save(self, file):
+ tmpData = [0] * 4
+ tmpData[0] = int(self.xyz[0] * MD3_XYZ_SCALE)
+ tmpData[1] = int(self.xyz[1] * MD3_XYZ_SCALE)
+ tmpData[2] = int(self.xyz[2] * MD3_XYZ_SCALE)
+ tmpData[3] = self.normal
+ data = struct.pack(self.binaryFormat, tmpData[0], tmpData[1], tmpData[2], tmpData[3])
+ file.write(data)
+
class md3TexCoord:
- u = 0.0
- v = 0.0
+ u = 0.0
+ v = 0.0
- binaryFormat = "<2f"
+ binaryFormat = "<2f"
- def __init__(self):
- self.u = 0.0
- self.v = 0.0
-
- def GetSize(self):
- return struct.calcsize(self.binaryFormat)
+ def __init__(self):
+ self.u = 0.0
+ self.v = 0.0
+
+ def GetSize(self):
+ return struct.calcsize(self.binaryFormat)
- def Save(self, file):
- tmpData = [0] * 2
- tmpData[0] = self.u
- tmpData[1] = 1.0 - self.v
- data = struct.pack(self.binaryFormat, tmpData[0], tmpData[1])
- file.write(data)
+ def Save(self, file):
+ tmpData = [0] * 2
+ tmpData[0] = self.u
+ tmpData[1] = 1.0 - self.v
+ data = struct.pack(self.binaryFormat, tmpData[0], tmpData[1])
+ file.write(data)
class md3Triangle:
- indexes = []
+ indexes = []
- binaryFormat = "<3i"
+ binaryFormat = "<3i"
- def __init__(self):
- self.indexes = [ 0, 0, 0 ]
-
- def GetSize(self):
- return struct.calcsize(self.binaryFormat)
+ def __init__(self):
+ self.indexes = [ 0, 0, 0 ]
+
+ def GetSize(self):
+ return struct.calcsize(self.binaryFormat)
- def Save(self, file):
- tmpData = [0] * 3
- tmpData[0] = self.indexes[0]
- tmpData[1] = self.indexes[2] # reverse
- tmpData[2] = self.indexes[1] # reverse
- data = struct.pack(self.binaryFormat,tmpData[0], tmpData[1], tmpData[2])
- file.write(data)
+ def Save(self, file):
+ tmpData = [0] * 3
+ tmpData[0] = self.indexes[0]
+ tmpData[1] = self.indexes[2] # reverse
+ tmpData[2] = self.indexes[1] # reverse
+ data = struct.pack(self.binaryFormat,tmpData[0], tmpData[1], tmpData[2])
+ file.write(data)
class md3Shader:
- name = ""
- index = 0
-
- binaryFormat = "<%dsi" % MAX_QPATH
+ name = ""
+ index = 0
+
+ binaryFormat = "<%dsi" % MAX_QPATH
- def __init__(self):
- self.name = ""
- self.index = 0
-
- def GetSize(self):
- return struct.calcsize(self.binaryFormat)
+ def __init__(self):
+ self.name = ""
+ self.index = 0
+
+ def GetSize(self):
+ return struct.calcsize(self.binaryFormat)
- def Save(self, file):
- tmpData = [0] * 2
- tmpData[0] = self.name
- tmpData[1] = self.index
- data = struct.pack(self.binaryFormat, tmpData[0], tmpData[1])
- file.write(data)
+ def Save(self, file):
+ tmpData = [0] * 2
+ tmpData[0] = self.name
+ tmpData[1] = self.index
+ data = struct.pack(self.binaryFormat, tmpData[0], tmpData[1])
+ file.write(data)
class md3Surface:
- ident = ""
- name = ""
- flags = 0
- numFrames = 0
- numShaders = 0
- numVerts = 0
- numTriangles = 0
- ofsTriangles = 0
- ofsShaders = 0
- ofsUV = 0
- ofsVerts = 0
- ofsEnd = 0
- shaders = []
- triangles = []
- uv = []
- verts = []
-
- binaryFormat = "<4s%ds10i" % MAX_QPATH # 1 int, name, then 10 ints
-
- def __init__(self):
- self.ident = ""
- self.name = ""
- self.flags = 0
- self.numFrames = 0
- self.numShaders = 0
- self.numVerts = 0
- self.numTriangles = 0
- self.ofsTriangles = 0
- self.ofsShaders = 0
- self.ofsUV = 0
- self.ofsVerts = 0
- self.ofsEnd
- self.shaders = []
- self.triangles = []
- self.uv = []
- self.verts = []
-
- def GetSize(self):
- sz = struct.calcsize(self.binaryFormat)
- self.ofsTriangles = sz
- for t in self.triangles:
- sz += t.GetSize()
- self.ofsShaders = sz
- for s in self.shaders:
- sz += s.GetSize()
- self.ofsUV = sz
- for u in self.uv:
- sz += u.GetSize()
- self.ofsVerts = sz
- for v in self.verts:
- sz += v.GetSize()
- self.ofsEnd = sz
- return self.ofsEnd
-
- def Save(self, file):
- self.GetSize()
- tmpData = [0] * 12
- tmpData[0] = self.ident
- tmpData[1] = self.name
- tmpData[2] = self.flags
- tmpData[3] = self.numFrames
- tmpData[4] = self.numShaders
- tmpData[5] = self.numVerts
- tmpData[6] = self.numTriangles
- tmpData[7] = self.ofsTriangles
- tmpData[8] = self.ofsShaders
- tmpData[9] = self.ofsUV
- tmpData[10] = self.ofsVerts
- tmpData[11] = self.ofsEnd
- data = struct.pack(self.binaryFormat, tmpData[0],tmpData[1],tmpData[2],tmpData[3],tmpData[4],tmpData[5],tmpData[6],tmpData[7],tmpData[8],tmpData[9],tmpData[10],tmpData[11])
- file.write(data)
+ ident = ""
+ name = ""
+ flags = 0
+ numFrames = 0
+ numShaders = 0
+ numVerts = 0
+ numTriangles = 0
+ ofsTriangles = 0
+ ofsShaders = 0
+ ofsUV = 0
+ ofsVerts = 0
+ ofsEnd = 0
+ shaders = []
+ triangles = []
+ uv = []
+ verts = []
+
+ binaryFormat = "<4s%ds10i" % MAX_QPATH # 1 int, name, then 10 ints
+
+ def __init__(self):
+ self.ident = ""
+ self.name = ""
+ self.flags = 0
+ self.numFrames = 0
+ self.numShaders = 0
+ self.numVerts = 0
+ self.numTriangles = 0
+ self.ofsTriangles = 0
+ self.ofsShaders = 0
+ self.ofsUV = 0
+ self.ofsVerts = 0
+ self.ofsEnd
+ self.shaders = []
+ self.triangles = []
+ self.uv = []
+ self.verts = []
+
+ def GetSize(self):
+ sz = struct.calcsize(self.binaryFormat)
+ self.ofsTriangles = sz
+ for t in self.triangles:
+ sz += t.GetSize()
+ self.ofsShaders = sz
+ for s in self.shaders:
+ sz += s.GetSize()
+ self.ofsUV = sz
+ for u in self.uv:
+ sz += u.GetSize()
+ self.ofsVerts = sz
+ for v in self.verts:
+ sz += v.GetSize()
+ self.ofsEnd = sz
+ return self.ofsEnd
+
+ def Save(self, file):
+ self.GetSize()
+ tmpData = [0] * 12
+ tmpData[0] = self.ident
+ tmpData[1] = self.name
+ tmpData[2] = self.flags
+ tmpData[3] = self.numFrames
+ tmpData[4] = self.numShaders
+ tmpData[5] = self.numVerts
+ tmpData[6] = self.numTriangles
+ tmpData[7] = self.ofsTriangles
+ tmpData[8] = self.ofsShaders
+ tmpData[9] = self.ofsUV
+ tmpData[10] = self.ofsVerts
+ tmpData[11] = self.ofsEnd
+ data = struct.pack(self.binaryFormat, tmpData[0],tmpData[1],tmpData[2],tmpData[3],tmpData[4],tmpData[5],tmpData[6],tmpData[7],tmpData[8],tmpData[9],tmpData[10],tmpData[11])
+ file.write(data)
- # write the tri data
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list