zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 12:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed NPOT shader parameters. RR E1L1's hedges render properly now.

Browse source 
- fixed a few places where wall[0] was accessed.
This commit is contained in:
Christoph Oelckers 2021-03-18 09:20:38 +01:00
parent 2d958745b4
commit 0f28069f96
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
source/core/rendering/scene/hw_walls.cpp
View file

@ -380,6 +380,7 @@ void HWWall::PutWall(HWDrawInfo *di, bool translucent)
int h = texture->GetTexelHeight(); int h = texture->GetTexelHeight();
int h2 = 1 << sizeToBits(h); int h2 = 1 << sizeToBits(h);
if (h2 < h) h2 *= 2;
if (h != h2) if (h != h2)
{ {
float xOffset = 1.f / texture->GetTexelWidth(); float xOffset = 1.f / texture->GetTexelWidth();
@ -860,7 +861,7 @@ void HWWall::DoLowerTexture(HWDrawInfo* di, walltype* wal, sectortype* frontsect
{ {
// get the alignment reference position. // get the alignment reference position.
int refheight; int refheight;
auto refwall = (wall->cstat & CSTAT_WALL_BOTTOM_SWAP) ? &wall[wal->nextwall] : wal; auto refwall = (wal->cstat & CSTAT_WALL_BOTTOM_SWAP) ? &wall[wal->nextwall] : wal;
refheight = (wal->cstat & CSTAT_WALL_ALIGN_BOTTOM) ? frontsector->ceilingz : backsector->floorz; refheight = (wal->cstat & CSTAT_WALL_ALIGN_BOTTOM) ? frontsector->ceilingz : backsector->floorz;
shade = refwall->shade; shade = refwall->shade;
@ -936,11 +937,7 @@ void HWWall::Process(HWDrawInfo *di, walltype *wal, sectortype* frontsector, sec
PlanesAtPoint(frontsector, p2wall->x, p2wall->y, &fch2, &ffh2); PlanesAtPoint(frontsector, p2wall->x, p2wall->y, &fch2, &ffh2);
#ifdef _DEBUG #ifdef _DEBUG
if (wal - wall == 14454) if (wal - wall == 3810)
{
int a = 0;
}
if (fabs(v1.X) == 400 && fabs(v1.Y) == 3968)
{ {
int a = 0; int a = 0;
} }
@ -1006,7 +1003,7 @@ void HWWall::Process(HWDrawInfo *di, walltype *wal, sectortype* frontsector, sec
// normal texture // normal texture
int tilenum = (wal->cstat & CSTAT_WALL_1WAY) ? wal->overpicnum : wal->picnum; int tilenum = (wal->cstat & CSTAT_WALL_1WAY) ? wal->overpicnum : wal->picnum;
tileUpdatePicnum(&tilenum, int(wal-wall) + 16384, wall->cstat); tileUpdatePicnum(&tilenum, int(wal-wall) + 16384, wal->cstat);
texture = tileGetTexture(tilenum); texture = tileGetTexture(tilenum);
if (texture && texture->isValid()) if (texture && texture->isValid())
{ {
@ -1043,7 +1040,7 @@ void HWWall::Process(HWDrawInfo *di, walltype *wal, sectortype* frontsector, sec
if (bch1a < fch1 || bch2a < fch2) if (bch1a < fch1 || bch2a < fch2)
{ {
int tilenum = wal->picnum; int tilenum = wal->picnum;
tileUpdatePicnum(&tilenum, int(wal - wall) + 16384, wall->cstat); tileUpdatePicnum(&tilenum, int(wal - wall) + 16384, wal->cstat);
texture = tileGetTexture(tilenum); texture = tileGetTexture(tilenum);
if (texture && texture->isValid()) if (texture && texture->isValid())
{ {
@ -1064,10 +1061,10 @@ void HWWall::Process(HWDrawInfo *di, walltype *wal, sectortype* frontsector, sec
} }
else*/ else*/
if (wall->cstat & (CSTAT_WALL_MASKED | CSTAT_WALL_1WAY)) if (wal->cstat & (CSTAT_WALL_MASKED | CSTAT_WALL_1WAY))
{ {
int tilenum = wal->overpicnum; int tilenum = wal->overpicnum;
tileUpdatePicnum(&tilenum, int(wal - wall) + 16384, wall->cstat); tileUpdatePicnum(&tilenum, int(wal - wall) + 16384, wal->cstat);
texture = tileGetTexture(tilenum); texture = tileGetTexture(tilenum);
if (texture && texture->isValid()) if (texture && texture->isValid())
{ {