Ensure high geometry details sets proper lodbias; Unify geometry detail setting between team arena and vanilla

This commit is contained in:
Petr Bartos 2022-03-29 19:22:02 +02:00
parent 8ab1439347
commit 1e7279b899
5 changed files with 11 additions and 18 deletions

View file

@ -736,7 +736,7 @@ static void GraphicsOptions_ApplyChanges( void *unused, int notification )
if ( s_graphicsoptions.geometry.curvalue == 2 )
{
trap_Cvar_SetValue( "r_lodBias", 0 );
trap_Cvar_SetValue( "r_lodBias", -1 );
trap_Cvar_SetValue( "r_subdivisions", 4 );
}
else if ( s_graphicsoptions.geometry.curvalue == 1 )
@ -746,7 +746,7 @@ static void GraphicsOptions_ApplyChanges( void *unused, int notification )
}
else
{
trap_Cvar_SetValue( "r_lodBias", 1 );
trap_Cvar_SetValue( "r_lodBias", 2 );
trap_Cvar_SetValue( "r_subdivisions", 20 );
}
@ -981,20 +981,13 @@ static void GraphicsOptions_SetMenuItems( void )
s_graphicsoptions.filter.curvalue = 1;
}
if ( trap_Cvar_VariableValue( "r_lodBias" ) > 0 )
{
if ( trap_Cvar_VariableValue( "r_subdivisions" ) >= 20 )
{
s_graphicsoptions.geometry.curvalue = 0;
}
else
{
s_graphicsoptions.geometry.curvalue = 1;
}
}
else
{
int lodbias = trap_Cvar_VariableValue( "r_lodBias" );
if (lodbias == -1) {
s_graphicsoptions.geometry.curvalue = 2;
} else if (lodbias == 1) {
s_graphicsoptions.geometry.curvalue = 1;
} else {
s_graphicsoptions.geometry.curvalue = 0;
}
switch ( ( int ) trap_Cvar_VariableValue( "r_colorbits" ) )

View file

@ -3070,7 +3070,7 @@ static void UI_Update(const char *name) {
}
} else if (Q_stricmp(name, "r_lodbias") == 0) {
switch (val) {
case 0:
case -1:
trap_Cvar_SetValue( "r_subdivisions", 4 );
break;
case 1:

View file

@ -298,7 +298,7 @@ itemDef {
type ITEM_TYPE_MULTI
text "Geometric Detail:"
cvar "r_lodbias"
cvarFloatList { "High" 0 "Medium" 1 "Low" 2 }
cvarFloatList { "High" -1 "Medium" 1 "Low" 2 }
rect 0 190 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 133

View file

@ -201,7 +201,7 @@ itemDef {
type ITEM_TYPE_MULTI
text "Geometric Detail:"
cvar "r_lodbias"
cvarFloatList { "High" 0 "Medium" 1 "Low" 2 }
cvarFloatList { "High" -1 "Medium" 1 "Low" 2 }
rect 99 217 256 20
textalign ITEM_ALIGN_RIGHT
textalignx 128