mirror of
https://git.code.sf.net/p/quake/newtree
synced 2025-05-31 09:11:06 +00:00
Okay, the big whitespace reformat. There is some silliness (case
statements, variable declarations), but all in all it's not bad.
This commit is contained in:
Jeff Teunissen
parent
b62d75a774
commit
54e2a4d9d3
172 changed files with 26949 additions and 26640 deletions
|
|
@ -30,7 +30,7 @@
|
|||
// on the same machine.
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include <config.h>
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRING_H
|
||||
|
|
@ -53,8 +53,10 @@
|
|||
extern char loadname[];
|
||||
extern model_t *loadmodel;
|
||||
|
||||
void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype, int *pskinindex);
|
||||
void GL_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr);
|
||||
void *Mod_LoadAllSkins (int numskins, daliasskintype_t *pskintype,
|
||||
|
||||
int *pskinindex);
|
||||
void GL_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr);
|
||||
|
||||
/*
|
||||
==============================================================================
|
||||
|
|
@ -64,18 +66,18 @@ ALIAS MODELS
|
|||
==============================================================================
|
||||
*/
|
||||
|
||||
aliashdr_t *pheader;
|
||||
aliashdr_t *pheader;
|
||||
|
||||
stvert_t stverts[MAXALIASVERTS];
|
||||
mtriangle_t triangles[MAXALIASTRIS];
|
||||
stvert_t stverts[MAXALIASVERTS];
|
||||
mtriangle_t triangles[MAXALIASTRIS];
|
||||
|
||||
// a pose is a single set of vertexes. a frame may be
|
||||
// an animating sequence of poses
|
||||
trivertx_t *poseverts[MAXALIASFRAMES];
|
||||
int posenum = 0;
|
||||
trivertx_t *poseverts[MAXALIASFRAMES];
|
||||
int posenum = 0;
|
||||
|
||||
void *Mod_LoadAliasFrame (void * pin, maliasframedesc_t *frame);
|
||||
void *Mod_LoadAliasGroup (void * pin, maliasframedesc_t *frame);
|
||||
void *Mod_LoadAliasFrame (void *pin, maliasframedesc_t *frame);
|
||||
void *Mod_LoadAliasGroup (void *pin, maliasframedesc_t *frame);
|
||||
|
||||
|
||||
//=========================================================================
|
||||
|
|
@ -85,62 +87,65 @@ void *Mod_LoadAliasGroup (void * pin, maliasframedesc_t *frame);
|
|||
Mod_LoadAliasModel
|
||||
=================
|
||||
*/
|
||||
void Mod_LoadAliasModel (model_t *mod, void *buffer)
|
||||
void
|
||||
Mod_LoadAliasModel (model_t *mod, void *buffer)
|
||||
{
|
||||
int i, j;
|
||||
mdl_t *pinmodel, *pmodel;
|
||||
stvert_t *pinstverts;
|
||||
dtriangle_t *pintriangles;
|
||||
int version, numframes;
|
||||
int size;
|
||||
daliasframetype_t *pframetype;
|
||||
daliasskintype_t *pskintype;
|
||||
int start, end, total;
|
||||
int i, j;
|
||||
mdl_t *pinmodel, *pmodel;
|
||||
stvert_t *pinstverts;
|
||||
dtriangle_t *pintriangles;
|
||||
int version, numframes;
|
||||
int size;
|
||||
daliasframetype_t *pframetype;
|
||||
daliasskintype_t *pskintype;
|
||||
int start, end, total;
|
||||
|
||||
if (!strcmp(loadmodel->name, "progs/player.mdl") ||
|
||||
!strcmp(loadmodel->name, "progs/eyes.mdl")) {
|
||||
if (!strcmp (loadmodel->name, "progs/player.mdl") ||
|
||||
!strcmp (loadmodel->name, "progs/eyes.mdl")) {
|
||||
unsigned short crc;
|
||||
byte *p;
|
||||
int len;
|
||||
char st[40];
|
||||
byte *p;
|
||||
int len;
|
||||
char st[40];
|
||||
|
||||
CRC_Init(&crc);
|
||||
CRC_Init (&crc);
|
||||
for (len = com_filesize, p = buffer; len; len--, p++)
|
||||
CRC_ProcessByte(&crc, *p);
|
||||
|
||||
snprintf(st, sizeof(st), "%d", (int) crc);
|
||||
Info_SetValueForKey (cls.userinfo,
|
||||
!strcmp(loadmodel->name, "progs/player.mdl") ? pmodel_name : emodel_name,
|
||||
st, MAX_INFO_STRING);
|
||||
CRC_ProcessByte (&crc, *p);
|
||||
|
||||
snprintf (st, sizeof (st), "%d", (int) crc);
|
||||
Info_SetValueForKey (cls.userinfo,
|
||||
!strcmp (loadmodel->name,
|
||||
"progs/player.mdl") ? pmodel_name :
|
||||
emodel_name, st, MAX_INFO_STRING);
|
||||
|
||||
if (cls.state >= ca_connected) {
|
||||
MSG_WriteByte (&cls.netchan.message, clc_stringcmd);
|
||||
snprintf(st, sizeof(st), "setinfo %s %d",
|
||||
!strcmp(loadmodel->name, "progs/player.mdl") ? pmodel_name : emodel_name,
|
||||
(int)crc);
|
||||
snprintf (st, sizeof (st), "setinfo %s %d",
|
||||
!strcmp (loadmodel->name,
|
||||
"progs/player.mdl") ? pmodel_name : emodel_name,
|
||||
(int) crc);
|
||||
SZ_Print (&cls.netchan.message, st);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
start = Hunk_LowMark ();
|
||||
|
||||
pinmodel = (mdl_t *)buffer;
|
||||
pinmodel = (mdl_t *) buffer;
|
||||
|
||||
version = LittleLong (pinmodel->version);
|
||||
if (version != ALIAS_VERSION)
|
||||
SV_Error ("%s has wrong version number (%i should be %i)",
|
||||
mod->name, version, ALIAS_VERSION);
|
||||
mod->name, version, ALIAS_VERSION);
|
||||
|
||||
//
|
||||
// allocate space for a working header, plus all the data except the frames,
|
||||
// skin and group info
|
||||
//
|
||||
size = (int)&((aliashdr_t*)0)->frames[LittleLong (pinmodel->numframes)];
|
||||
size = (int) &((aliashdr_t *) 0)->frames[LittleLong (pinmodel->numframes)];
|
||||
pheader = Hunk_AllocName (size, loadname);
|
||||
memset(pheader, 0, size);
|
||||
memset (pheader, 0, size);
|
||||
pmodel = &pheader->mdl;
|
||||
pheader->model = (byte*)pmodel - (byte*)pheader;
|
||||
|
||||
pheader->model = (byte *) pmodel - (byte *) pheader;
|
||||
|
||||
mod->flags = LittleLong (pinmodel->flags);
|
||||
|
||||
//
|
||||
|
|
@ -153,7 +158,7 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
|
|||
|
||||
if (pmodel->skinheight > MAX_LBM_HEIGHT)
|
||||
SV_Error ("model %s has a skin taller than %d", mod->name,
|
||||
MAX_LBM_HEIGHT);
|
||||
MAX_LBM_HEIGHT);
|
||||
|
||||
pmodel->numverts = LittleLong (pinmodel->numverts);
|
||||
|
||||
|
|
@ -177,8 +182,7 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
|
|||
mod->synctype = LittleLong (pinmodel->synctype);
|
||||
mod->numframes = pmodel->numframes;
|
||||
|
||||
for (i=0 ; i<3 ; i++)
|
||||
{
|
||||
for (i = 0; i < 3; i++) {
|
||||
pmodel->scale[i] = LittleFloat (pinmodel->scale[i]);
|
||||
pmodel->scale_origin[i] = LittleFloat (pinmodel->scale_origin[i]);
|
||||
pmodel->eyeposition[i] = LittleFloat (pinmodel->eyeposition[i]);
|
||||
|
|
@ -188,16 +192,16 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
|
|||
//
|
||||
// load the skins
|
||||
//
|
||||
pskintype = (daliasskintype_t *)&pinmodel[1];
|
||||
pskintype = Mod_LoadAllSkins (pheader->mdl.numskins, pskintype, &pheader->skindesc);
|
||||
pskintype = (daliasskintype_t *) &pinmodel[1];
|
||||
pskintype =
|
||||
Mod_LoadAllSkins (pheader->mdl.numskins, pskintype, &pheader->skindesc);
|
||||
|
||||
//
|
||||
// load base s and t vertices
|
||||
//
|
||||
pinstverts = (stvert_t *)pskintype;
|
||||
pinstverts = (stvert_t *) pskintype;
|
||||
|
||||
for (i=0 ; i<pheader->mdl.numverts ; i++)
|
||||
{
|
||||
for (i = 0; i < pheader->mdl.numverts; i++) {
|
||||
stverts[i].onseam = LittleLong (pinstverts[i].onseam);
|
||||
stverts[i].s = LittleLong (pinstverts[i].s);
|
||||
stverts[i].t = LittleLong (pinstverts[i].t);
|
||||
|
|
@ -206,16 +210,14 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
|
|||
//
|
||||
// load triangle lists
|
||||
//
|
||||
pintriangles = (dtriangle_t *)&pinstverts[pheader->mdl.numverts];
|
||||
pintriangles = (dtriangle_t *) &pinstverts[pheader->mdl.numverts];
|
||||
|
||||
for (i=0 ; i<pheader->mdl.numtris ; i++)
|
||||
{
|
||||
for (i = 0; i < pheader->mdl.numtris; i++) {
|
||||
triangles[i].facesfront = LittleLong (pintriangles[i].facesfront);
|
||||
|
||||
for (j=0 ; j<3 ; j++)
|
||||
{
|
||||
for (j = 0; j < 3; j++) {
|
||||
triangles[i].vertindex[j] =
|
||||
LittleLong (pintriangles[i].vertindex[j]);
|
||||
LittleLong (pintriangles[i].vertindex[j]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -223,24 +225,20 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
|
|||
// load the frames
|
||||
//
|
||||
posenum = 0;
|
||||
pframetype = (daliasframetype_t *)&pintriangles[pheader->mdl.numtris];
|
||||
pframetype = (daliasframetype_t *) &pintriangles[pheader->mdl.numtris];
|
||||
|
||||
for (i=0 ; i<numframes ; i++)
|
||||
{
|
||||
aliasframetype_t frametype;
|
||||
for (i = 0; i < numframes; i++) {
|
||||
aliasframetype_t frametype;
|
||||
|
||||
frametype = LittleLong (pframetype->type);
|
||||
pheader->frames[i].type = frametype;
|
||||
|
||||
if (frametype == ALIAS_SINGLE)
|
||||
{
|
||||
if (frametype == ALIAS_SINGLE) {
|
||||
pframetype = (daliasframetype_t *)
|
||||
Mod_LoadAliasFrame (pframetype + 1, &pheader->frames[i]);
|
||||
}
|
||||
else
|
||||
{
|
||||
Mod_LoadAliasFrame (pframetype + 1, &pheader->frames[i]);
|
||||
} else {
|
||||
pframetype = (daliasframetype_t *)
|
||||
Mod_LoadAliasGroup (pframetype + 1, &pheader->frames[i]);
|
||||
Mod_LoadAliasGroup (pframetype + 1, &pheader->frames[i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -252,17 +250,17 @@ void Mod_LoadAliasModel (model_t *mod, void *buffer)
|
|||
mod->mins[0] = mod->mins[1] = mod->mins[2] = -16;
|
||||
mod->maxs[0] = mod->maxs[1] = mod->maxs[2] = 16;
|
||||
|
||||
//
|
||||
//
|
||||
// build the draw lists
|
||||
//
|
||||
//
|
||||
GL_MakeAliasModelDisplayLists (mod, pheader);
|
||||
|
||||
//
|
||||
// move the complete, relocatable alias model to the cache
|
||||
//
|
||||
//
|
||||
end = Hunk_LowMark ();
|
||||
total = end - start;
|
||||
|
||||
|
||||
Cache_Alloc (&mod->cache, total, loadname);
|
||||
if (!mod->cache.data)
|
||||
return;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue