YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-29 16:24:16 +00:00
Code Issues Projects Releases Wiki Activity

engine: client: fix ScreenFade FFADE_MODULATE rendering, more accurate alpha blending

Browse Source
This commit is contained in:
Alibek Omarov 2023-01-05 06:09:04 +03:00
parent 4bbd0cc404
commit a4865fd2fc
1 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
engine/client/cl_game.c
View File

@ -581,6 +581,41 @@ void CL_DrawCenterPrint( void )
} }
} }
static int V_FadeAlpha( screenfade_t *sf )
{
int alpha;
if( cl.time > sf->fadeReset && cl.time > sf->fadeEnd )
{
if( !FBitSet( sf->fadeFlags, FFADE_STAYOUT ))
return 0;
}
if( FBitSet( sf->fadeFlags, FFADE_STAYOUT ))
{
alpha = sf->fadealpha;
if( FBitSet( sf->fadeFlags, FFADE_OUT ) && sf->fadeTotalEnd > cl.time )
{
alpha += sf->fadeSpeed * ( sf->fadeTotalEnd - cl.time );
}
else
{
sf->fadeEnd = cl.time + 0.1;
}
}
else
{
alpha = sf->fadeSpeed * ( sf->fadeEnd - cl.time );
if( FBitSet( sf->fadeFlags, FFADE_OUT ))
{
alpha += sf->fadealpha;
}
}
alpha = bound( 0, alpha, sf->fadealpha );
return alpha;
}
/* /*
============= =============
CL_DrawScreenFade CL_DrawScreenFade
@ -592,41 +627,29 @@ can be modulated
void CL_DrawScreenFade( void ) void CL_DrawScreenFade( void )
{ {
screenfade_t *sf = &clgame.fade; screenfade_t *sf = &clgame.fade;
int iFadeAlpha, testFlags; int alpha;
// keep pushing reset time out indefinitely alpha = V_FadeAlpha( sf );
if( sf->fadeFlags & FFADE_STAYOUT )
sf->fadeReset = cl.time + 0.1f;
if( sf->fadeReset == 0.0f && sf->fadeEnd == 0.0f ) if( !alpha )
return; // inactive
// all done?
if(( cl.time > sf->fadeReset ) && ( cl.time > sf->fadeEnd ))
{
memset( &clgame.fade, 0, sizeof( clgame.fade ));
return; return;
}
testFlags = (sf->fadeFlags & ~FFADE_MODULATE); if( FBitSet( sf->fadeFlags, FFADE_MODULATE ))
// fading...
if( testFlags == FFADE_STAYOUT )
{ {
iFadeAlpha = sf->fadealpha; ref.dllFuncs.GL_SetRenderMode( kRenderScreenFadeModulate );
ref.dllFuncs.Color4ub(
(uint16_t)( sf->fader * alpha + ( 255 - alpha ) * 255 ) >> 8,
(uint16_t)( sf->fadeg * alpha + ( 255 - alpha ) * 255 ) >> 8,
(uint16_t)( sf->fadeb * alpha + ( 255 - alpha ) * 255 ) >> 8,
255 );
} }
else else
{ {
iFadeAlpha = sf->fadeSpeed * ( sf->fadeEnd - cl.time ); ref.dllFuncs.GL_SetRenderMode( kRenderTransTexture );
if( sf->fadeFlags & FFADE_OUT ) iFadeAlpha += sf->fadealpha; ref.dllFuncs.Color4ub( sf->fader, sf->fadeg, sf->fadeb, alpha );
iFadeAlpha = bound( 0, iFadeAlpha, sf->fadealpha );
} }
ref.dllFuncs.Color4ub( sf->fader, sf->fadeg, sf->fadeb, iFadeAlpha );
if( sf->fadeFlags & FFADE_MODULATE )
ref.dllFuncs.GL_SetRenderMode( kRenderTransAdd );
else ref.dllFuncs.GL_SetRenderMode( kRenderTransTexture );
ref.dllFuncs.R_DrawStretchPic( 0, 0, refState.width, refState.height, 0, 0, 1, 1, ref.dllFuncs.R_DrawStretchPic( 0, 0, refState.width, refState.height, 0, 0, 1, 1,
R_GetBuiltinTexture( REF_WHITE_TEXTURE )); R_GetBuiltinTexture( REF_WHITE_TEXTURE ));
ref.dllFuncs.Color4ub( 255, 255, 255, 255 ); ref.dllFuncs.Color4ub( 255, 255, 255, 255 );