mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Move V-DrawCustomFadeScreen to D_Display
TODO: This is steenky. Essentially immediately tint the geometry and players the latest possible place it is safe to do so, with the magic of the software-exclusive fade. This would ideally be handled with a shader so that GL and any future hwr2-native renderer can get in on the action too.
This commit is contained in:
parent
03892812e5
commit
bd5a34022f
3 changed files with 22 additions and 5 deletions
13
src/d_main.c
13
src/d_main.c
|
|
@ -580,6 +580,19 @@ static void D_Display(void)
|
||||||
// rhi: display the software framebuffer to the screen
|
// rhi: display the software framebuffer to the screen
|
||||||
if (rendermode == render_soft)
|
if (rendermode == render_soft)
|
||||||
{
|
{
|
||||||
|
// TODO: THIS SHOULD IDEALLY BE IN REGULAR HUD CODE !!
|
||||||
|
// (st_stuff.c ST_Drawer, also duplicated in k_podium.c)
|
||||||
|
// Unfortunately this is the latest place we can do it
|
||||||
|
// If we could immediately tint the GPU data a lot
|
||||||
|
// of problems could be solved (including GL support)
|
||||||
|
if (gamestate != GS_TITLESCREEN
|
||||||
|
&& G_GamestateUsesLevel() == true
|
||||||
|
&& timeinmap < 16)
|
||||||
|
{
|
||||||
|
// Level fade-in
|
||||||
|
V_DrawCustomFadeScreen(((levelfadecol == 0) ? "FADEMAP1" : "FADEMAP0"), 31-(timeinmap*2));
|
||||||
|
}
|
||||||
|
|
||||||
VID_DisplaySoftwareScreen();
|
VID_DisplaySoftwareScreen();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -601,11 +601,12 @@ void K_CeremonyDrawer(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (timeinmap < 16)
|
// See d_main.c and V_DrawCustomFadeScreen for the hacks that prevents this being here
|
||||||
|
/*if (timeinmap < 16)
|
||||||
{
|
{
|
||||||
// Level fade-in
|
// Level fade-in
|
||||||
V_DrawCustomFadeScreen(((levelfadecol == 0) ? "FADEMAP1" : "FADEMAP0"), 31-(timeinmap*2));
|
V_DrawCustomFadeScreen(((levelfadecol == 0) ? "FADEMAP1" : "FADEMAP0"), 31-(timeinmap*2));
|
||||||
}
|
}*/
|
||||||
|
|
||||||
if (podiumData.state == PODIUM_STATES)
|
if (podiumData.state == PODIUM_STATES)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1491,9 +1491,12 @@ void ST_Drawer(void)
|
||||||
ST_MayonakaStatic();
|
ST_MayonakaStatic();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Draw a fade on level opening
|
// See d_main.c and V_DrawCustomFadeScreen for the hacks that prevents this being here
|
||||||
if (timeinmap < 16)
|
/*if (timeinmap < 16)
|
||||||
V_DrawCustomFadeScreen(((levelfadecol == 0) ? "FADEMAP1" : "FADEMAP0"), 31-(timeinmap*2)); // Then gradually fade out from there
|
{
|
||||||
|
// Level fade-in
|
||||||
|
V_DrawCustomFadeScreen(((levelfadecol == 0) ? "FADEMAP1" : "FADEMAP0"), 31-(timeinmap*2));
|
||||||
|
}*/
|
||||||
|
|
||||||
if (stagetitle)
|
if (stagetitle)
|
||||||
ST_drawTitleCard();
|
ST_drawTitleCard();
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue