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

- fixed y alignment of bottom textures.

Browse source 
Despite other settings, they will always take the panning info from their backside.
This commit is contained in:
Christoph Oelckers 2021-03-19 11:51:38 +01:00
parent f8de712b81
commit ff8ca99e2b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -757,7 +757,7 @@ void HWWall::DoTexture(HWDrawInfo* di, walltype* wal, walltype* refwall, float r
float th = texture->GetTexelHeight(); float th = texture->GetTexelHeight();
int pow2size = 1 << sizeToBits(th); int pow2size = 1 << sizeToBits(th);
if (pow2size < th) pow2size *= 2; if (pow2size < th) pow2size *= 2;
float ypanning = wal->ypan_ ? pow2size * wal->ypan_ / (256.0f * th) : 0; float ypanning = refwall->ypan_ ? pow2size * refwall->ypan_ / (256.0f * th) : 0;
tcs[LOLFT].u = tcs[UPLFT].u = ((leftdist * 8.f * wal->xrepeat) + refwall->xpan_) / tw; tcs[LOLFT].u = tcs[UPLFT].u = ((leftdist * 8.f * wal->xrepeat) + refwall->xpan_) / tw;
tcs[LORGT].u = tcs[UPRGT].u = ((rightdist * 8.f * wal->xrepeat) + refwall->xpan_) / tw; tcs[LORGT].u = tcs[UPRGT].u = ((rightdist * 8.f * wal->xrepeat) + refwall->xpan_) / tw;
@ -843,7 +843,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 = (wal->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 = (refwall->cstat & CSTAT_WALL_ALIGN_BOTTOM) ? frontsector->ceilingz : backsector->floorz;
shade = refwall->shade; shade = refwall->shade;
palette = refwall->pal; palette = refwall->pal;