fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-22 12:02:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support for fte's 'nll' texture mode etc, which should give fewer flickering pixels in the distance than quake's normal nearest_mipmap_linear mode.

Browse source
This commit is contained in:
Shpoike 2020-07-19 02:01:02 +01:00
parent 1b5fe32811
commit f5296129a4
1 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
quakespasm/Quake/gl_texmgr.c
View file

@ -110,15 +110,22 @@ typedef struct
{ {
int magfilter; int magfilter;
int minfilter; int minfilter;
const char *name; const char *name2, *name1;
} glmode_t; } glmode_t;
static glmode_t glmodes[] = { static glmode_t glmodes[] = {
{GL_NEAREST, GL_NEAREST, "GL_NEAREST"}, {GL_NEAREST, GL_NEAREST, "n.n", "GL_NEAREST"},
{GL_NEAREST, GL_NEAREST_MIPMAP_NEAREST, "GL_NEAREST_MIPMAP_NEAREST"}, {GL_NEAREST, GL_NEAREST_MIPMAP_NEAREST, "nnn", "GL_NEAREST_MIPMAP_NEAREST"},
{GL_NEAREST, GL_NEAREST_MIPMAP_LINEAR, "GL_NEAREST_MIPMAP_LINEAR"}, {GL_NEAREST, GL_NEAREST_MIPMAP_LINEAR, "nln", "GL_NEAREST_MIPMAP_LINEAR"},
{GL_LINEAR, GL_LINEAR, "GL_LINEAR"}, {GL_LINEAR, GL_LINEAR, "l.l", "GL_LINEAR"},
{GL_LINEAR, GL_LINEAR_MIPMAP_NEAREST, "GL_LINEAR_MIPMAP_NEAREST"}, {GL_LINEAR, GL_LINEAR_MIPMAP_NEAREST, "lnl", "GL_LINEAR_MIPMAP_NEAREST"},
{GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, "GL_LINEAR_MIPMAP_LINEAR"}, {GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, "lll", "GL_LINEAR_MIPMAP_LINEAR"},
{GL_NEAREST, GL_LINEAR, "n.l", NULL},
{GL_NEAREST, GL_LINEAR_MIPMAP_NEAREST, "nnl", NULL},
{GL_NEAREST, GL_LINEAR_MIPMAP_LINEAR, "nll", NULL},
{GL_LINEAR, GL_NEAREST, "l.n", NULL},
{GL_LINEAR, GL_NEAREST_MIPMAP_NEAREST, "lnn", NULL},
{GL_LINEAR, GL_NEAREST_MIPMAP_LINEAR, "lln", NULL},
}; };
#define NUM_GLMODES (int)(sizeof(glmodes)/sizeof(glmodes[0])) #define NUM_GLMODES (int)(sizeof(glmodes)/sizeof(glmodes[0]))
static int glmode_idx = NUM_GLMODES - 1; /* trilinear */ static int glmode_idx = NUM_GLMODES - 1; /* trilinear */
@ -133,7 +140,7 @@ static void TexMgr_DescribeTextureModes_f (void)
int i; int i;
for (i = 0; i < NUM_GLMODES; i++) for (i = 0; i < NUM_GLMODES; i++)
Con_SafePrintf (" %2i: %s\n", i + 1, glmodes[i].name); Con_SafePrintf (" %2i: %s\n", i + 1, glmodes[i].name1?glmodes[i].name1:glmodes[i].name2);
Con_Printf ("%i modes\n", i); Con_Printf ("%i modes\n", i);
} }
@ -182,7 +189,8 @@ static void TexMgr_TextureMode_f (cvar_t *var)
for (i = 0; i < NUM_GLMODES; i++) for (i = 0; i < NUM_GLMODES; i++)
{ {
if (!Q_strcmp (glmodes[i].name, gl_texturemode.string)) if ((glmodes[i].name1&&!Q_strcmp (glmodes[i].name1, gl_texturemode.string)) ||
(glmodes[i].name2&&!Q_strcmp (glmodes[i].name2, gl_texturemode.string)))
{ {
if (glmode_idx != i) if (glmode_idx != i)
{ {
@ -198,9 +206,10 @@ static void TexMgr_TextureMode_f (cvar_t *var)
for (i = 0; i < NUM_GLMODES; i++) for (i = 0; i < NUM_GLMODES; i++)
{ {
if (!q_strcasecmp (glmodes[i].name, gl_texturemode.string)) if ((glmodes[i].name1&&!q_strcasecmp (glmodes[i].name1, gl_texturemode.string)) ||
(glmodes[i].name2&&!q_strcasecmp (glmodes[i].name2, gl_texturemode.string)))
{ {
Cvar_SetQuick (&gl_texturemode, glmodes[i].name); Cvar_SetQuick (&gl_texturemode, glmodes[i].name1?glmodes[i].name1:glmodes[i].name2);
return; return;
} }
} }
@ -208,12 +217,12 @@ static void TexMgr_TextureMode_f (cvar_t *var)
i = atoi(gl_texturemode.string); i = atoi(gl_texturemode.string);
if (i >= 1 && i <= NUM_GLMODES) if (i >= 1 && i <= NUM_GLMODES)
{ {
Cvar_SetQuick (&gl_texturemode, glmodes[i-1].name); Cvar_SetQuick (&gl_texturemode, glmodes[i-1].name1);
return; return;
} }
Con_Printf ("\"%s\" is not a valid texturemode\n", gl_texturemode.string); Con_Printf ("\"%s\" is not a valid texturemode\n", gl_texturemode.string);
Cvar_SetQuick (&gl_texturemode, glmodes[glmode_idx].name); Cvar_SetQuick (&gl_texturemode, glmodes[glmode_idx].name1?glmodes[glmode_idx].name1:glmodes[glmode_idx].name2);
} }
/* /*
@ -680,7 +689,7 @@ void TexMgr_Init (void)
Cvar_RegisterVariable (&gl_picmip); Cvar_RegisterVariable (&gl_picmip);
Cvar_RegisterVariable (&gl_texture_anisotropy); Cvar_RegisterVariable (&gl_texture_anisotropy);
Cvar_SetCallback (&gl_texture_anisotropy, &TexMgr_Anisotropy_f); Cvar_SetCallback (&gl_texture_anisotropy, &TexMgr_Anisotropy_f);
gl_texturemode.string = glmodes[glmode_idx].name; gl_texturemode.string = glmodes[glmode_idx].name2?glmodes[glmode_idx].name2:glmodes[glmode_idx].name1;
Cvar_RegisterVariable (&gl_texturemode); Cvar_RegisterVariable (&gl_texturemode);
Cvar_SetCallback (&gl_texturemode, &TexMgr_TextureMode_f); Cvar_SetCallback (&gl_texturemode, &TexMgr_TextureMode_f);
Cmd_AddCommand ("gl_describetexturemodes", &TexMgr_DescribeTextureModes_f); Cmd_AddCommand ("gl_describetexturemodes", &TexMgr_DescribeTextureModes_f);