fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 15:31:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

gl_texmgr.c: Make "gl_texturemode" a cvar with callback.

Browse source 
This has the benefit that it is stored in "config.cfg",
and is reset by "resetall" and "resetcfg". Other than
that though, it behaves exactly the same as before.
(The same console input will lead to the same result
as before when it was a command.)


git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@617 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
svdijk 2012-01-20 18:59:20 +00:00
parent 848b6a0911
commit a398d25020
1 changed files with 38 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
Quake/gl_texmgr.c
View file

@ -26,6 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
const int gl_solid_format = 3; const int gl_solid_format = 3;
const int gl_alpha_format = 4; const int gl_alpha_format = 4;
static cvar_t gl_texturemode = {"gl_texturemode", "GL_LINEAR_MIPMAP_LINEAR", CVAR_ARCHIVE};
static cvar_t gl_texture_anisotropy = {"gl_texture_anisotropy", "1", CVAR_ARCHIVE}; static cvar_t gl_texture_anisotropy = {"gl_texture_anisotropy", "1", CVAR_ARCHIVE};
static cvar_t gl_max_size = {"gl_max_size", "0", CVAR_NONE}; static cvar_t gl_max_size = {"gl_max_size", "0", CVAR_NONE};
static cvar_t gl_picmip = {"gl_picmip", "0", CVAR_NONE}; static cvar_t gl_picmip = {"gl_picmip", "0", CVAR_NONE};
@ -66,7 +67,7 @@ static glmode_t modes[] = {
{GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, "GL_LINEAR_MIPMAP_LINEAR"}, {GL_LINEAR, GL_LINEAR_MIPMAP_LINEAR, "GL_LINEAR_MIPMAP_LINEAR"},
}; };
#define NUM_GLMODES 6 #define NUM_GLMODES 6
int gl_texturemode = 5; // bilinear static int mode = 5; // bilinear
/* /*
=============== ===============
@ -104,13 +105,13 @@ static void TexMgr_SetFilterModes (gltexture_t *glt)
} }
else if (glt->flags & TEXPREF_MIPMAP) else if (glt->flags & TEXPREF_MIPMAP)
{ {
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, modes[gl_texturemode].magfilter); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, modes[mode].magfilter);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, modes[gl_texturemode].minfilter); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, modes[mode].minfilter);
} }
else else
{ {
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, modes[gl_texturemode].magfilter); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, modes[mode].magfilter);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, modes[gl_texturemode].magfilter); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, modes[mode].magfilter);
} }
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, gl_texture_anisotropy.value); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, gl_texture_anisotropy.value);
@ -118,68 +119,52 @@ static void TexMgr_SetFilterModes (gltexture_t *glt)
/* /*
=============== ===============
TexMgr_TextureMode_f TexMgr_TextureMode_f -- called when gl_texturemode changes
=============== ===============
*/ */
static void TexMgr_TextureMode_f (void) static void TexMgr_TextureMode_f (cvar_t *var)
{ {
gltexture_t *glt; gltexture_t *glt;
const char *arg;
int i; int i;
switch (Cmd_Argc()) for (i = 0; i < NUM_GLMODES; i++)
{ {
case 1: if (!Q_strcmp (modes[i].name, gl_texturemode.string))
Con_Printf ("\"gl_texturemode\" is \"%s\"\n", modes[gl_texturemode].name);
break;
case 2:
arg = Cmd_Argv(1);
if (arg[0] == 'G' || arg[0] == 'g')
{ {
for (i = 0; i < NUM_GLMODES; i++) mode = i;
{ for (glt = active_gltextures; glt; glt = glt->next)
if (!Q_strcasecmp (modes[i].name, arg)) TexMgr_SetFilterModes (glt);
{ Sbar_Changed (); //sbar graphics need to be redrawn with new filter mode
gl_texturemode = i; //FIXME: warpimages need to be redrawn, too.
goto stuff;
}
}
Con_Printf ("\"%s\" is not a valid texturemode\n", arg);
return; return;
} }
else if (arg[0] >= '0' && arg[0] <= '9')
{
i = atoi(arg);
if (i > NUM_GLMODES || i < 1)
{
Con_Printf ("\"%s\" is not a valid texturemode\n", arg);
return;
}
gl_texturemode = i - 1;
}
else
Con_Printf ("\"%s\" is not a valid texturemode\n", arg);
stuff:
for (glt = active_gltextures; glt; glt = glt->next)
TexMgr_SetFilterModes (glt);
Sbar_Changed (); //sbar graphics need to be redrawn with new filter mode
//FIXME: warpimages need to be redrawn, too.
break;
default:
Con_SafePrintf ("usage: gl_texturemode <mode>\n");
break;
} }
for (i = 0; i < NUM_GLMODES; i++)
{
if (!Q_strcasecmp (modes[i].name, gl_texturemode.string))
{
Cvar_SetQuick (&gl_texturemode, modes[i].name);
return;
}
}
i = atoi(gl_texturemode.string);
if (i >= 1 && i <= NUM_GLMODES)
{
Cvar_SetQuick (&gl_texturemode, modes[i-1].name);
return;
}
Con_Printf ("\"%s\" is not a valid texturemode\n", gl_texturemode.string);
Cvar_SetQuick (&gl_texturemode, modes[mode].name);
return;
} }
/* /*
=============== ===============
TexMgr_Anisotropy_f -- called when gl_texture_anisotropy changes TexMgr_Anisotropy_f -- called when gl_texture_anisotropy changes
FIXME: this is getting called twice (becuase of the recursive Cvar_SetValue call)
=============== ===============
*/ */
static void TexMgr_Anisotropy_f (cvar_t *var) static void TexMgr_Anisotropy_f (cvar_t *var)
@ -596,7 +581,8 @@ 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);
Cmd_AddCommand ("gl_texturemode", &TexMgr_TextureMode_f); Cvar_RegisterVariable (&gl_texturemode);
Cvar_SetCallback(&gl_texturemode, &TexMgr_TextureMode_f);
Cmd_AddCommand ("gl_describetexturemodes", &TexMgr_DescribeTextureModes_f); Cmd_AddCommand ("gl_describetexturemodes", &TexMgr_DescribeTextureModes_f);
Cmd_AddCommand ("imagelist", &TexMgr_Imagelist_f); Cmd_AddCommand ("imagelist", &TexMgr_Imagelist_f);
Cmd_AddCommand ("imagedump", &TexMgr_Imagedump_f); Cmd_AddCommand ("imagedump", &TexMgr_Imagedump_f);