qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-25 02:52:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

high precision model loading

Browse source
This commit is contained in:
Seth Galbraith 2001-12-30 02:30:26 +00:00
parent 94b1683862
commit d570f0905f
7 changed files with 67 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/QF/model.h
View file

@ -462,12 +462,12 @@ int Mod_CalcFullbright (byte *in, byte *out, int pixels);
int Mod_Fullbright (byte * skin, int width, int height, char *name); int Mod_Fullbright (byte * skin, int width, int height, char *name);
void *Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame); void *Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame, int extra);
void *Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame); void *Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame, int extra);
void *Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum, void *Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
qboolean group, maliasskindesc_t *skindesc); qboolean group, maliasskindesc_t *skindesc);
void Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, void Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m,
int _s); int _s, int extra);
void Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr); void Mod_FinalizeAliasModel (model_t *m, aliashdr_t *hdr);
void Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum); void Mod_SpriteLoadTexture (mspriteframe_t *pspriteframe, int framenum);

4
include/QF/modelgen.h
View file

@ -126,4 +126,8 @@ typedef struct {
#define IDPOLYHEADER (('O'<<24)+('P'<<16)+('D'<<8)+'I') #define IDPOLYHEADER (('O'<<24)+('P'<<16)+('D'<<8)+'I')
// little-endian "IDPO" // little-endian "IDPO"
// special header indicating 16 bit vertices - little-endian "MD16"
#define POLYHEADER16 (('6'<<24)+('1'<<16)+('D'<<8)+'M')
#endif // _MODELGEN_H #endif // _MODELGEN_H

18
libs/models/alias/gl_mesh.c
View file

@ -342,7 +342,7 @@ BuildTris (void)
} }
void void
Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, int _s) Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, int _s, int extra)
{ {
int i, j; int i, j;
int *cmds; int *cmds;
@ -489,11 +489,21 @@ Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, int _s)
paliashdr->commands = (byte *) cmds - (byte *) paliashdr; paliashdr->commands = (byte *) cmds - (byte *) paliashdr;
memcpy (cmds, commands, numcommands * sizeof (int)); memcpy (cmds, commands, numcommands * sizeof (int));
verts = Hunk_Alloc (paliashdr->numposes * paliashdr->poseverts if (extra)
verts = Hunk_Alloc (paliashdr->numposes * paliashdr->poseverts
* sizeof (trivertx_t) * 2);
else
verts = Hunk_Alloc (paliashdr->numposes * paliashdr->poseverts
* sizeof (trivertx_t)); * sizeof (trivertx_t));
paliashdr->posedata = (byte *) verts - (byte *) paliashdr; paliashdr->posedata = (byte *) verts - (byte *) paliashdr;
for (i = 0; i < paliashdr->numposes; i++) for (i = 0; i < paliashdr->numposes; i++)
{
for (j = 0; j < numorder; j++) for (j = 0; j < numorder; j++)
*verts++ = poseverts[i][vertexorder[j]]; *verts++ = poseverts[i][vertexorder[j]];
if (extra)
for (j = 0; j < numorder; j++)
*verts++ = poseverts[i][vertexorder[j] + hdr->mdl.numverts];
}
} }

16
libs/models/alias/gl_model_alias.c
View file

@ -182,7 +182,7 @@ Mod_LoadSkin (byte * skin, int skinsize, int snum, int gnum, qboolean group,
} }
void * void *
Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame) Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame, int extra)
{ {
trivertx_t *pinframe; trivertx_t *pinframe;
int i; int i;
@ -205,13 +205,16 @@ Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame)
poseverts[(*posenum)] = pinframe; poseverts[(*posenum)] = pinframe;
(*posenum)++; (*posenum)++;
pinframe += pheader->mdl.numverts; if (extra)
pinframe += pheader->mdl.numverts * 2;
else
pinframe += pheader->mdl.numverts;
return (void *) pinframe; return (void *) pinframe;
} }
void * void *
Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame) Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame, int extra)
{ {
daliasgroup_t *pingroup; daliasgroup_t *pingroup;
int i, numframes; int i, numframes;
@ -242,7 +245,12 @@ Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame)
for (i = 0; i < numframes; i++) { for (i = 0; i < numframes; i++) {
poseverts[(*posenum)] = (trivertx_t *) ((daliasframe_t *) ptemp + 1); poseverts[(*posenum)] = (trivertx_t *) ((daliasframe_t *) ptemp + 1);
(*posenum)++; (*posenum)++;
ptemp = (trivertx_t *) ((daliasframe_t *) ptemp + 1) + pheader->mdl.numverts; if (extra)
ptemp = (trivertx_t *) ((daliasframe_t *) ptemp + 1)
+ pheader->mdl.numverts * 2;
else
ptemp = (trivertx_t *) ((daliasframe_t *) ptemp + 1)
+ pheader->mdl.numverts;
} }
return ptemp; return ptemp;
} }

11
libs/models/alias/model_alias.c
View file

