diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-11-13 00:16:53 +0300 |
commit | bdfe7d89e2f1292644577972c716931b4ce3c6c3 (patch) | |
tree | d00eb50b749cb001e2b08272c91791e66740b05d /release/scripts/export_mdd.py | |
parent | 78a1c27c4a6abe0ed31ca93ad21910f3df04da56 (diff) | |
parent | 7e4db234cee71ead34ee81a12e27da4bd548eb4b (diff) |
Merge of trunk into blender 2.5:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416
Issues:
* GHOST/X11 had conflicting changes. Some code was added in 2.5, which was
later added in trunk also, but reverted partially, specifically revision
16683. I have left out this reversion in the 2.5 branch since I think it is
needed there.
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683
* Scons had various conflicting changes, I decided to go with trunk version
for everything except priorities and some library renaming.
* In creator.c, there were various fixes and fixes for fixes related to the -w
-W and -p options. In 2.5 -w and -W is not coded yet, and -p is done
differently. Since this is changed so much, and I don't think those fixes
would be needed in 2.5, I've left them out.
* Also in creator.c: there was code for a python bugfix where the screen was not
initialized when running with -P. The code that initializes the screen there
I had to disable, that can't work in 2.5 anymore but left it commented as a
reminder.
Further I had to disable some new function calls. using src/ and python/, as
was done already in this branch, disabled function calls:
* bpath.c: error reporting
* BME_conversions.c: editmesh conversion functions.
* SHD_dynamic: disabled almost completely, there is no python/.
* KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled.
* text.c: clipboard copy call.
* object.c: OB_SUPPORT_MATERIAL.
* DerivedMesh.c and subsurf_ccg, stipple_quarttone.
Still to be done:
* Go over files and functions that were moved to a different location but could
still use changes that were done in trunk.
Diffstat (limited to 'release/scripts/export_mdd.py')
-rw-r--r-- | release/scripts/export_mdd.py | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/release/scripts/export_mdd.py b/release/scripts/export_mdd.py index 42a85029505..4f99c9175fd 100644 --- a/release/scripts/export_mdd.py +++ b/release/scripts/export_mdd.py @@ -45,7 +45,7 @@ try: except: pack = None - + def zero_file(filepath): ''' If a file fails, this replaces it with 1 char, better not remove it? @@ -54,11 +54,24 @@ def zero_file(filepath): file.write('\n') # aparently macosx needs some data in a blank file? file.close() + +def check_vertcount(mesh,vertcount): + ''' + check and make sure the vertcount is consistent throghout the frame range + ''' + if len(mesh.verts) != vertcount: + Blender.Draw.PupMenu('Error%t|Number of verts has changed during animation|cannot export') + f.close() + zero_file(filepath) + return + + def mdd_export(filepath, ob, PREF_STARTFRAME, PREF_ENDFRAME, PREF_FPS): Window.EditMode(0) Blender.Window.WaitCursor(1) - mesh_orig = ob.getData(mesh=1) + mesh_orig = Mesh.New() + mesh_orig.getFromObject(ob.name) #Flip y and z ''' @@ -83,23 +96,25 @@ def mdd_export(filepath, ob, PREF_STARTFRAME, PREF_ENDFRAME, PREF_FPS): f = open(filepath, 'wb') #no Errors yet:Safe to create file # Write the header - f.write(pack(">2i", numframes-1, numverts)) + f.write(pack(">2i", numframes, numverts)) # Write the frame times (should we use the time IPO??) - f.write( pack(">%df" % (numframes-1), *[frame/PREF_FPS for frame in xrange(numframes-1)]) ) # seconds + f.write( pack(">%df" % (numframes), *[frame/PREF_FPS for frame in xrange(numframes)]) ) # seconds + #rest frame needed to keep frames in sync Blender.Set('curframe', PREF_STARTFRAME) + me_tmp.getFromObject(ob.name) + check_vertcount(me_tmp,numverts) + me_tmp.transform(ob.matrixWorld * mat_flip) + f.write(pack(">%df" % (numverts*3), *[axis for v in me_tmp.verts for axis in v.co])) + me_tmp.verts= None + for frame in xrange(PREF_STARTFRAME,PREF_ENDFRAME+1):#in order to start at desired frame Blender.Set('curframe', frame) - # Blender.Window.RedrawAll() # not needed + me_tmp.getFromObject(ob.name) - if len(me_tmp.verts) != numverts: - Blender.Draw.PupMenu('Error%t|Number of verts has changed during animation|cannot export') - Blender.Window.WaitCursor(0) - f.close() # should we zero? - zero_file(filepath) - return + check_vertcount(me_tmp,numverts) me_tmp.transform(ob.matrixWorld * mat_flip) @@ -150,4 +165,4 @@ if __name__=='__main__': if not pack: Draw.PupMenu('Error%t|This script requires a full python install') - Blender.Window.FileSelector(mdd_export_ui, 'EXPORT MDD', sys.makename(ext='.mdd')) + Blender.Window.FileSelector(mdd_export_ui, 'EXPORT MDD', sys.makename(ext='.mdd'))
\ No newline at end of file |