add "gl" to secbright and lightdither cvars
theyre only used in ogl so follow the naming convention
This commit is contained in:
1 parent
e6d90a7d0e
commit
53e9303321
4 files changed
+13
-13
No files matched your search
@@ -186,10 +186,10 @@ consvar_t cv_glslopecontrast = {"gr_slopecontrast", "Off", CV_SAVE, CV_OnOff, NU
|
||||
static CV_PossibleValue_t glshaders_cons_t[] = {{0, "Off"}, {1, "On"}, {2, "Ignore custom shaders"}, {0, NULL}};
|
||||
consvar_t cv_glshaders = {"gr_shaders", "On", CV_CALL|CV_SAVE, glshaders_cons_t, CV_glshaders_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
consvar_t cv_lightdither = {"gr_lightdithering", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_gllightdithering_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_gllightdither = {"gr_lightdithering", "Off", CV_CALL|CV_SAVE, CV_OnOff, CV_gllightdithering_OnChange, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
CV_PossibleValue_t secbright_cons_t[] = {{0, "MIN"}, {255, "MAX"}, {0, NULL}};
|
||||
consvar_t cv_secbright = {"secbright", "0", CV_SAVE, secbright_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
consvar_t cv_glsecbright = {"secbright", "0", CV_SAVE, secbright_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
|
||||
|
||||
static CV_PossibleValue_t glfiltermode_cons_t[]= {{HWD_SET_TEXTUREFILTER_POINTSAMPLED, "Nearest"},
|
||||
{HWD_SET_TEXTUREFILTER_BILINEAR, "Bilinear"}, {HWD_SET_TEXTUREFILTER_TRILINEAR, "Trilinear"},
|
||||
@@ -416,7 +416,7 @@ void HWR_Lighting(FSurfaceInfo *Surface, INT32 light_level, extracolormap_t *col
|
||||
}
|
||||
|
||||
// Clamp the light level, since it can sometimes go out of the 0-255 range from animations
|
||||
light_level = CLAMP(SOFTLIGHT(light_level), cv_secbright.value, 255);
|
||||
light_level = CLAMP(SOFTLIGHT(light_level), cv_glsecbright.value, 255);
|
||||
|
||||
// in palette rendering mode, this is not needed since it properly takes the changes to the palette itself
|
||||
if (!HWR_ShouldUsePaletteRendering())
|
||||
@@ -5403,8 +5403,8 @@ void HWR_AddCommands(void)
|
||||
|
||||
CV_RegisterVar(&cv_glshaders);
|
||||
|
||||
CV_RegisterVar(&cv_lightdither);
|
||||
CV_RegisterVar(&cv_secbright);
|
||||
CV_RegisterVar(&cv_gllightdither);
|
||||
CV_RegisterVar(&cv_glsecbright);
|
||||
|
||||
CV_RegisterVar(&cv_glfiltermode);
|
||||
CV_RegisterVar(&cv_glanisotropicmode);
|
||||
|
||||
@@ -163,8 +163,8 @@ extern consvar_t cv_glslopecontrast;
|
||||
|
||||
extern consvar_t cv_glshaders;
|
||||
|
||||
extern consvar_t cv_lightdither;
|
||||
extern consvar_t cv_secbright;
|
||||
extern consvar_t cv_gllightdither;
|
||||
extern consvar_t cv_glsecbright;
|
||||
|
||||
extern consvar_t cv_glfiltermode;
|
||||
extern consvar_t cv_glanisotropicmode;
|
||||
|
||||
@@ -286,7 +286,7 @@ static char *HWR_PreprocessShader(char *original)
|
||||
if (cv_glpaletterendering.value)
|
||||
ADD_TO_LEN(PALETTE_RENDERING_DEFINE)
|
||||
|
||||
if (cv_lightdither.value)
|
||||
if (cv_gllightdither.value)
|
||||
ADD_TO_LEN(LIGHT_DITHERING_DEFINE)
|
||||
|
||||
#undef ADD_TO_LEN
|
||||
@@ -330,7 +330,7 @@ static char *HWR_PreprocessShader(char *original)
|
||||
if (cv_glpaletterendering.value)
|
||||
WRITE_DEFINE(PALETTE_RENDERING_DEFINE)
|
||||
|
||||
if (cv_lightdither.value)
|
||||
if (cv_gllightdither.value)
|
||||
WRITE_DEFINE(LIGHT_DITHERING_DEFINE)
|
||||
|
||||
#undef WRITE_DEFINE
|
||||
|
||||
+4
-4
@@ -1543,8 +1543,8 @@ static menuitem_t OP_OpenGLOptionsMenu[] =
|
||||
{IT_STRING | IT_CVAR, NULL, "Fallback Player 3D Model", &cv_glfallbackplayermodel, 20},
|
||||
{IT_STRING | IT_CVAR, NULL, "Shaders", &cv_glshaders, 25},
|
||||
{IT_STRING | IT_CVAR, NULL, "Palette Rendering", &cv_glpaletterendering, 30},
|
||||
{IT_STRING | IT_CVAR, NULL, "Flashpals in Palette Renderer", &cv_glflashpal, 35},
|
||||
{IT_STRING | IT_CVAR, NULL, "Min Shader Brightness", &cv_secbright, 40},
|
||||
{IT_STRING | IT_CVAR, NULL, "Palette Rendering Flashpals",&cv_glflashpal, 35},
|
||||
{IT_STRING | IT_CVAR, NULL, "Min Shader Brightness", &cv_glsecbright, 40},
|
||||
|
||||
{IT_STRING|IT_CVAR, NULL, "Texture Quality", &cv_scr_depth, 50},
|
||||
{IT_STRING|IT_CVAR, NULL, "Texture Filter", &cv_glfiltermode, 55},
|
||||
@@ -1553,7 +1553,7 @@ static menuitem_t OP_OpenGLOptionsMenu[] =
|
||||
|
||||
{IT_STRING|IT_CVAR, NULL, "Wall Contrast Style", &cv_glfakecontrast, 75},
|
||||
{IT_STRING|IT_CVAR, NULL, "Slope Contrast", &cv_glslopecontrast, 80},
|
||||
{IT_STRING | IT_CVAR, NULL, "Dithered Lightning", &cv_lightdither, 85},
|
||||
{IT_STRING | IT_CVAR, NULL, "Dithered Lightning", &cv_gllightdither, 85},
|
||||
{IT_STRING|IT_CVAR, NULL, "Sprite Billboarding", &cv_glspritebillboarding, 90},
|
||||
{IT_STRING|IT_CVAR, NULL, "Software Perspective", &cv_glshearing, 95},
|
||||
{IT_STRING|IT_CVAR, NULL, "Rendering Distance", &cv_glrenderdistance, 100},
|
||||
@@ -1573,7 +1573,7 @@ static const char* OP_OpenGLTooltips[] =
|
||||
"Recreates an effect from software mode that is used on some maps.",
|
||||
"The look of the wall contrast effect.",
|
||||
"Wall contrast but for slopes.",
|
||||
"Should OpenGL lightning be dithered?",
|
||||
"Should shader lightning be dithered?",
|
||||
"Should sprites always face the camera?",
|
||||
"Recreates the look of software mode camera perspective.",
|
||||
"How far the game world should be drawn.",
|
||||
|
||||
Reference in new issue
Block a user