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

ref: soft: don't depend on light gamma in recursive light point

Browse Source
This commit is contained in:
Alibek Omarov 2024-01-07 02:21:07 +03:00
parent 0e91deec19
commit c15822f375
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ref/soft/r_light.c
View File

@ -323,18 +323,10 @@ static qboolean R_RecursiveLightPoint( model_t *model, mnode_t *node, float p1f,
{ {
uint scale = tr.lightstylevalue[surf->styles[map]]; uint scale = tr.lightstylevalue[surf->styles[map]];
if( tr.ignore_lightgamma ) cv->r += lm->r * scale;
{ cv->g += lm->g * scale;
cv->r += lm->r * scale * 2.5; // scale; cv->b += lm->b * scale;
cv->g += lm->g * scale * 2.5; // scale;
cv->b += lm->b * scale * 2.5; // scale;
}
else
{
cv->r += gEngfuncs.LightToTexGamma( lm->r ) * scale;
cv->g += gEngfuncs.LightToTexGamma( lm->g ) * scale;
cv->b += gEngfuncs.LightToTexGamma( lm->b ) * scale;
}
lm += size; // skip to next lightmap lm += size; // skip to next lightmap
if( dm != NULL ) if( dm != NULL )
@ -421,9 +413,9 @@ colorVec R_LightVecInternal( const vec3_t start, const vec3_t end, vec3_t lspot,
{ {
if( lspot ) VectorCopy( g_trace_lightspot, lspot ); if( lspot ) VectorCopy( g_trace_lightspot, lspot );
if( lvec ) VectorNormalize2( g_trace_lightvec, lvec ); if( lvec ) VectorNormalize2( g_trace_lightvec, lvec );
light.r = Q_min(( cv.r >> 7 ), 255 ); light.r = Q_min(( cv.r >> 8 ), 255 );
light.g = Q_min(( cv.g >> 7 ), 255 ); light.g = Q_min(( cv.g >> 8 ), 255 );
light.b = Q_min(( cv.b >> 7 ), 255 ); light.b = Q_min(( cv.b >> 8 ), 255 );
last_fraction = g_trace_fraction; last_fraction = g_trace_fraction;
if(( light.r + light.g + light.b ) != 0 ) if(( light.r + light.g + light.b ) != 0 )

1
ref/soft/r_local.h
View File

@ -270,7 +270,6 @@ typedef struct
int realframecount; // not including viewpasses int realframecount; // not including viewpasses
int framecount; int framecount;
qboolean ignore_lightgamma;
qboolean fCustomRendering; qboolean fCustomRendering;
qboolean fResetVis; qboolean fResetVis;
qboolean fFlipViewModel; qboolean fFlipViewModel;

2
ref/soft/r_studio.c
View File

@ -3412,9 +3412,7 @@ void R_GatherPlayerLight( void )
cl_entity_t *view = tr.viewent; cl_entity_t *view = tr.viewent;
colorVec c; colorVec c;
tr.ignore_lightgamma = true;
c = R_LightPoint( view->origin ); c = R_LightPoint( view->origin );
tr.ignore_lightgamma = false;
gEngfuncs.SetLocalLightLevel( ( c.r + c.g + c.b ) / 3 ); gEngfuncs.SetLocalLightLevel( ( c.r + c.g + c.b ) / 3 );
} }