mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-31 05:00:35 +00:00
fixed m_filter CVAR type, started on gamma for 3dfx
This commit is contained in:
parent
deac792513
commit
1b40eb715a
5 changed files with 20 additions and 4 deletions
|
@ -135,7 +135,7 @@ void
|
||||||
IN_Init_Cvars (void)
|
IN_Init_Cvars (void)
|
||||||
{
|
{
|
||||||
JOY_Init_Cvars ();
|
JOY_Init_Cvars ();
|
||||||
m_filter = Cvar_Get ("m_filter", "0", CVAR_NONE, NULL,
|
m_filter = Cvar_Get ("m_filter", "0", CVAR_ARCHIVE, NULL,
|
||||||
"Toggle mouse input filtering.");
|
"Toggle mouse input filtering.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -424,7 +424,7 @@ void
|
||||||
IN_Init_Cvars (void)
|
IN_Init_Cvars (void)
|
||||||
{
|
{
|
||||||
// mouse variables
|
// mouse variables
|
||||||
m_filter = Cvar_Get ("m_filter", "0", CVAR_NONE, NULL,
|
m_filter = Cvar_Get ("m_filter", "0", CVAR_ARCHIVE, NULL,
|
||||||
"Toggle mouse input filtering.");
|
"Toggle mouse input filtering.");
|
||||||
|
|
||||||
JOY_Init_Cvars();
|
JOY_Init_Cvars();
|
||||||
|
|
|
@ -134,7 +134,7 @@ void
|
||||||
IN_Init_Cvars (void)
|
IN_Init_Cvars (void)
|
||||||
{
|
{
|
||||||
JOY_Init_Cvars ();
|
JOY_Init_Cvars ();
|
||||||
m_filter = Cvar_Get ("m_filter", "0", CVAR_NONE, NULL,
|
m_filter = Cvar_Get ("m_filter", "0", CVAR_ARCHIVE, NULL,
|
||||||
"Toggle mouse input filtering.");
|
"Toggle mouse input filtering.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -425,7 +425,7 @@ void
|
||||||
IN_Init_Cvars (void)
|
IN_Init_Cvars (void)
|
||||||
{
|
{
|
||||||
// mouse variables
|
// mouse variables
|
||||||
m_filter = Cvar_Get ("m_filter", "0", CVAR_NONE, NULL,
|
m_filter = Cvar_Get ("m_filter", "0", CVAR_ARCHIVE, NULL,
|
||||||
"Toggle mouse input filtering.");
|
"Toggle mouse input filtering.");
|
||||||
|
|
||||||
JOY_Init_Cvars();
|
JOY_Init_Cvars();
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
|
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#include <GL/fxmesa.h>
|
#include <GL/fxmesa.h>
|
||||||
|
#include <glide/glide.h>
|
||||||
#include <glide/sst1vid.h>
|
#include <glide/sst1vid.h>
|
||||||
#include <sys/signal.h>
|
#include <sys/signal.h>
|
||||||
|
|
||||||
|
@ -61,6 +62,8 @@
|
||||||
// FIXME!!!!! This belongs in include/qfgl_ext.h -- deek
|
// FIXME!!!!! This belongs in include/qfgl_ext.h -- deek
|
||||||
typedef void (GLAPIENTRY * QF_3DfxSetDitherModeEXT) (GrDitherMode_t mode);
|
typedef void (GLAPIENTRY * QF_3DfxSetDitherModeEXT) (GrDitherMode_t mode);
|
||||||
|
|
||||||
|
cvar_t *vid_system_gamma;
|
||||||
|
|
||||||
static fxMesaContext fc = NULL;
|
static fxMesaContext fc = NULL;
|
||||||
|
|
||||||
int VID_options_items = 0;
|
int VID_options_items = 0;
|
||||||
|
@ -275,6 +278,7 @@ VID_Init (unsigned char *palette)
|
||||||
GL_Init ();
|
GL_Init ();
|
||||||
|
|
||||||
GL_CheckBrightness (palette);
|
GL_CheckBrightness (palette);
|
||||||
|
VID_InitGamma (palette);
|
||||||
VID_SetPalette (palette);
|
VID_SetPalette (palette);
|
||||||
|
|
||||||
// Check for 3DFX Extensions and initialize them.
|
// Check for 3DFX Extensions and initialize them.
|
||||||
|
@ -288,6 +292,7 @@ VID_Init (unsigned char *palette)
|
||||||
void
|
void
|
||||||
VID_Init_Cvars (void)
|
VID_Init_Cvars (void)
|
||||||
{
|
{
|
||||||
|
vid_system_gamma = Cvar_Get ("vid_system_gamma", "1", CVAR_ARCHIVE, NULL, "Use system gamma control if available");
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -312,3 +317,14 @@ void
|
||||||
VID_SetCaption (char *text)
|
VID_SetCaption (char *text)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
qboolean
|
||||||
|
VID_SetGamma (double gamma)
|
||||||
|
{
|
||||||
|
// FIXME: Need function for HW gamma correction
|
||||||
|
// return X11_SetGamma (gamma);
|
||||||
|
grGammaCorrectionValue((float) gamma);
|
||||||
|
return true;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue