okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove RAVENMD4 #define

Browse source
This commit is contained in:
Tim Angus 2013-03-18 19:02:29 +00:00
parent e14a814ba2
commit ecd50f01c2
14 changed files with 3 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

19
code/renderergl1/tr_model.c
View file

@ -27,9 +27,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
static qboolean R_LoadMD3(model_t *mod, int lod, void *buffer, const char *name );
static qboolean R_LoadMD4(model_t *mod, void *buffer, const char *name );
#ifdef RAVENMD4
static qboolean R_LoadMDR(model_t *mod, void *buffer, int filesize, const char *name );
#endif
/*
====================
@ -116,7 +114,6 @@ qhandle_t R_RegisterMD3(const char *name, model_t *mod)
return 0;
}
#ifdef RAVENMD4
/*
====================
R_RegisterMDR
@ -154,7 +151,6 @@ qhandle_t R_RegisterMDR(const char *name, model_t *mod)
return mod->index;
}
#endif
/*
====================
@ -203,9 +199,7 @@ typedef struct
static modelExtToLoaderMap_t modelLoaders[ ] =
{
{ "iqm", R_RegisterIQM },
#ifdef RAVENMD4
{ "mdr", R_RegisterMDR },
#endif
{ "md4", R_RegisterMD3 },
{ "md3", R_RegisterMD3 }
};
@ -536,7 +530,6 @@ static qboolean R_LoadMD3 (model_t *mod, int lod, void *buffer, const char *mod_
}
#ifdef RAVENMD4
/*
=================
@ -875,7 +868,6 @@ static qboolean R_LoadMDR( model_t *mod, void *buffer, int filesize, const char
return qtrue;
}
#endif
/*
=================
@ -1136,7 +1128,6 @@ static md3Tag_t *R_GetTag( md3Header_t *mod, int frame, const char *tagName ) {
return NULL;
}
#ifdef RAVENMD4
void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t * dest)
{
int i, j, k;
@ -1180,7 +1171,6 @@ void R_GetAnimTag( mdrHeader_t *mod, int framenum, const char *tagName, md3Tag_t
VectorClear( dest->origin );
strcpy(dest->name,"");
}
#endif
/*
================
@ -1190,9 +1180,7 @@ R_LerpTag
int R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFrame,
float frac, const char *tagName ) {
md3Tag_t *start, *end;
#ifdef RAVENMD4
md3Tag_t start_space, end_space;
#endif
int i;
float frontLerp, backLerp;
model_t *model;
@ -1200,7 +1188,6 @@ int R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFram
model = R_GetModelByHandle( handle );
if ( !model->md3[0] )
{
#ifdef RAVENMD4
if(model->type == MOD_MDR)
{
start = &start_space;
@ -1208,9 +1195,7 @@ int R_LerpTag( orientation_t *tag, qhandle_t handle, int startFrame, int endFram
R_GetAnimTag((mdrHeader_t *) model->modelData, startFrame, tagName, start);
R_GetAnimTag((mdrHeader_t *) model->modelData, endFrame, tagName, end);
}
else
#endif
if( model->type == MOD_IQM ) {
else if( model->type == MOD_IQM ) {
return R_IQMLerpTag( tag, model->modelData,
startFrame, endFrame,
frac, tagName );
@ -1286,7 +1271,6 @@ void R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs ) {
VectorCopy( frame->bounds[1], maxs );
return;
#ifdef RAVENMD4
} else if (model->type == MOD_MDR) {
mdrHeader_t *header;
mdrFrame_t *frame;
@ -1298,7 +1282,6 @@ void R_ModelBounds( qhandle_t handle, vec3_t mins, vec3_t maxs ) {
VectorCopy( frame->bounds[1], maxs );
return;
#endif
} else if(model->type == MOD_IQM) {
iqmData_t *iqmData;