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

- hotfixed the transparency checkers to not create textures from regular tiles.

Browse source 
This caused some broken textures, apparently this gets called when not everything has been set up.
The hightile case will also have to be fixed.
This commit is contained in:
Christoph Oelckers 2019-10-10 22:23:20 +02:00
parent fbc7e626e9
commit 36ca38258e
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/build/src/polymost.cpp
View file

@ -605,7 +605,7 @@ void gloadtile_art(int32_t dapic, int32_t dameth, pthtyp* pth, int32_t doalloc)
pth->palnum = 0; pth->palnum = 0;
pth->shade = 0; pth->shade = 0;
pth->effects = 0; pth->effects = 0;
pth->flags = PTH_HASALPHA|PTH_ONEBITALPHA| PTH_INDEXED; pth->flags = PTH_HASALPHA|PTH_ONEBITALPHA|PTH_INDEXED;
pth->hicr = NULL; pth->hicr = NULL;
pth->siz = ssiz; pth->siz = ssiz;
} }
@ -714,6 +714,9 @@ int32_t polymost_maskWallHasTranslucency(uwalltype const * const wall)
if (!usehightile) if (!usehightile)
return false; return false;
hicreplctyp* si = hicfindsubst(wall->picnum, wall->pal, hictinting[wall->pal].f & HICTINT_ALWAYSUSEART);
if (!si) return false; // regular tiles have no translucency
uint8_t pal = wall->pal; uint8_t pal = wall->pal;
if (palookup[pal] == NULL) if (palookup[pal] == NULL)
pal = 0; pal = 0;
@ -732,10 +735,14 @@ int32_t polymost_spriteHasTranslucency(uspritetype const * const tspr)
if (!usehightile) if (!usehightile)
return false; return false;
hicreplctyp* si = hicfindsubst(tspr->picnum, tspr->shade, hictinting[tspr->shade].f & HICTINT_ALWAYSUSEART);
if (!si) return false; // regular tiles have no translucency
uint8_t pal = tspr->shade; uint8_t pal = tspr->shade;
if (palookup[pal] == NULL) if (palookup[pal] == NULL)
pal = 0; pal = 0;
// FIXME: This needs to be done without loading the texture!
pthtyp* pth = texcache_fetch(tspr->picnum, pal, 0, DAMETH_MASK); pthtyp* pth = texcache_fetch(tspr->picnum, pal, 0, DAMETH_MASK);
return pth && (pth->flags & PTH_HASALPHA) && !(pth->flags & PTH_ONEBITALPHA); return pth && (pth->flags & PTH_HASALPHA) && !(pth->flags & PTH_ONEBITALPHA);
} }