mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-11-14 08:30:58 +00:00
Introduce a per-tile bit preventing fullbrights in GL modes, use for LOADSCREEN.
git-svn-id: https://svn.eduke32.com/eduke32@3145 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
c71b3d529c
commit
d85f529b74
3 changed files with 8 additions and 1 deletions
|
@ -148,6 +148,7 @@ void yax_drawrooms(void (*SpriteAnimFunc)(int32_t,int32_t,int32_t,int32_t),
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PICANM_TEXHITSCAN_BIT (1<<28)
|
#define PICANM_TEXHITSCAN_BIT (1<<28)
|
||||||
|
#define PICANM_NOFULLBRIGHT_BIT (1<<30)
|
||||||
|
|
||||||
#define CLIPMASK0 (((1L)<<16)+1L)
|
#define CLIPMASK0 (((1L)<<16)+1L)
|
||||||
#define CLIPMASK1 (((256L)<<16)+64L)
|
#define CLIPMASK1 (((256L)<<16)+64L)
|
||||||
|
|
|
@ -1204,6 +1204,8 @@ static int32_t gloadtile_art(int32_t dapic, int32_t dapal, int32_t dameth, pthty
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
const int32_t dofullbright = !(picanm[dapic]&PICANM_NOFULLBRIGHT_BIT);
|
||||||
|
|
||||||
for (y=0; y<ysiz; y++)
|
for (y=0; y<ysiz; y++)
|
||||||
{
|
{
|
||||||
if (y < tsizy) y2 = y; else y2 = y-tsizy;
|
if (y < tsizy) y2 = y; else y2 = y-tsizy;
|
||||||
|
@ -1217,7 +1219,7 @@ static int32_t gloadtile_art(int32_t dapic, int32_t dapal, int32_t dameth, pthty
|
||||||
if (!fullbrightloadingpass)
|
if (!fullbrightloadingpass)
|
||||||
{
|
{
|
||||||
// regular texture
|
// regular texture
|
||||||
if ((dacol > 239) && (dacol != 255))
|
if (dacol > 239 && dacol != 255 && dofullbright)
|
||||||
hasfullbright = 1;
|
hasfullbright = 1;
|
||||||
wpptr->a = 255;
|
wpptr->a = 255;
|
||||||
}
|
}
|
||||||
|
|
|
@ -9735,6 +9735,10 @@ static void G_Startup(void)
|
||||||
G_GameExit("Failed loading art.");
|
G_GameExit("Failed loading art.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Make the fullscreen nuke logo background non-fullbright. Has to be
|
||||||
|
// after dynamic tile remapping (from C_Compile) and loading tiles.
|
||||||
|
picanm[LOADSCREEN] |= PICANM_NOFULLBRIGHT_BIT;
|
||||||
|
|
||||||
// initprintf("Loading palette/lookups...\n");
|
// initprintf("Loading palette/lookups...\n");
|
||||||
G_LoadExtraPalettes();
|
G_LoadExtraPalettes();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue