nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2025-02-20 18:52:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed redundant cases.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/branches/wip@3457 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-11-15 03:22:07 +00:00
parent 9eabcdcd56
commit 49c3dc75d4
1 changed files with 14 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
engine/client/r_surf.c
View file

@ -1639,24 +1639,14 @@ void Surf_RenderDynamicLightmaps (msurface_t *fa, int shift)
if (!fa->mesh) if (!fa->mesh)
return; return;
//surfaces without lightmaps
if (fa->lightmaptexturenum<0) if (fa->lightmaptexturenum<0)
return; return;
if (fa->flags & ( SURF_DRAWSKY | SURF_DRAWTURB) ) //surfaces with lightmaps that do not animate, supposedly
return;
if (fa->texinfo->flags & (TI_SKY|TI_TRANS33|TI_TRANS66|TI_WARP)) if (fa->texinfo->flags & (TI_SKY|TI_TRANS33|TI_TRANS66|TI_WARP))
return; return;
if (fa->texinfo->flags & (TEX_SPECIAL))
{
if (cl.worldmodel->fromgame == fg_halflife)
return; //some textures do this.
}
// fa->polys->chain = lightmap[fa->lightmaptexturenum]->polys;
// lightmap[fa->lightmaptexturenum]->polys = fa->polys;
// check for lightmap modification // check for lightmap modification
// if (cl.worldmodel->fromgame != fg_quake3) //no lightstyles on q3 maps // if (cl.worldmodel->fromgame != fg_quake3) //no lightstyles on q3 maps
{ {
@ -2480,16 +2470,15 @@ static int Surf_LM_FillBlock (int texnum, int w, int h, int x, int y)
return texnum; return texnum;
} }
static mvertex_t *r_pcurrentvertbase;
static int nColinElim; static int nColinElim;
/* /*
================ ================
BuildSurfaceDisplayList BuildSurfaceDisplayList
FIXME: this is probably misplaced
================ ================
*/ */
static void Surf_BuildSurfaceDisplayList (msurface_t *fa) void Surf_BuildSurfaceDisplayList (model_t *model, msurface_t *fa)
{ {
int i, lindex, lnumverts; int i, lindex, lnumverts;
medge_t *pedges, *r_pedge; medge_t *pedges, *r_pedge;
@ -2499,13 +2488,10 @@ static void Surf_BuildSurfaceDisplayList (msurface_t *fa)
int lm; int lm;
// reconstruct the polygon // reconstruct the polygon
pedges = currentmodel->edges; pedges = model->edges;
lnumverts = fa->numedges; lnumverts = fa->numedges;
vertpage = 0; vertpage = 0;
if (lnumverts<3)
return; //q3 flares.
{ //build a nice mesh instead of a poly. { //build a nice mesh instead of a poly.
int size = sizeof(mesh_t) + sizeof(index_t)*(lnumverts-2)*3 + (sizeof(vecV_t) + 3*sizeof(vec3_t) + 2*sizeof(vec2_t) + sizeof(vec4_t))*lnumverts; int size = sizeof(mesh_t) + sizeof(index_t)*(lnumverts-2)*3 + (sizeof(vecV_t) + 3*sizeof(vec3_t) + 2*sizeof(vec2_t) + sizeof(vec4_t))*lnumverts;
mesh_t *mesh; mesh_t *mesh;
@ -2533,17 +2519,17 @@ static void Surf_BuildSurfaceDisplayList (msurface_t *fa)
for (i=0 ; i<lnumverts ; i++) for (i=0 ; i<lnumverts ; i++)
{ {
lindex = currentmodel->surfedges[fa->firstedge + i]; lindex = model->surfedges[fa->firstedge + i];
if (lindex > 0) if (lindex > 0)
{ {
r_pedge = &pedges[lindex]; r_pedge = &pedges[lindex];
vec = r_pcurrentvertbase[r_pedge->v[0]].position; vec = model->vertexes[r_pedge->v[0]].position;
} }
else else
{ {
r_pedge = &pedges[-lindex]; r_pedge = &pedges[-lindex];
vec = r_pcurrentvertbase[r_pedge->v[1]].position; vec = model->vertexes[r_pedge->v[1]].position;
} }
s = DotProduct (vec, fa->texinfo->vecs[0]) + fa->texinfo->vecs[0][3]; s = DotProduct (vec, fa->texinfo->vecs[0]) + fa->texinfo->vecs[0][3];
@ -2623,7 +2609,7 @@ static void Surf_CreateSurfaceLightmap (msurface_t *surf, int shift)
stainbase = lightmap[surf->lightmaptexturenum]->stainmaps; stainbase = lightmap[surf->lightmaptexturenum]->stainmaps;
stainbase += (surf->light_t * LMBLOCK_WIDTH + surf->light_s) * 3; stainbase += (surf->light_t * LMBLOCK_WIDTH + surf->light_s) * 3;
Surf_BuildLightMap (surf, base, luxbase, stainbase, shift); Surf_BuildLightMap (surf, base, luxbase, stainbase, shift);
} }
@ -2697,7 +2683,6 @@ void Surf_BuildLightmaps (void)
if (m->name[0] == '*') if (m->name[0] == '*')
continue; continue;
r_pcurrentvertbase = m->vertexes;
currentmodel = m; currentmodel = m;
shift = Surf_LightmapShift(currentmodel); shift = Surf_LightmapShift(currentmodel);
@ -2707,11 +2692,13 @@ void Surf_BuildLightmaps (void)
{//extra texture loop so we get slightly less texture switches {//extra texture loop so we get slightly less texture switches
if (m->surfaces[i].texinfo->texture == m->textures[t]) if (m->surfaces[i].texinfo->texture == m->textures[t])
{ {
Surf_CreateSurfaceLightmap (m->surfaces + i, shift);
P_EmitSkyEffectTris(m, &m->surfaces[i]); P_EmitSkyEffectTris(m, &m->surfaces[i]);
if (m->surfaces[i].mesh) //there are some surfaces that have a display list already (the subdivided ones)
/*FIXME: move this into model-specific code*/
Surf_CreateSurfaceLightmap (m->surfaces + i, shift);
if (m->surfaces[i].mesh) //there are some surfaces that have a display list already (q3 ones)
continue; continue;
Surf_BuildSurfaceDisplayList (m->surfaces + i); Surf_BuildSurfaceDisplayList (m, m->surfaces + i);
} }
} }
} }