@ -151,6 +151,11 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
unsigned short crc; unsigned short crc;
void *mem; void *mem;
int extra = 0; // extra precision bytes
if (LittleLong (*(unsigned int *) buffer) == POLYHEADER16)
extra = 1; // extra precision bytes
CRC_Init (&crc); CRC_Init (&crc);
for (len = com_filesize, p = buffer; len; len--, p++) for (len = com_filesize, p = buffer; len; len--, p++)
CRC_ProcessByte (&crc, *p); CRC_ProcessByte (&crc, *p);
@ -253,11 +258,11 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
if (frametype == ALIAS_SINGLE) { if (frametype == ALIAS_SINGLE) {
pframetype = (daliasframetype_t *) pframetype = (daliasframetype_t *)
Mod_LoadAliasFrame (pframetype + 1, &posenum, Mod_LoadAliasFrame (pframetype + 1, &posenum,
&pheader->frames[i]); &pheader->frames[i], extra);
} else { } else {
pframetype = (daliasframetype_t *) pframetype = (daliasframetype_t *)
Mod_LoadAliasGroup (pframetype + 1, &posenum, Mod_LoadAliasGroup (pframetype + 1, &posenum,
&pheader->frames[i]); &pheader->frames[i], extra);
} }
} }
@ -270,7 +275,7 @@ Mod_LoadAliasModel (model_t *mod, void *buffer, cache_allocator_t allocator)
mod->maxs[0] = mod->maxs[1] = mod->maxs[2] = 16; mod->maxs[0] = mod->maxs[1] = mod->maxs[2] = 16;
// build the draw lists // build the draw lists
Mod_MakeAliasModelDisplayLists (mod, pheader, buffer, com_filesize); Mod_MakeAliasModelDisplayLists (mod, pheader, buffer, com_filesize, extra);
Mod_FinalizeAliasModel (mod, pheader); Mod_FinalizeAliasModel (mod, pheader);

31
libs/models/alias/sw_model_alias.c
View file

@ -73,7 +73,7 @@ Mod_LoadSkin (byte *skin, int skinsize, int snum, int gnum,
} }
void void
Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, int _s) Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, int _s, int extra)
{ {
int i, j; int i, j;
stvert_t *pstverts; stvert_t *pstverts;
@ -104,7 +104,7 @@ Mod_MakeAliasModelDisplayLists (model_t *m, aliashdr_t *hdr, void *_m, int _s)
} }
void * void *
Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame) Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame, int extra)
{ {
trivertx_t *pframe, *pinframe; trivertx_t *pframe, *pinframe;
int i, j; int i, j;
@ -121,7 +121,12 @@ Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame)
} }
pinframe = (trivertx_t *) (pdaliasframe + 1); pinframe = (trivertx_t *) (pdaliasframe + 1);
pframe = Hunk_AllocName (pheader->mdl.numverts * sizeof (*pframe),
if (extra)
pframe = Hunk_AllocName (pheader->mdl.numverts * sizeof (*pframe) * 2,
loadname);
else
pframe = Hunk_AllocName (pheader->mdl.numverts * sizeof (*pframe),
loadname); loadname);
frame->frame = (byte *) pframe - (byte *) pheader; frame->frame = (byte *) pframe - (byte *) pheader;
@ -137,13 +142,27 @@ Mod_LoadAliasFrame (void *pin, int *posenum, maliasframedesc_t *frame)
} }
} }
pinframe += pheader->mdl.numverts; if (extra)
{
for (j = pheader->mdl.numverts; j < pheader->mdl.numverts * 2; j++)
{
int k;
for (k = 0; k < 3; k++)
pframe[j].v[k] = pinframe[j].v[k];
}
}
if (extra)
pinframe += pheader->mdl.numverts * 2;
else
pinframe += pheader->mdl.numverts;
return (void *) pinframe; return (void *) pinframe;
} }
void * void *
Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame) Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame, int extra)
{ {
daliasgroup_t *pingroup; daliasgroup_t *pingroup;
maliasgroup_t *paliasgroup; maliasgroup_t *paliasgroup;
@ -187,7 +206,7 @@ Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame)
for (i = 0; i < numframes; i++) { for (i = 0; i < numframes; i++) {
maliasframedesc_t temp_frame; maliasframedesc_t temp_frame;
ptemp = Mod_LoadAliasFrame (ptemp, &i, &temp_frame); ptemp = Mod_LoadAliasFrame (ptemp, &i, &temp_frame, extra);
memcpy (&paliasgroup->frames[i], &temp_frame, memcpy (&paliasgroup->frames[i], &temp_frame,
sizeof(paliasgroup->frames[i])); sizeof(paliasgroup->frames[i]));
} }

1
libs/models/model.c
View file

@ -215,6 +215,7 @@ Mod_RealLoadModel (model_t *mod, qboolean crash, cache_allocator_t allocator)
switch (LittleLong (*(unsigned int *) buf)) { switch (LittleLong (*(unsigned int *) buf)) {
case IDPOLYHEADER: case IDPOLYHEADER:
case POLYHEADER16:
Mod_LoadAliasModel (mod, buf, allocator); Mod_LoadAliasModel (mod, buf, allocator);
break; break;