ubergames
/
lilium-voyager
mirror of https://github.com/UberGames/lilium-voyager.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make R_LerpTag return qfalse if MDR tag does not exist 

Elite Force SDK has trap_R_LerpTag return void, so this shouldn't cause issues for iostvef.
Allows new games to check if a tag exists in a MDR model.
This commit is contained in:
Zack Middleton 2014-05-06 20:39:17 -05:00
parent b9061c8447
commit 3a7298d6ae
2 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
code/renderergl1/tr_model.c
View File

@ -966,7 +966,7 @@ static md3Tag_t *R_GetTag( md3Header_t *mod, int frame, const char *tagName ) {
return NULL; return NULL;
} }
void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t * dest) md3Tag_t *R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t * dest)
{ {
int i, j, k; int i, j, k;
int frameSize; int frameSize;
@ -1001,13 +1001,11 @@ void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t
dest->origin[1]=frame->bones[tag->boneIndex].matrix[1][3]; dest->origin[1]=frame->bones[tag->boneIndex].matrix[1][3];
dest->origin[2]=frame->bones[tag->boneIndex].matrix[2][3]; dest->origin[2]=frame->bones[tag->boneIndex].matrix[2][3];
return; return dest;
} }
} }
AxisClear( dest->axis ); return NULL;
VectorClear( dest->origin );
strcpy(dest->name,"");
} }
/* /*
@ -1028,34 +1026,29 @@ int R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFram
{ {
if(model->type == MOD_MDR) if(model->type == MOD_MDR)
{ {
start = &start_space; start = R_GetAnimTag((mdrHeader_t *) model->modelData, startFrame, tagName, &start_space);
end = &end_space; end = R_GetAnimTag((mdrHeader_t *) model->modelData, endFrame, tagName, &end_space);
R_GetAnimTag((mdrHeader_t *) model->modelData, startFrame, tagName, start);
R_GetAnimTag((mdrHeader_t *) model->modelData, endFrame, tagName, end);
} }
else if( model->type == MOD_IQM ) { else if( model->type == MOD_IQM ) {
return R_IQMLerpTag( tag, model->modelData, return R_IQMLerpTag( tag, model->modelData,
startFrame, endFrame, startFrame, endFrame,
frac, tagName ); frac, tagName );
} else { } else {
start = end = NULL;
AxisClear( tag->axis );
VectorClear( tag->origin );
return qfalse;
} }
} }
else else
{ {
start = R_GetTag( model->md3[0], startFrame, tagName ); start = R_GetTag( model->md3[0], startFrame, tagName );
end = R_GetTag( model->md3[0], endFrame, tagName ); end = R_GetTag( model->md3[0], endFrame, tagName );
if ( !start || !end ) {
AxisClear( tag->axis );
VectorClear( tag->origin );
return qfalse;
}
} }
if ( !start || !end ) {
AxisClear( tag->axis );
VectorClear( tag->origin );
return qfalse;
}
frontLerp = frac; frontLerp = frac;
backLerp = 1.0f - frac; backLerp = 1.0f - frac;

32
code/renderergl2/tr_model.c
View File

@ -1230,7 +1230,7 @@ static mdvTag_t *R_GetTag( mdvModel_t *mod, int frame, const char *_tagName ) {
return NULL; return NULL;
} }
void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, mdvTag_t * dest) mdvTag_t *R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, mdvTag_t * dest)
{ {
int i, j, k; int i, j, k;
int frameSize; int frameSize;
@ -1263,12 +1263,11 @@ void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, mdvTag_t
dest->origin[1]=frame->bones[tag->boneIndex].matrix[1][3]; dest->origin[1]=frame->bones[tag->boneIndex].matrix[1][3];
dest->origin[2]=frame->bones[tag->boneIndex].matrix[2][3]; dest->origin[2]=frame->bones[tag->boneIndex].matrix[2][3];
return; return dest;
} }
} }
AxisClear( dest->axis ); return NULL;
VectorClear( dest->origin );
} }
/* /*
@ -1289,34 +1288,29 @@ int R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFram
{ {
if(model->type == MOD_MDR) if(model->type == MOD_MDR)
{ {
start = &start_space; start = R_GetAnimTag((mdrHeader_t *) model->modelData, startFrame, tagName, &start_space);
end = &end_space; end = R_GetAnimTag((mdrHeader_t *) model->modelData, endFrame, tagName, &end_space);
R_GetAnimTag((mdrHeader_t *) model->modelData, startFrame, tagName, start);
R_GetAnimTag((mdrHeader_t *) model->modelData, endFrame, tagName, end);
} }
else if( model->type == MOD_IQM ) { else if( model->type == MOD_IQM ) {
return R_IQMLerpTag( tag, model->modelData, return R_IQMLerpTag( tag, model->modelData,
startFrame, endFrame, startFrame, endFrame,
frac, tagName ); frac, tagName );
} else { } else {
start = end = NULL;
AxisClear( tag->axis );
VectorClear( tag->origin );
return qfalse;
} }
} }
else else
{ {
start = R_GetTag( model->mdv[0], startFrame, tagName ); start = R_GetTag( model->mdv[0], startFrame, tagName );
end = R_GetTag( model->mdv[0], endFrame, tagName ); end = R_GetTag( model->mdv[0], endFrame, tagName );
if ( !start || !end ) {
AxisClear( tag->axis );
VectorClear( tag->origin );
return qfalse;
}
} }
if ( !start || !end ) {
AxisClear( tag->axis );
VectorClear( tag->origin );
return qfalse;
}
frontLerp = frac; frontLerp = frac;
backLerp = 1.0f - frac; backLerp = 1.0f - frac;