cvar_t gl_combine = {0, "gl_combine", "1", "faster rendering by using GL_ARB_texture_env_combine extension (part of OpenGL 1.3 and above)"};
cvar_t gl_finish = {0, "gl_finish", "0", "make the cpu wait for the graphics processor at the end of each rendered frame (can help with strange input or video lag problems on some machines)"};
+cvar_t vid_stick_mouse = {CVAR_SAVE, "vid_stick_mouse", "0", "have the mouse stuck in the center of the screen" };
+cvar_t vid_resizable = {CVAR_SAVE, "vid_resizable", "0", "0: window not resizable, 1: resizable, 2: window can be resized but the framebuffer isn't adjusted" };
+
cvar_t v_gamma = {CVAR_SAVE, "v_gamma", "1", "inverse gamma correction value, a brightness effect that does not affect white or black, and tends to make the image grey and dull"};
cvar_t v_contrast = {CVAR_SAVE, "v_contrast", "1", "brightness of white (values above 1 give a brighter image with increased color saturation, unlike v_gamma)"};
cvar_t v_brightness = {CVAR_SAVE, "v_brightness", "0", "brightness of black, useful for monitors that are too dark"};
+cvar_t v_contrastboost = {CVAR_SAVE, "v_contrastboost", "1", "by how much to multiply the contrast in dark areas (1 is no change)"};
cvar_t v_color_enable = {CVAR_SAVE, "v_color_enable", "0", "enables black-grey-white color correction curve controls"};
cvar_t v_color_black_r = {CVAR_SAVE, "v_color_black_r", "0", "desired color of black"};
cvar_t v_color_black_g = {CVAR_SAVE, "v_color_black_g", "0", "desired color of black"};
// COMMANDLINEOPTION: GL: -nocubemap disables GL_ARB_texture_cube_map (required for bumpmapping)
if ((gl_texturecubemap = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false)))
qglGetIntegerv(GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB, &gl_max_cube_map_texture_size);
+ // TODO: blacklist this extension on Radeon X1600-X1950 hardware (they support it only with certain filtering/repeat modes)
// COMMANDLINEOPTION: GL: -notexturenonpoweroftwo disables GL_ARB_texture_non_power_of_two (which saves video memory if it is supported, but crashes on some buggy drivers)
gl_support_arb_texture_non_power_of_two = GL_CheckExtension("GL_ARB_texture_non_power_of_two", NULL, "-notexturenonpoweroftwo", false);
// COMMANDLINEOPTION: GL: -notexturecompression disables GL_ARB_texture_compression (which saves video memory if it is supported, but can also degrade image quality, see gl_texturecompression cvar documentation for more information)
}
static int gamma_forcenextframe = false;
-static float cachegamma, cachebrightness, cachecontrast, cacheblack[3], cachegrey[3], cachewhite[3];
+static float cachegamma, cachebrightness, cachecontrast, cacheblack[3], cachegrey[3], cachewhite[3], cachecontrastboost;
static int cachecolorenable, cachehwgamma;
+
+int vid_gammaramps_serial = 0; // so other subsystems can poll if gamma parameters have changed
+void VID_BuildGammaTables(unsigned short *ramps, int rampsize)
+{
+ if (cachecolorenable)
+ {
+ BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], cachecontrastboost, ramps, rampsize);
+ BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], cachecontrastboost, ramps + rampsize, rampsize);
+ BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], cachecontrastboost, ramps + rampsize*2, rampsize);
+ }
+ else
+ {
+ BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, cachecontrastboost, ramps, rampsize);
+ BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, cachecontrastboost, ramps + rampsize, rampsize);
+ BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, cachecontrastboost, ramps + rampsize*2, rampsize);
+ }
+
+ // LordHavoc: this code came from Ben Winslow and Zinx Verituse, I have
+ // immensely butchered it to work with variable framerates and fit in with
+ // the rest of darkplaces.
+ if (v_psycho.integer)
+ {
+ int x, y;
+ float t;
+ static float n[3], nd[3], nt[3];
+ static int init = true;
+ unsigned short *ramp;
+ gamma_forcenextframe = true;
+ if (init)
+ {
+ init = false;
+ for (x = 0;x < 3;x++)
+ {
+ n[x] = lhrandom(0, 1);
+ nd[x] = (rand()&1)?-0.25:0.25;
+ nt[x] = lhrandom(1, 8.2);
+ }
+ }
+
+ for (x = 0;x < 3;x++)
+ {
+ nt[x] -= cl.realframetime;
+ if (nt[x] < 0)
+ {
+ nd[x] = -nd[x];
+ nt[x] += lhrandom(1, 8.2);
+ }
+ n[x] += nd[x] * cl.realframetime;
+ n[x] -= floor(n[x]);
+ }
+
+ for (x = 0, ramp = ramps;x < 3;x++)
+ for (y = 0, t = n[x] - 0.75f;y < rampsize;y++, t += 0.75f * (2.0f / rampsize))
+ *ramp++ = (unsigned short)(cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f);
+ }
+}
+
void VID_UpdateGamma(qboolean force, int rampsize)
{
cvar_t *c;
float f;
int wantgamma;
+ qboolean gamma_changed = false;
// LordHavoc: don't mess with gamma tables if running dedicated
if (cls.state == ca_dedicated)
BOUNDCVAR(v_gamma, 0.1, 5);
BOUNDCVAR(v_contrast, 1, 5);
BOUNDCVAR(v_brightness, 0, 0.8);
+ BOUNDCVAR(v_contrastboost, 0.0625, 16);
BOUNDCVAR(v_color_black_r, 0, 0.8);
BOUNDCVAR(v_color_black_g, 0, 0.8);
BOUNDCVAR(v_color_black_b, 0, 0.8);
BOUNDCVAR(v_color_white_b, 1, 5);
#undef BOUNDCVAR
- if (force || v_psycho.integer)
- gamma_forcenextframe = true;
-#define GAMMACHECK(cache, value) if (cache != (value)) gamma_forcenextframe = true;cache = (value)
- GAMMACHECK(cachehwgamma , wantgamma);
+#define GAMMACHECK(cache, value) if (cache != (value)) gamma_changed = true;cache = (value)
+ if(v_psycho.integer)
+ gamma_changed = true;
GAMMACHECK(cachegamma , v_gamma.value);
GAMMACHECK(cachecontrast , v_contrast.value);
GAMMACHECK(cachebrightness , v_brightness.value);
+ GAMMACHECK(cachecontrastboost, v_contrastboost.value);
GAMMACHECK(cachecolorenable, v_color_enable.integer);
GAMMACHECK(cacheblack[0] , v_color_black_r.value);
GAMMACHECK(cacheblack[1] , v_color_black_g.value);
GAMMACHECK(cachewhite[0] , v_color_white_r.value);
GAMMACHECK(cachewhite[1] , v_color_white_g.value);
GAMMACHECK(cachewhite[2] , v_color_white_b.value);
+
+ if(gamma_changed)
+ ++vid_gammaramps_serial;
+
+ GAMMACHECK(cachehwgamma , wantgamma);
#undef GAMMACHECK
- if (!gamma_forcenextframe)
+ if (!force && !gamma_forcenextframe && !gamma_changed)
return;
gamma_forcenextframe = false;
VID_GetGamma(vid_systemgammaramps, vid_gammarampsize);
}
- if (cachecolorenable)
- {
- BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], vid_gammaramps, rampsize);
- BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], vid_gammaramps + vid_gammarampsize, rampsize);
- BuildGammaTable16(1.0f, invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], vid_gammaramps + vid_gammarampsize*2, rampsize);
- }
- else
- {
- BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps, rampsize);
- BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + vid_gammarampsize, rampsize);
- BuildGammaTable16(1.0f, cachegamma, cachecontrast, cachebrightness, vid_gammaramps + vid_gammarampsize*2, rampsize);
- }
-
- // LordHavoc: this code came from Ben Winslow and Zinx Verituse, I have
- // immensely butchered it to work with variable framerates and fit in with
- // the rest of darkplaces.
- if (v_psycho.integer)
- {
- int x, y;
- float t;
- static float n[3], nd[3], nt[3];
- static int init = true;
- unsigned short *ramp;
- gamma_forcenextframe = true;
- if (init)
- {
- init = false;
- for (x = 0;x < 3;x++)
- {
- n[x] = lhrandom(0, 1);
- nd[x] = (rand()&1)?-0.25:0.25;
- nt[x] = lhrandom(1, 8.2);
- }
- }
-
- for (x = 0;x < 3;x++)
- {
- nt[x] -= cl.realframetime;
- if (nt[x] < 0)
- {
- nd[x] = -nd[x];
- nt[x] += lhrandom(1, 8.2);
- }
- n[x] += nd[x] * cl.realframetime;
- n[x] -= floor(n[x]);
- }
-
- for (x = 0, ramp = vid_gammaramps;x < 3;x++)
- for (y = 0, t = n[x] - 0.75f;y < vid_gammarampsize;y++, t += 0.75f * (2.0f / vid_gammarampsize))
- *ramp++ = (unsigned short)(cos(t*(M_PI*2.0)) * 32767.0f + 32767.0f);
- }
+ VID_BuildGammaTables(vid_gammaramps, vid_gammarampsize);
// set vid_hardwaregammasupported to true if VID_SetGamma succeeds, OR if vid_hwgamma is >= 2 (forced gamma - ignores driver return value)
Cvar_SetValueQuick(&vid_hardwaregammasupported, VID_SetGamma(vid_gammaramps, vid_gammarampsize) || cachehwgamma >= 2);
Cvar_RegisterVariable(&vid_hardwaregammasupported);
Cvar_RegisterVariable(&v_gamma);
Cvar_RegisterVariable(&v_brightness);
+ Cvar_RegisterVariable(&v_contrastboost);
Cvar_RegisterVariable(&v_contrast);
Cvar_RegisterVariable(&v_color_enable);
Cvar_RegisterVariable(&vid_vsync);
Cvar_RegisterVariable(&vid_mouse);
Cvar_RegisterVariable(&vid_grabkeyboard);
+ Cvar_RegisterVariable(&vid_stick_mouse);
+ Cvar_RegisterVariable(&vid_resizable);
Cvar_RegisterVariable(&vid_minwidth);
Cvar_RegisterVariable(&vid_minheight);
Cvar_RegisterVariable(&gl_combine);
int VID_Mode(int fullscreen, int width, int height, int bpp, int refreshrate, int stereobuffer)
{
+ cl_ignoremousemoves = 2;
Con_Printf("Video: %s %dx%dx%dx%dhz%s\n", fullscreen ? "fullscreen" : "window", width, height, bpp, refreshrate, stereobuffer ? " stereo" : "");
if (VID_InitMode(fullscreen, width, height, bpp, refreshrate, stereobuffer))
{
projects / xonotic / darkplaces.git / blobdiff