Polymodes: In gloadtile_art, (1) get the current texel's index, (2) apply alpha if index == 255, (3) get the index by indexing into the specified palookup table, and then (4) apply fullbright considerations. Previously these tasks were performed in order 1432.

git-svn-id: https://svn.eduke32.com/eduke32@5467 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-12-20 05:18:47 +00:00
parent 043656688f
commit 1b8c79b0d8

View file

@ -839,13 +839,24 @@ void gloadtile_art(int32_t dapic, int32_t dapal, int32_t tintpalnum, int32_t das
dacol = *(char *)(waloff[dapic]+x2*tsiz.y+y2); dacol = *(char *)(waloff[dapic]+x2*tsiz.y+y2);
if (dacol == 255)
{
wpptr->a = 0;
hasalpha = 1;
}
else
wpptr->a = 255;
{
char *p = (char *)(palookup[dapal])+(int32_t)(dashade<<8);
dacol = (uint8_t)p[dacol];
}
if (!fullbrightloadingpass) if (!fullbrightloadingpass)
{ {
// regular texture // regular texture
if (IsPaletteIndexFullbright(dacol) && dofullbright) if (IsPaletteIndexFullbright(dacol) && dofullbright)
hasfullbright = 1; hasfullbright = 1;
wpptr->a = 255;
} }
else else
{ {
@ -855,21 +866,6 @@ void gloadtile_art(int32_t dapic, int32_t dapal, int32_t tintpalnum, int32_t das
wpptr->a = 0; wpptr->a = 0;
hasalpha = 1; hasalpha = 1;
} }
else // fullbright
{
wpptr->a = 255;
}
}
{
char *p = (char *)(palookup[dapal])+(int32_t)(dashade<<8);
dacol = (uint8_t)p[dacol];
}
if (dacol == 255)
{
wpptr->a = 0;
hasalpha = 1;
} }
bricolor((palette_t *)wpptr, dacol); bricolor((palette_t *)wpptr, dacol);