zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-27 09:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't cache sector parallaxing information in _prwalls. This fixes a bug where setting floor/ceiling parallaxing bits in the editor doesn't parallax the corresponding walls right away.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@1556 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
plagman 2009-12-07 07:17:33 +00:00
parent 0888dbc38e
commit 9f62cf5cb4
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
polymer/eduke32/build/src/polymer.c
View file

@ -2561,11 +2561,8 @@ static void polymer_updatewall(int16_t wallnum)
} }
if (underwall) if (underwall)
{
w->underover |= 1; w->underover |= 1;
if ((sec->floorstat & 1) && (nsec->floorstat & 1))
w->underover |= 4;
}
Bmemcpy(w->mask.buffer, &w->wall.buffer[15], sizeof(GLfloat) * 5); Bmemcpy(w->mask.buffer, &w->wall.buffer[15], sizeof(GLfloat) * 5);
Bmemcpy(&w->mask.buffer[5], &w->wall.buffer[10], sizeof(GLfloat) * 5); Bmemcpy(&w->mask.buffer[5], &w->wall.buffer[10], sizeof(GLfloat) * 5);
} }
@ -2647,11 +2644,8 @@ static void polymer_updatewall(int16_t wallnum)
} }
if (overwall) if (overwall)
{
w->underover |= 2; w->underover |= 2;
if ((sec->ceilingstat & 1) && (nsec->ceilingstat & 1))
w->underover |= 8;
}
Bmemcpy(&w->mask.buffer[10], &w->over.buffer[5], sizeof(GLfloat) * 5); Bmemcpy(&w->mask.buffer[10], &w->over.buffer[5], sizeof(GLfloat) * 5);
Bmemcpy(&w->mask.buffer[15], &w->over.buffer[0], sizeof(GLfloat) * 5); Bmemcpy(&w->mask.buffer[15], &w->over.buffer[0], sizeof(GLfloat) * 5);
@ -2755,6 +2749,7 @@ static void polymer_drawwall(int16_t sectnum, int16_t wallnum)
walltype *wal; walltype *wal;
_prwall *w; _prwall *w;
GLubyte oldcolor[4]; GLubyte oldcolor[4];
int32_t parallaxedfloor = 0, parallaxedceiling = 0;
if (pr_verbosity >= 3) OSD_Printf("PR : Drawing wall %i...\n", wallnum); if (pr_verbosity >= 3) OSD_Printf("PR : Drawing wall %i...\n", wallnum);
@ -2762,11 +2757,19 @@ static void polymer_drawwall(int16_t sectnum, int16_t wallnum)
wal = &wall[wallnum]; wal = &wall[wallnum];
w = prwalls[wallnum]; w = prwalls[wallnum];
if ((sec->floorstat & 1) && (wal->nextsector >= 0) &&
(sector[wal->nextsector].floorstat & 1))
parallaxedfloor = 1;
if ((sec->ceilingstat & 1) && (wal->nextsector >= 0) &&
(sector[wal->nextsector].ceilingstat & 1))
parallaxedceiling = 1;
fogcalc(wal->shade,sec->visibility,sec->floorpal); fogcalc(wal->shade,sec->visibility,sec->floorpal);
bglFogf(GL_FOG_DENSITY,fogresult); bglFogf(GL_FOG_DENSITY,fogresult);
bglFogfv(GL_FOG_COLOR,fogcol); bglFogfv(GL_FOG_COLOR,fogcol);
if ((w->underover & 1) && (!(w->underover & 4) || (searchit == 2))) if ((w->underover & 1) && (!parallaxedfloor || (searchit == 2)))
{ {
if (searchit == 2) { if (searchit == 2) {
int16_t pickwallnum; int16_t pickwallnum;
@ -2791,7 +2794,7 @@ static void polymer_drawwall(int16_t sectnum, int16_t wallnum)
memcpy(w->wall.material.diffusemodulation, oldcolor, sizeof(GLubyte) * 4); memcpy(w->wall.material.diffusemodulation, oldcolor, sizeof(GLubyte) * 4);
} }
if ((w->underover & 2) && (!(w->underover & 8) || (searchit == 2))) if ((w->underover & 2) && (!parallaxedceiling || (searchit == 2)))
{ {
if (searchit == 2) { if (searchit == 2) {
memcpy(oldcolor, w->over.material.diffusemodulation, sizeof(GLubyte) * 4); memcpy(oldcolor, w->over.material.diffusemodulation, sizeof(GLubyte) * 4);
@ -2824,9 +2827,7 @@ static void polymer_drawwall(int16_t sectnum, int16_t wallnum)
memcpy(w->mask.material.diffusemodulation, oldcolor, sizeof(GLubyte) * 4); memcpy(w->mask.material.diffusemodulation, oldcolor, sizeof(GLubyte) * 4);
} }
if (!searchit && (sector[sectnum].ceilingstat & 1) && if (!searchit && ((wall[wallnum].nextsector < 0) || parallaxedceiling))
((wall[wallnum].nextsector < 0) ||
!(sector[wall[wallnum].nextsector].ceilingstat & 1)))
{ {
bglColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); bglColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);