RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

ref: gl: drop broken minlight/scale cvars for litwater. Keep them for mods. Fix post-merge issues

Browse Source
This commit is contained in:
Alibek Omarov
2026-04-28 11:21:56 +05:00
parent 2f31cf315c
commit 5b6b372cfe
4 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ref/gl/gl_local.h
View File

@@ -721,8 +721,6 @@ extern convar_t gl_stencilbits;
extern convar_t gl_overbright; extern convar_t gl_overbright;
extern convar_t gl_fog; extern convar_t gl_fog;
extern convar_t gl_litwater_force; extern convar_t gl_litwater_force;
extern convar_t gl_litwater_minlight;
extern convar_t gl_litwater_scale;
extern convar_t r_lighting_ambient; extern convar_t r_lighting_ambient;
extern convar_t r_studio_lambert; extern convar_t r_studio_lambert;

5
ref/gl/gl_opengl.c
View File

@@ -23,9 +23,6 @@ CVAR_DEFINE_AUTO( gl_stencilbits, "8", FCVAR_GLCONFIG|FCVAR_READ_ONLY, "pixelfor
CVAR_DEFINE_AUTO( gl_overbright, "1", FCVAR_GLCONFIG, "overbrights" ); CVAR_DEFINE_AUTO( gl_overbright, "1", FCVAR_GLCONFIG, "overbrights" );
CVAR_DEFINE_AUTO( gl_fog, "1", FCVAR_GLCONFIG, "allow for rendering fog using built-in OpenGL fog implementation" ); CVAR_DEFINE_AUTO( gl_fog, "1", FCVAR_GLCONFIG, "allow for rendering fog using built-in OpenGL fog implementation" );
CVAR_DEFINE_AUTO( gl_litwater_force, "0", FCVAR_GLCONFIG, "force enable lightmapped water, even if support not declared in the map" ); CVAR_DEFINE_AUTO( gl_litwater_force, "0", FCVAR_GLCONFIG, "force enable lightmapped water, even if support not declared in the map" );
CVAR_DEFINE_AUTO( gl_litwater_minlight, "0", FCVAR_GLCONFIG, "minimal light water receives, helps avoid too dark lightmapped water" );
CVAR_DEFINE_AUTO( gl_litwater_scale, "3", FCVAR_GLCONFIG, "lightmapped water scale factor" );
CVAR_DEFINE_AUTO( r_lighting_extended, "1", FCVAR_GLCONFIG, "allow to get lighting from world and bmodels" );
CVAR_DEFINE_AUTO( r_lighting_ambient, "0.3", FCVAR_GLCONFIG, "map ambient lighting scale" ); CVAR_DEFINE_AUTO( r_lighting_ambient, "0.3", FCVAR_GLCONFIG, "map ambient lighting scale" );
CVAR_DEFINE_AUTO( r_detailtextures, "1", FCVAR_GLCONFIG, "enable detail textures support" ); CVAR_DEFINE_AUTO( r_detailtextures, "1", FCVAR_GLCONFIG, "enable detail textures support" );
CVAR_DEFINE_AUTO( r_novis, "0", 0, "ignore vis information (perfomance test)" ); CVAR_DEFINE_AUTO( r_novis, "0", 0, "ignore vis information (perfomance test)" );
@@ -1188,8 +1185,6 @@ static void GL_InitCommands( void )
gEngfuncs.Cvar_RegisterVariable( &gl_overbright ); gEngfuncs.Cvar_RegisterVariable( &gl_overbright );
gEngfuncs.Cvar_RegisterVariable( &gl_fog ); gEngfuncs.Cvar_RegisterVariable( &gl_fog );
gEngfuncs.Cvar_RegisterVariable( &gl_litwater_force ); gEngfuncs.Cvar_RegisterVariable( &gl_litwater_force );
gEngfuncs.Cvar_RegisterVariable( &gl_litwater_minlight );
gEngfuncs.Cvar_RegisterVariable( &gl_litwater_scale );
gEngfuncs.Cvar_RegisterVariable( &gl_polyoffset ); gEngfuncs.Cvar_RegisterVariable( &gl_polyoffset );
gEngfuncs.Cvar_RegisterVariable( &gl_polyoffset_bmodels ); gEngfuncs.Cvar_RegisterVariable( &gl_polyoffset_bmodels );

8
ref/gl/gl_rmain.c
View File

@@ -1035,14 +1035,6 @@ static void R_CheckCvars( void )
rebuild = true; rebuild = true;
} }
// we only recalculate lightmap on the fly if map hasn't declared support for lightmapped water
if( !FBitSet( tr.world->flags, FWORLD_HAS_LITWATER ) && FBitSet( gl_litwater_scale.flags|gl_litwater_minlight.flags, FCVAR_CHANGED ))
{
rebuild = true;
ClearBits( gl_litwater_scale.flags, FCVAR_CHANGED );
ClearBits( gl_litwater_minlight.flags, FCVAR_CHANGED );
}
if( rebuild ) if( rebuild )
R_GammaChanged( false ); R_GammaChanged( false );
} }

9
ref/gl/gl_rsurf.c
View File

@@ -92,11 +92,9 @@ static int Mod_LightmappedWaterMinlight( void )
{ {
if( tr.world->litwater_minlight >= 0 ) if( tr.world->litwater_minlight >= 0 )
return tr.world->litwater_minlight; return tr.world->litwater_minlight;
return 0;
} }
return Q_max( (int)gl_litwater_minlight.value, 0 ); return 0;
} }
static float Mod_LightmappedWaterScale( void ) static float Mod_LightmappedWaterScale( void )
@@ -106,10 +104,9 @@ static float Mod_LightmappedWaterScale( void )
if( tr.world->litwater_scale >= 0.0f ) if( tr.world->litwater_scale >= 0.0f )
return tr.world->litwater_scale; return tr.world->litwater_scale;
return 1.0f;
} }
return gl_litwater_scale.value; return 1.0f;
} }
byte *Mod_GetCurrentVis( void ) byte *Mod_GetCurrentVis( void )
@@ -1054,7 +1051,7 @@ static void EmitWaterLightPolys( msurface_t *warp, float soffset, float toffset,
float waveHeight = RI.currententity->curstate.scale; float waveHeight = RI.currententity->curstate.scale;
// set the current waveheight // set the current waveheight
if( warp->polys->verts[0][2] >= RI.vieworg[2] ) if( warp->polys->verts[0][2] >= RI.rvp.vieworigin[2] )
waveHeight = -waveHeight; waveHeight = -waveHeight;
if( useQuads ) if( useQuads )