random-mirrors/librw
1
0
Fork 0
mirror of https://github.com/aap/librw.git synced 2025-02-16 17:26:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed major bug in frame stream write

Browse Source
This commit is contained in:
aap 2015-08-11 21:48:23 +02:00
parent c620ad8692
commit fc043fbddb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/clump.cpp
View File

@ -409,7 +409,8 @@ Clump::frameListStreamWrite(Stream *stream, Frame **frameList, int32 numFrames)
buf.pos[0] = f->matrix[12]; buf.pos[0] = f->matrix[12];
buf.pos[1] = f->matrix[13]; buf.pos[1] = f->matrix[13];
buf.pos[2] = f->matrix[14]; buf.pos[2] = f->matrix[14];
buf.parent = findPointer((void*)f, (void**)frameList,numFrames); buf.parent = findPointer((void*)f->parent, (void**)frameList,
numFrames);
buf.matflag = f->matflag; buf.matflag = f->matflag;
stream->write(&buf, sizeof(buf)); stream->write(&buf, sizeof(buf));
} }

5
src/plugins.cpp
View File

@ -60,7 +60,7 @@ copyHAnim(void *dst, void *src, int32 offset, int32)
static void static void
readHAnim(Stream *stream, int32, void *object, int32 offset, int32) readHAnim(Stream *stream, int32, void *object, int32 offset, int32)
{ {
int32 cnst, numNodes; int32 ver, numNodes;
HAnimData *hanim = PLUGINOFFSET(HAnimData, object, offset); HAnimData *hanim = PLUGINOFFSET(HAnimData, object, offset);
ver = stream->readI32(); ver = stream->readI32();
if(ver != 0x100){ if(ver != 0x100){
@ -120,8 +120,11 @@ static int32
getSizeHAnim(void *object, int32 offset, int32) getSizeHAnim(void *object, int32 offset, int32)
{ {
HAnimData *hanim = PLUGINOFFSET(HAnimData, object, offset); HAnimData *hanim = PLUGINOFFSET(HAnimData, object, offset);
if(version >= 0x34000 && hanim->id == -1 && hanim->hierarchy == NULL)
return -1;
if(hanim->hierarchy) if(hanim->hierarchy)
return 12 + 8 + hanim->hierarchy->numNodes*12; return 12 + 8 + hanim->hierarchy->numNodes*12;
// TODO: version correct?
return 12; return 12;
} }