zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Respect the 'notmd' maphack when deciding to draw models in Polymer. 

git-svn-id: https://svn.eduke32.com/eduke32@1680 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2010-08-03 15:06:24 +00:00
parent a1a5f9cb5a
commit 10830a7f3f
1 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
polymer/eduke32/build/src/polymer.c
View File

@ -1107,18 +1107,18 @@ void polymer_updatesprite(int32_t snum)
i = j = 0; i = j = 0;
while (j < lightcount) while (j < lightcount)
{ {
while (!prlights[i].flags.active) while (!prlights[i].flags.active)
i++; i++;
if (prlights[i].priority != curpriority) if (prlights[i].priority != curpriority)
{ {
i++; i++;
j++; j++;
continue; continue;
} }
if (polymer_planeinlight(&s->plane, &prlights[i])) if (polymer_planeinlight(&s->plane, &prlights[i]))
polymer_addplanelight(&s->plane, i); polymer_addplanelight(&s->plane, i);
i++; i++;
j++; j++;
} }
@ -1305,7 +1305,9 @@ void polymer_drawsprite(int32_t snum)
bglFogf(GL_FOG_DENSITY,fogresult); bglFogf(GL_FOG_DENSITY,fogresult);
bglFogfv(GL_FOG_COLOR,fogcol); bglFogfv(GL_FOG_COLOR,fogcol);
if (usemodels && tile2model[Ptile2tile(tspr->picnum,tspr->pal)].modelid >= 0 && tile2model[Ptile2tile(tspr->picnum,tspr->pal)].framenum >= 0) if (usemodels && tile2model[Ptile2tile(tspr->picnum,tspr->pal)].modelid >= 0 &&
tile2model[Ptile2tile(tspr->picnum,tspr->pal)].framenum >= 0 &&
!spriteext[tspr->owner].flags & SPREXT_NOTMD)
{ {
polymer_drawmdsprite(tspr); polymer_drawmdsprite(tspr);
return; return;
@ -1345,19 +1347,19 @@ void polymer_drawsprite(int32_t snum)
i = j = 0; i = j = 0;
while (j < lightcount) while (j < lightcount)
{ {
while (!prlights[i].flags.active) while (!prlights[i].flags.active)
i++; i++;
if (prlights[i].priority != curpriority) if (prlights[i].priority != curpriority)
{ {
i++; i++;
j++; j++;
continue; continue;
} }
if (polymer_planeinlight(&s->plane, &prlights[i])) if (polymer_planeinlight(&s->plane, &prlights[i]))
s->plane.lights[s->plane.lightcount++] = i; s->plane.lights[s->plane.lightcount++] = i;
i++; i++;
j++; j++;
} }
@ -3647,15 +3649,15 @@ static void polymer_drawmdsprite(spritetype *tspr)
i = j = 0; i = j = 0;
while (j < lightcount) while (j < lightcount)
{ {
while (!prlights[i].flags.active) while (!prlights[i].flags.active)
i++; i++;
if (prlights[i].priority != curpriority) if (prlights[i].priority != curpriority)
{ {
i++; i++;
j++; j++;
continue; continue;
} }
lradius = prlights[i].range / 1000.0f; lradius = prlights[i].range / 1000.0f;