qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-17 22:50:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't bother with fullbright skins for models that are allways fullbright and

Browse source 
clean up a misplaced function prototype
This commit is contained in:
Bill Currie 2001-11-20 08:45:26 +00:00
parent b836566a3d
commit ec75b71711
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/model.h
View file

@ -460,6 +460,8 @@ model_t *Mod_FindName (const char *name);
void Mod_ProcessTexture(miptex_t *mt, texture_t *tx); void Mod_ProcessTexture(miptex_t *mt, texture_t *tx);
void Mod_LoadLighting (lump_t *l); void Mod_LoadLighting (lump_t *l);
int Mod_CalcFullbright (byte *in, byte *out, int pixels); int Mod_CalcFullbright (byte *in, byte *out, int pixels);
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);
void *Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame); void *Mod_LoadAliasGroup (void *pin, int *posenum, maliasframedesc_t *frame);

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

@ -135,13 +135,11 @@ Mod_FloodFillSkin (byte * skin, int skinwidth, int skinheight)
} }
} }
int Mod_Fullbright (byte * skin, int width, int height, char *name);
void * void *
Mod_LoadSkin (byte * skin, int skinsize, int snum, int gnum, qboolean group) Mod_LoadSkin (byte * skin, int skinsize, int snum, int gnum, qboolean group)
{ {
char name[32]; char name[32];
int fbtexnum; int fbtexnum = 0;
Mod_FloodFillSkin (skin, pheader->mdl.skinwidth, pheader->mdl.skinheight); Mod_FloodFillSkin (skin, pheader->mdl.skinwidth, pheader->mdl.skinheight);
// save 8 bit texels for the player model to remap // save 8 bit texels for the player model to remap
@ -161,9 +159,9 @@ Mod_LoadSkin (byte * skin, int skinsize, int snum, int gnum, qboolean group)
} else { } else {
snprintf (name, sizeof (name), "fb_%s_%i", loadmodel->name, snum); snprintf (name, sizeof (name), "fb_%s_%i", loadmodel->name, snum);
} }
fbtexnum = if (!loadmodel->fullbright)
Mod_Fullbright (skin + 1, pheader->mdl.skinwidth, fbtexnum = Mod_Fullbright (skin + 1, pheader->mdl.skinwidth,
pheader->mdl.skinheight, name); pheader->mdl.skinheight, name);
if ((loadmodel->hasfullbrights = (fbtexnum))) { if ((loadmodel->hasfullbrights = (fbtexnum))) {
pheader->gl_fb_texturenum[snum][gnum] = fbtexnum; pheader->gl_fb_texturenum[snum][gnum] = fbtexnum;
} }

5
libs/models/brush/gl_model_brush.c
View file

@ -48,13 +48,8 @@ static const char rcsid[] =
#include "compat.h" #include "compat.h"
int Mod_Fullbright (byte * skin, int width, int height, char *name);
const int mod_lightmap_bytes = 3; const int mod_lightmap_bytes = 3;
void void
Mod_ProcessTexture (miptex_t *mt, texture_t *tx) Mod_ProcessTexture (miptex_t *mt, texture_t *tx)
{ {