forgor some things
This commit is contained in:
1 parent
ec4140a9d2
commit
bac058d128
3 files changed
+7
-7
No files matched your search
@@ -32,8 +32,8 @@
|
||||
#include "../../p_tick.h" // for leveltime (NOTE: THIS IS BAD, FIGURE OUT HOW TO PROPERLY IMPLEMENT gl_leveltime)
|
||||
#include "../../i_system.h" // for I_GetPreciseTime (batching time measurements)
|
||||
|
||||
// Eeeeh not sure is this right way, but it works
|
||||
extern consvar_t cv_grusecustomshaders;
|
||||
// Eeeeh not sure is this right way, but it works < sry :c
|
||||
//extern consvar_t cv_grusecustomshaders;
|
||||
|
||||
extern fixed_t fovtan; // also extremely bad, I'm just too lazy!!!
|
||||
|
||||
@@ -982,12 +982,12 @@ EXPORT boolean HWRAPI(LoadShaders) (void)
|
||||
gl_shaderprogram_t *shader;
|
||||
const GLchar* vert_shader = vertex_shaders[i];
|
||||
const GLchar* frag_shader = fragment_shaders[i];
|
||||
boolean custom = cv_grusecustomshaders.value && ((gl_customvertexshaders[i] || gl_customfragmentshaders[i]) && (i > 0));
|
||||
boolean custom = ((gl_customvertexshaders[i] || gl_customfragmentshaders[i]) && (i > 0));
|
||||
|
||||
// 18032019
|
||||
if (cv_grusecustomshaders.value && gl_customvertexshaders[i])
|
||||
if (gl_customvertexshaders[i])
|
||||
vert_shader = gl_customvertexshaders[i];
|
||||
if (cv_grusecustomshaders.value && gl_customfragmentshaders[i])
|
||||
if (gl_customfragmentshaders[i])
|
||||
frag_shader = gl_customfragmentshaders[i];
|
||||
|
||||
if (i >= MAXSHADERS)
|
||||
|
||||
+1
-1
@@ -1347,7 +1347,7 @@ static menuitem_t OP_OpenGLOptionsMenu[] =
|
||||
{IT_STRING | IT_CVAR, NULL, "3D Models", &cv_grmdls, 5},
|
||||
{IT_STRING | IT_CVAR, NULL, "Fallback Player 3D Model", &cv_grfallbackplayermodel, 15},
|
||||
{IT_STRING|IT_CVAR, NULL, "Shaders", &cv_grshaders, 25},
|
||||
//{IT_STRING|IT_CVAR, NULL, "Use custom Shaders", &cv_grusecustomshaders, 35}, // rip in peace sweet prince
|
||||
//{IT_STRING|IT_CVAR, NULL, "Use custom Shaders", &cv_grusecustomshaders, 35},
|
||||
{IT_STRING|IT_CVAR, NULL, "Palette Rendering", &cv_grpaletteshader, 35},
|
||||
{IT_STRING | IT_CVAR, NULL, "Min Shader Brightness", &cv_secbright, 45},
|
||||
|
||||
|
||||
+1
-1
@@ -1954,7 +1954,7 @@ void R_RegisterEngineStuff(void)
|
||||
CV_RegisterVar(&cv_grfakecontrast);
|
||||
CV_RegisterVar(&cv_grshearing);
|
||||
CV_RegisterVar(&cv_grshaders);
|
||||
CV_RegisterVar(&cv_grusecustomshaders);
|
||||
CV_RegisterVar(&cv_grpaletteshader);
|
||||
#endif
|
||||
|
||||
#ifdef HWRENDER
|
||||
|
||||
Reference in new issue
Block a user