nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-01-19 06:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

tightened lightmap loading, added traces.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@315 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2004-10-07 13:16:43 +00:00
parent db58b57cf8
commit 738993eba9
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
engine/gl/gl_model.c
View file

@ -824,7 +824,7 @@ void GLMod_LoadAdvancedTextureSection(char *section, char *name, int *base, int
if (!*stdname && !*flatname) if (!*stdname && !*flatname)
return; return;
TRACE(("dbg: GLMod_LoadAdvancedTextureSection: %s\n", name));
if (norm && gl_bumpmappingpossible && cls.allow_bump) if (norm && gl_bumpmappingpossible && cls.allow_bump)
{ {
*base = 0; *base = 0;
@ -887,6 +887,8 @@ void GLMod_LoadTextures (lump_t *l)
qboolean alphaed; qboolean alphaed;
qbyte *base; qbyte *base;
TRACE(("dbg: GLMod_LoadTextures: inittexturedescs\n"));
GLMod_InitTextureDescs(loadname); GLMod_InitTextureDescs(loadname);
if (!l->filelen) if (!l->filelen)
@ -907,6 +909,9 @@ void GLMod_LoadTextures (lump_t *l)
if (m->dataofs[i] == -1) //e1m2, this happens if (m->dataofs[i] == -1) //e1m2, this happens
continue; continue;
mt = (miptex_t *)((qbyte *)m + m->dataofs[i]); mt = (miptex_t *)((qbyte *)m + m->dataofs[i]);
TRACE(("dbg: GLMod_LoadTextures: texture %s\n", loadname));
mt->width = LittleLong (mt->width); mt->width = LittleLong (mt->width);
mt->height = LittleLong (mt->height); mt->height = LittleLong (mt->height);
for (j=0 ; j<MIPLEVELS ; j++) for (j=0 ; j<MIPLEVELS ; j++)
@ -1220,7 +1225,13 @@ void GLMod_LoadLighting (lump_t *l)
else else
BuildLightMapGammaTable(1, 1); BuildLightMapGammaTable(1, 1);
loadmodel->lightdata = NULL;
loadmodel->deluxdata = NULL; loadmodel->deluxdata = NULL;
if (!l->filelen)
{
return;
}
if (r_loadlits.value && gl_bumpmappingpossible) //fixme: adjust the light intensities. if (r_loadlits.value && gl_bumpmappingpossible) //fixme: adjust the light intensities.
{ //the map util has a '-scalecos X' parameter. use 0 if you're going to use only just lux. without lux scalecos 0 is hideous. { //the map util has a '-scalecos X' parameter. use 0 if you're going to use only just lux. without lux scalecos 0 is hideous.
char luxname[MAX_QPATH]; char luxname[MAX_QPATH];
@ -1319,10 +1330,6 @@ void GLMod_LoadLighting (lump_t *l)
//now some cheat protection. //now some cheat protection.
if (!l->filelen)
{ //would otherwise be full bright so no need to check.
return;
}
normal = mod_base + l->fileofs; normal = mod_base + l->fileofs;
litdata = loadmodel->lightdata; litdata = loadmodel->lightdata;
@ -1350,8 +1357,6 @@ void GLMod_LoadLighting (lump_t *l)
litdata+=3; litdata+=3;
} }
//end anti-cheat //end anti-cheat
return;
} }
} }
else if (litdata) else if (litdata)
@ -1362,11 +1367,6 @@ void GLMod_LoadLighting (lump_t *l)
if (loadmodel->fromgame == fg_halflife || loadmodel->fromgame == fg_quake2 || loadmodel->fromgame == fg_quake3) if (loadmodel->fromgame == fg_halflife || loadmodel->fromgame == fg_quake2 || loadmodel->fromgame == fg_quake3)
loadmodel->rgblighting = true; loadmodel->rgblighting = true;
if (!l->filelen)
{
loadmodel->lightdata = NULL;
return;
}
#ifdef RUNTIMELIGHTING #ifdef RUNTIMELIGHTING
if (r_loadlits.value == 2 && !lightmodel && (loadmodel->rgblighting != true || (!luxdata && gl_bumpmappingpossible))) if (r_loadlits.value == 2 && !lightmodel && (loadmodel->rgblighting != true || (!luxdata && gl_bumpmappingpossible)))
{ {
@ -1410,6 +1410,9 @@ void GLMod_LoadLighting (lump_t *l)
} }
#endif #endif
if (loadmodel->lightdata)
return;
loadmodel->lightdata = Hunk_AllocName ( l->filelen, loadname); loadmodel->lightdata = Hunk_AllocName ( l->filelen, loadname);
{ {