void M_Menu_Net_f (void);
void M_Menu_Options_f (void);
void M_Menu_Options_Effects_f (void);
+ void M_Menu_Options_ColorControl_f (void);
void M_Menu_Keys_f (void);
void M_Menu_Video_f (void);
void M_Menu_Help_f (void);
void M_Net_Draw (void);
void M_Options_Draw (void);
void M_Options_Effects_Draw (void);
+ void M_Options_ColorControl_Draw (void);
void M_Keys_Draw (void);
void M_Video_Draw (void);
void M_Help_Draw (void);
void M_Net_Key (int key);
void M_Options_Key (int key);
void M_Options_Effects_Key (int key);
+ void M_Options_ColorControl_Key (int key);
void M_Keys_Key (int key);
void M_Video_Key (int key);
void M_Help_Key (int key);
int demo_cursor;
void M_Demo_Draw (void)
{
- int i;
+ int i;
- for (i=0; i < NumberOfNehahraDemos; i++)
+ for (i = 0;i < NumberOfNehahraDemos;i++)
M_Print (16, 16 + 8*i, NehahraDemos[i].desc);
// line cursor
void M_Menu_Demos_f (void)
{
- key_dest = key_menu;
- m_state = m_demo;
- m_entersound = true;
+ key_dest = key_menu;
+ m_state = m_demo;
+ m_entersound = true;
}
void M_Demo_Key (int k)
#define SLIDER_RANGE 10
-void M_DrawSlider (int x, int y, float range)
+void M_DrawSlider (int x, int y, float num, float rangemin, float rangemax)
{
- int i;
-
- if (range < 0)
- range = 0;
- if (range > 1)
- range = 1;
+ char text[16];
+ int i;
+ float range;
+ range = bound(0, (num - rangemin) / (rangemax - rangemin), 1);
M_DrawCharacter (x-8, y, 128);
- for (i=0 ; i<SLIDER_RANGE ; i++)
+ for (i = 0;i < SLIDER_RANGE;i++)
M_DrawCharacter (x + i*8, y, 129);
M_DrawCharacter (x+i*8, y, 130);
M_DrawCharacter (x + (SLIDER_RANGE-1)*8 * range, y, 131);
+ sprintf(text, "%g", num);
+ M_Print(x + (SLIDER_RANGE+2) * 8, y, text);
}
void M_DrawCheckbox (int x, int y, int on)
}
-#define OPTIONS_ITEMS 28
+#define OPTIONS_ITEMS 27
-int options_cursor;
+int options_cursor;
void M_Menu_Options_f (void)
{
m_entersound = true;
}
+extern cvar_t gl_delayfinish;
+extern cvar_t slowmo;
void M_Menu_Options_AdjustSliders (int dir)
{
switch (options_cursor)
{
- case 5:
- Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1));
- break;
case 6:
- Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
+ Cvar_SetValueQuick (&scr_2dresolution, bound(0, scr_2dresolution.value + dir * 0.2, 1));
break;
case 7:
- Cvar_SetValueQuick (&r_sky, !r_sky.integer);
+ Cvar_SetValueQuick (&scr_viewsize, bound(30, scr_viewsize.value + dir * 10, 120));
break;
case 8:
- Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4));
+ Cvar_SetValueQuick (&r_sky, !r_sky.integer);
break;
case 9:
- Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
+ Cvar_SetValueQuick (&v_overbrightbits, bound(0, v_overbrightbits.integer + dir, 4));
break;
case 10:
- Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
+ Cvar_SetValueQuick (&gl_combine, !gl_combine.integer);
break;
case 11:
- Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer);
+ Cvar_SetValueQuick (&gl_dither, !gl_dither.integer);
break;
case 12:
- Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.25, 5));
+ Cvar_SetValueQuick (&gl_delayfinish, !gl_delayfinish.integer);
break;
case 13:
- Cvar_SetValueQuick (&v_contrast, bound(0.5, v_contrast.value + dir * 0.25, 5));
+ Cvar_SetValueQuick (&slowmo, bound(0, slowmo.value + dir * 0.25, 5));
break;
- case 14:
- Cvar_SetValueQuick (&v_brightness, bound(0, v_brightness.value + dir * 0.05, 0.8));
- break;
- case 15: // music volume
+ case 14: // music volume
#ifdef _WIN32
Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 1.0, 1));
#else
Cvar_SetValueQuick (&bgmvolume, bound(0, bgmvolume.value + dir * 0.1, 1));
#endif
break;
- case 16: // sfx volume
+ case 15: // sfx volume
Cvar_SetValueQuick (&volume, bound(0, volume.value + dir * 0.1, 1));
break;
- case 17:
+ case 16:
Cvar_SetValueQuick (&crosshair, bound(0, crosshair.integer + dir, 5));
break;
- case 18:
+ case 17:
Cvar_SetValueQuick (&crosshair_size, bound(1, crosshair_size.value + dir, 5));
break;
- case 19: // static crosshair
+ case 18: // static crosshair
Cvar_SetValueQuick (&crosshair_static, !crosshair_static.integer);
break;
- case 20: // show framerate
+ case 19: // show framerate
Cvar_SetValueQuick (&showfps, !showfps.integer);
break;
- case 21: // always run
+ case 20: // always run
if (cl_forwardspeed.value > 200)
{
Cvar_SetValueQuick (&cl_forwardspeed, 200);
Cvar_SetValueQuick (&cl_backspeed, 400);
}
break;
- case 22: // lookspring
+ case 21: // lookspring
Cvar_SetValueQuick (&lookspring, !lookspring.integer);
break;
- case 23: // lookstrafe
+ case 22: // lookstrafe
Cvar_SetValueQuick (&lookstrafe, !lookstrafe.integer);
break;
- case 24: // mouse speed
+ case 23: // mouse speed
Cvar_SetValueQuick (&sensitivity, bound(1, sensitivity.value + dir * 0.5, 50));
break;
- case 25: // mouse look
+ case 24: // mouse look
Cvar_SetValueQuick (&freelook, !freelook.integer);
break;
- case 26: // invert mouse
+ case 25: // invert mouse
Cvar_SetValueQuick (&m_pitch, -m_pitch.value);
break;
- case 27: // windowed mouse
+ case 26: // windowed mouse
Cvar_SetValueQuick (&vid_mouse, !vid_mouse.integer);
break;
}
M_Print(16, y, " Reset to defaults");y += 8;
M_Print(16, y, " Video Options");y += 8;
M_Print(16, y, " Effects Options");y += 8;
- M_Print(16, y, " 2D Resolution");M_DrawSlider(220, y, scr_2dresolution.value);y += 8;
- M_Print(16, y, " Screen size");M_DrawSlider(220, y, (scr_viewsize.value - 30) /(120 - 30));y += 8;
+ M_Print(16, y, " Color Control Options");y += 8;
+ M_Print(16, y, " 2D Resolution");M_DrawSlider(220, y, scr_2dresolution.value, 0, 1);y += 8;
+ M_Print(16, y, " Screen size");M_DrawSlider(220, y, scr_viewsize.value, 30, 120);y += 8;
M_Print(16, y, " Sky");M_DrawCheckbox(220, y, r_sky.integer);y += 8;
- M_Print(16, y, " Overbright Bits");M_DrawSlider(220, y, (v_overbrightbits.value) / 4);y += 8;
+ M_Print(16, y, " Overbright Bits");M_DrawSlider(220, y, v_overbrightbits.value, 0, 4);y += 8;
M_Print(16, y, " Texture Combine");M_DrawCheckbox(220, y, gl_combine.integer);y += 8;
M_Print(16, y, " Dithering");M_DrawCheckbox(220, y, gl_dither.integer);y += 8;
- M_ItemPrint(16, y, "Hardware Gamma Control", hardwaregammasupported);M_DrawCheckbox(220, y, v_hwgamma.integer);y += 8;
- M_ItemPrint(16, y, " Gamma", v_hwgamma.integer);M_DrawSlider(220, y, (v_gamma.value - 1) / 4);y += 8;
- M_Print(16, y, " Contrast");M_DrawSlider(220, y, (v_contrast.value - 0.5) / (5 - 0.5));y += 8;
- M_Print(16, y, " Brightness");M_DrawSlider(220, y, v_brightness.value / 0.8);y += 8;
- M_ItemPrint(16, y, " CD Music Volume", cdaudioinitialized);M_DrawSlider(220, y, bgmvolume.value);y += 8;
- M_ItemPrint(16, y, " Sound Volume", snd_initialized);M_DrawSlider(220, y, volume.value);y += 8;
- M_Print(16, y, " Crosshair");M_DrawSlider(220, y, crosshair.value / 5);y += 8;
- M_Print(16, y, " Crosshair Size");M_DrawSlider(220, y, (crosshair_size.value - 1) / 4);y += 8;
+ M_Print(16, y, "Delay refresh (faster)");M_DrawCheckbox(220, y, gl_delayfinish.integer);y += 8;
+ M_ItemPrint(16, y, " Game Speed", sv.active);M_DrawSlider(220, y, slowmo.value, 0, 5);y += 8;
+ M_ItemPrint(16, y, " CD Music Volume", cdaudioinitialized);M_DrawSlider(220, y, bgmvolume.value, 0, 1);y += 8;
+ M_ItemPrint(16, y, " Sound Volume", snd_initialized);M_DrawSlider(220, y, volume.value, 0, 1);y += 8;
+ M_Print(16, y, " Crosshair");M_DrawSlider(220, y, crosshair.value, 0, 5);y += 8;
+ M_Print(16, y, " Crosshair Size");M_DrawSlider(220, y, crosshair_size.value, 1, 5);y += 8;
M_Print(16, y, " Static Crosshair");M_DrawCheckbox(220, y, crosshair_static.integer);y += 8;
M_Print(16, y, " Show Framerate");M_DrawCheckbox(220, y, showfps.integer);y += 8;
M_Print(16, y, " Always Run");M_DrawCheckbox(220, y, cl_forwardspeed.value > 200);y += 8;
M_Print(16, y, " Lookspring");M_DrawCheckbox(220, y, lookspring.integer);y += 8;
M_Print(16, y, " Lookstrafe");M_DrawCheckbox(220, y, lookstrafe.integer);y += 8;
- M_Print(16, y, " Mouse Speed");M_DrawSlider(220, y, (sensitivity.value - 1)/50);y += 8;
+ M_Print(16, y, " Mouse Speed");M_DrawSlider(220, y, sensitivity.value, 1, 50);y += 8;
M_Print(16, y, " Mouse Look");M_DrawCheckbox(220, y, freelook.integer);y += 8;
M_Print(16, y, " Invert Mouse");M_DrawCheckbox(220, y, m_pitch.value < 0);y += 8;
M_Print(16, y, " Use Mouse");M_DrawCheckbox(220, y, vid_mouse.integer);y += 8;
case 4:
M_Menu_Options_Effects_f ();
break;
+ case 5:
+ M_Menu_Options_ColorControl_f ();
+ break;
default:
M_Menu_Options_AdjustSliders (1);
break;
M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
y = 32;
- M_Print(16, y, " Lights Per Model");M_DrawSlider(220, y, r_modellights.value / 8);y += 8;
+ M_Print(16, y, " Lights Per Model");M_DrawSlider(220, y, r_modellights.value, 0, 8);y += 8;
M_Print(16, y, " Fast Dynamic Lighting");M_DrawCheckbox(220, y, !r_dlightmap.integer);y += 8;
M_Print(16, y, " Coronas");M_DrawCheckbox(220, y, r_coronas.integer);y += 8;
M_Print(16, y, " Use Only Coronas");M_DrawCheckbox(220, y, gl_flashblend.integer);y += 8;
M_Print(16, y, " Sparks");M_DrawCheckbox(220, y, cl_particles_sparks.integer);y += 8;
M_Print(16, y, " Bubbles");M_DrawCheckbox(220, y, cl_particles_bubbles.integer);y += 8;
M_Print(16, y, " Blood");M_DrawCheckbox(220, y, cl_particles_blood.integer);y += 8;
- M_Print(16, y, " Blood Size");M_DrawSlider(220, y, (cl_particles_blood_size.value - 2) / 18);y += 8;
- M_Print(16, y, " Blood Opacity");M_DrawSlider(220, y, (cl_particles_blood_alpha.value - 0.2) / 0.8);y += 8;
+ M_Print(16, y, " Blood Size");M_DrawSlider(220, y, cl_particles_blood_size.value, 2, 20);y += 8;
+ M_Print(16, y, " Blood Opacity");M_DrawSlider(220, y, cl_particles_blood_alpha.value, 0.2, 1);y += 8;
// cursor
M_DrawCharacter(200, 32 + options_effects_cursor*8, 12+((int)(realtime*4)&1));
}
}
+
+
+
+
+#define OPTIONS_COLORCONTROL_ITEMS 18
+
+int options_colorcontrol_cursor;
+
+// intensity value to match up to 50% dither to 'correct' quake
+cvar_t menu_options_colorcontrol_correctionvalue = {0, "menu_options_colorcontrol_correctionvalue", "0.25"};
+
+void M_Menu_Options_ColorControl_f (void)
+{
+ key_dest = key_menu;
+ m_state = m_options_colorcontrol;
+ m_entersound = true;
+}
+
+
+void M_Menu_Options_ColorControl_AdjustSliders (int dir)
+{
+ float f;
+ S_LocalSound ("misc/menu3.wav");
+
+ switch (options_colorcontrol_cursor)
+ {
+ case 1:
+ Cvar_SetValueQuick (&v_hwgamma, !v_hwgamma.integer);
+ break;
+ case 2:
+ Cvar_SetValueQuick (&v_color_enable, 0);
+ Cvar_SetValueQuick (&v_gamma, bound(1, v_gamma.value + dir * 0.125, 5));
+ break;
+ case 3:
+ Cvar_SetValueQuick (&v_color_enable, 0);
+ Cvar_SetValueQuick (&v_contrast, bound(1, v_contrast.value + dir * 0.125, 5));
+ break;
+ case 4:
+ Cvar_SetValueQuick (&v_color_enable, 0);
+ Cvar_SetValueQuick (&v_brightness, bound(0, v_brightness.value + dir * 0.05, 0.8));
+ break;
+ case 5:
+ Cvar_SetValueQuick (&v_color_enable, !v_color_enable.integer);
+ break;
+ case 6:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_black_r, bound(0, v_color_black_r.value + dir * 0.0125, 0.8));
+ break;
+ case 7:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_black_g, bound(0, v_color_black_g.value + dir * 0.0125, 0.8));
+ break;
+ case 8:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_black_b, bound(0, v_color_black_b.value + dir * 0.0125, 0.8));
+ break;
+ case 9:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ f = bound(0, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3 + dir * 0.0125, 0.8);
+ Cvar_SetValueQuick (&v_color_black_r, f);
+ Cvar_SetValueQuick (&v_color_black_g, f);
+ Cvar_SetValueQuick (&v_color_black_b, f);
+ break;
+ case 10:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_grey_r, bound(0, v_color_grey_r.value + dir * 0.0125, 0.95));
+ break;
+ case 11:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_grey_g, bound(0, v_color_grey_g.value + dir * 0.0125, 0.95));
+ break;
+ case 12:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_grey_b, bound(0, v_color_grey_b.value + dir * 0.0125, 0.95));
+ break;
+ case 13:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ f = bound(0, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3 + dir * 0.0125, 0.95);
+ Cvar_SetValueQuick (&v_color_grey_r, f);
+ Cvar_SetValueQuick (&v_color_grey_g, f);
+ Cvar_SetValueQuick (&v_color_grey_b, f);
+ break;
+ case 14:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_white_r, bound(1, v_color_white_r.value + dir * 0.125, 5));
+ break;
+ case 15:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_white_g, bound(1, v_color_white_g.value + dir * 0.125, 5));
+ break;
+ case 16:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ Cvar_SetValueQuick (&v_color_white_b, bound(1, v_color_white_b.value + dir * 0.125, 5));
+ break;
+ case 17:
+ Cvar_SetValueQuick (&v_color_enable, 1);
+ f = bound(1, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3 + dir * 0.125, 5);
+ Cvar_SetValueQuick (&v_color_white_r, f);
+ Cvar_SetValueQuick (&v_color_white_g, f);
+ Cvar_SetValueQuick (&v_color_white_b, f);
+ break;
+ }
+}
+
+void M_Options_ColorControl_Draw (void)
+{
+ float x, y, c, s, t, u, v;
+ cachepic_t *p;
+
+ M_DrawPic(16, 4, "gfx/qplaque.lmp");
+ p = Draw_CachePic("gfx/p_option.lmp");
+ M_DrawPic((320-p->width)/2, 4, "gfx/p_option.lmp");
+
+ y = 32;
+ M_Print(16, y, " Reset to defaults");y += 8;
+ M_ItemPrint(16, y, "Hardware Gamma Control", vid_hardwaregammasupported);M_DrawCheckbox(220, y, v_hwgamma.integer);y += 8;
+ M_ItemPrint(16, y, " Gamma", !v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_gamma.value, 1, 5);y += 8;
+ M_ItemPrint(16, y, " Contrast", !v_color_enable.integer);M_DrawSlider(220, y, v_contrast.value, 1, 5);y += 8;
+ M_ItemPrint(16, y, " Brightness", !v_color_enable.integer);M_DrawSlider(220, y, v_brightness.value, 0, 0.8);y += 8;
+ M_Print(16, y, " Color Level Controls");M_DrawCheckbox(220, y, v_color_enable.integer);y += 8;
+ M_ItemPrint(16, y, " Black: Red ", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_r.value, 0, 0.8);y += 8;
+ M_ItemPrint(16, y, " Black: Green", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_g.value, 0, 0.8);y += 8;
+ M_ItemPrint(16, y, " Black: Blue ", v_color_enable.integer);M_DrawSlider(220, y, v_color_black_b.value, 0, 0.8);y += 8;
+ M_ItemPrint(16, y, " Black: Grey ", v_color_enable.integer);M_DrawSlider(220, y, (v_color_black_r.value + v_color_black_g.value + v_color_black_b.value) / 3, 0, 0.8);y += 8;
+ M_ItemPrint(16, y, " Grey: Red ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_r.value, 0, 0.95);y += 8;
+ M_ItemPrint(16, y, " Grey: Green", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_g.value, 0, 0.95);y += 8;
+ M_ItemPrint(16, y, " Grey: Blue ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, v_color_grey_b.value, 0, 0.95);y += 8;
+ M_ItemPrint(16, y, " Grey: Grey ", v_color_enable.integer && vid_hardwaregammasupported && v_hwgamma.integer);M_DrawSlider(220, y, (v_color_grey_r.value + v_color_grey_g.value + v_color_grey_b.value) / 3, 0, 0.95);y += 8;
+ M_ItemPrint(16, y, " White: Red ", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_r.value, 1, 5);y += 8;
+ M_ItemPrint(16, y, " White: Green", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_g.value, 1, 5);y += 8;
+ M_ItemPrint(16, y, " White: Blue ", v_color_enable.integer);M_DrawSlider(220, y, v_color_white_b.value, 1, 5);y += 8;
+ M_ItemPrint(16, y, " White: Grey ", v_color_enable.integer);M_DrawSlider(220, y, (v_color_white_r.value + v_color_white_g.value + v_color_white_b.value) / 3, 1, 5);y += 8;
+
+ y += 4;
+ DrawQ_Fill(menu_x, menu_y + y, 320, 4 + 64 + 8 + 64 + 4, 0, 0, 0, 1, 0);y += 4;
+ s = (float) 312 / 2 * vid.realwidth / vid.conwidth;
+ t = (float) 4 / 2 * vid.realheight / vid.conheight;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,0,0,1, 0,1, 0,0,0,1, 1,1, 1,0,0,1, 0);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,1,0,1, 0,1, 0,0,0,1, 1,1, 0,1,0,1, 0);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 0,0,1,1, 0,1, 0,0,0,1, 1,1, 0,0,1,1, 0);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, "gfx/colorcontrol/ditherpattern.tga", 312, 4, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);y += 4;
+ DrawQ_SuperPic(menu_x + 4, menu_y + y, NULL , 312, 4, 0,0, 0,0,0,1, 1,0, 1,1,1,1, 0,1, 0,0,0,1, 1,1, 1,1,1,1, 0);y += 4;
+
+ c = menu_options_colorcontrol_correctionvalue.value; // intensity value that should be matched up to a 50% dither to 'correct' quake
+ s = (float) 48 / 2 * vid.realwidth / vid.conwidth;
+ t = (float) 48 / 2 * vid.realheight / vid.conheight;
+ u = s * 0.5;
+ v = t * 0.5;
+ y += 8;
+ x = 4;
+ DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, c, 0, 0, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, s,0, 1,0,0,1, 0,t, 1,0,0,1, s,t, 1,0,0,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,0,0,1, u,0, 1,0,0,1, 0,v, 1,0,0,1, u,v, 1,0,0,1, 0);
+ x += 80;
+ DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, 0, c, 0, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, s,0, 0,1,0,1, 0,t, 0,1,0,1, s,t, 0,1,0,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,1,0,1, u,0, 0,1,0,1, 0,v, 0,1,0,1, u,v, 0,1,0,1, 0);
+ x += 80;
+ DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, 0, 0, c, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, s,0, 0,0,1,1, 0,t, 0,0,1,1, s,t, 0,0,1,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 0,0,1,1, u,0, 0,0,1,1, 0,v, 0,0,1,1, u,v, 0,0,1,1, 0);
+ x += 80;
+ DrawQ_Fill(menu_x + x, menu_y + y, 64, 48, c, c, c, 1, 0);
+ DrawQ_SuperPic(menu_x + x + 16, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, s,0, 1,1,1,1, 0,t, 1,1,1,1, s,t, 1,1,1,1, 0);
+ DrawQ_SuperPic(menu_x + x + 32, menu_y + y + 16, "gfx/colorcontrol/ditherpattern.tga", 16, 16, 0,0, 1,1,1,1, u,0, 1,1,1,1, 0,v, 1,1,1,1, u,v, 1,1,1,1, 0);
+
+ // cursor
+ M_DrawCharacter(200, 32 + options_colorcontrol_cursor*8, 12+((int)(realtime*4)&1));
+}
+
+
+void M_Options_ColorControl_Key (int k)
+{
+ switch (k)
+ {
+ case K_ESCAPE:
+ M_Menu_Main_f ();
+ break;
+
+ case K_ENTER:
+ m_entersound = true;
+ switch (options_colorcontrol_cursor)
+ {
+ case 0:
+ Cvar_SetValueQuick(&v_hwgamma, 1);
+ Cvar_SetValueQuick(&v_gamma, 1);
+ Cvar_SetValueQuick(&v_contrast, 1);
+ Cvar_SetValueQuick(&v_brightness, 0);
+ Cvar_SetValueQuick(&v_color_enable, 0);
+ Cvar_SetValueQuick(&v_color_black_r, 0);
+ Cvar_SetValueQuick(&v_color_black_g, 0);
+ Cvar_SetValueQuick(&v_color_black_b, 0);
+ Cvar_SetValueQuick(&v_color_grey_r, 0);
+ Cvar_SetValueQuick(&v_color_grey_g, 0);
+ Cvar_SetValueQuick(&v_color_grey_b, 0);
+ Cvar_SetValueQuick(&v_color_white_r, 1);
+ Cvar_SetValueQuick(&v_color_white_g, 1);
+ Cvar_SetValueQuick(&v_color_white_b, 1);
+ Cbuf_AddText ("exec default.cfg\n");
+ break;
+ default:
+ M_Menu_Options_ColorControl_AdjustSliders (1);
+ break;
+ }
+ return;
+
+ case K_UPARROW:
+ S_LocalSound ("misc/menu1.wav");
+ options_colorcontrol_cursor--;
+ if (options_colorcontrol_cursor < 0)
+ options_colorcontrol_cursor = OPTIONS_COLORCONTROL_ITEMS-1;
+ break;
+
+ case K_DOWNARROW:
+ S_LocalSound ("misc/menu1.wav");
+ options_colorcontrol_cursor++;
+ if (options_colorcontrol_cursor >= OPTIONS_COLORCONTROL_ITEMS)
+ options_colorcontrol_cursor = 0;
+ break;
+
+ case K_LEFTARROW:
+ M_Menu_Options_ColorControl_AdjustSliders (-1);
+ break;
+
+ case K_RIGHTARROW:
+ M_Menu_Options_ColorControl_AdjustSliders (1);
+ break;
+ }
+}
+
+
//=============================================================================
/* KEYS MENU */
Cmd_AddCommand ("menu_setup", M_Menu_Setup_f);
Cmd_AddCommand ("menu_options", M_Menu_Options_f);
Cmd_AddCommand ("menu_options_effects", M_Menu_Options_Effects_f);
+ Cmd_AddCommand ("menu_options_colorcontrol", M_Menu_Options_ColorControl_f);
+ Cvar_RegisterVariable (&menu_options_colorcontrol_correctionvalue);
Cmd_AddCommand ("menu_keys", M_Menu_Keys_f);
Cmd_AddCommand ("menu_video", M_Menu_Video_f);
Cmd_AddCommand ("help", M_Menu_Help_f);
M_Options_Effects_Draw ();
break;
+ case m_options_colorcontrol:
+ M_Options_ColorControl_Draw ();
+ break;
+
case m_keys:
M_Keys_Draw ();
break;
M_Options_Effects_Key (key);
return;
+ case m_options_colorcontrol:
+ M_Options_ColorControl_Key (key);
+ return;
+
case m_keys:
M_Keys_Key (key);
return;
};
static Display *vidx11_display = NULL;
-static int scrnum;
+static int vidx11_screen;
static Window win;
static GLXContext ctx = NULL;
case 5:
Key_Event(K_MWHEELDOWN, true);
break;
- default:
+ default:
Con_Printf("HandleEvents: ButtonPress gave value %d, 1-5 expected\n", event.xbutton.button);
break;
}
case 5:
Key_Event(K_MWHEELDOWN, false);
break;
- default:
+ default:
Con_Printf("HandleEvents: ButtonRelease gave value %d, 1-5 expected\n", event.xbutton.button);
break;
}
case MapNotify:
// window restored
vid_hidden = false;
+ vid_allowhwgamma = true;
break;
case UnmapNotify:
// window iconified/rolledup/whatever
vid_hidden = true;
+ vid_allowhwgamma = false;
+ VID_RestoreSystemGamma();
break;
case FocusIn:
// window is now the input focus
+ vid_allowhwgamma = true;
break;
case FocusOut:
// window is no longer the input focus
+ vid_allowhwgamma = false;
+ VID_RestoreSystemGamma();
break;
case EnterNotify:
// mouse entered window
+ vid_allowhwgamma = true;
break;
case LeaveNotify:
// mouse left window
+ vid_allowhwgamma = false;
+ VID_RestoreSystemGamma();
break;
}
}
}
}
-
void VID_Shutdown(void)
{
if (!ctx || !vidx11_display)
usingmouse = false;
if (vidx11_display)
{
+ VID_RestoreSystemGamma();
uninstall_grabs();
// FIXME: glXDestroyContext here?
if (vidmode_active)
- XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[0]);
+ XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[0]);
if (win)
XDestroyWindow(vidx11_display, win);
XCloseDisplay(vidx11_display);
void signal_handler(int sig)
{
printf("Received signal %d, exiting...\n", sig);
+ VID_RestoreSystemGamma();
Sys_Quit();
exit(0);
}
}
}
-// LordHavoc: ported from SDL 1.2.2, this was far more difficult to port from
-// SDL than to simply use the XFree gamma ramp extension, but that affects the
-// whole screen even when the game window is inactive, this only affects the
-// screen while the window is active, very desirable behavior :)
-int VID_SetGamma(float prescale, float gamma, float scale, float base)
+int VID_SetGamma(unsigned short *ramps)
{
-// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them
-#if 1
- return FALSE;
-#else
- int i, ncolors, c;
- unsigned int Rmask, Gmask, Bmask, Rloss, Gloss, Bloss, Rshift, Gshift, Bshift, mask;
- XColor xcmap[256];
- unsigned short ramp[256];
-
- if (COM_CheckParm("-nogamma"))
- return FALSE;
-
- if (vidx11_visual->class != DirectColor)
- {
- Con_Printf("X11 Visual class is %d, can only do gamma on %d\n", vidx11_visual->class, DirectColor);
- return FALSE;
- }
-
- Rmask = vidx11_visual->red_mask;
- Gmask = vidx11_visual->green_mask;
- Bmask = vidx11_visual->blue_mask;
-
- Rshift = 0;
- Rloss = 8;
- if ((mask = Rmask))
- {
- for (;!(mask & 1);mask >>= 1)
- ++Rshift;
- for (;(mask & 1);mask >>= 1)
- --Rloss;
- }
- Gshift = 0;
- Gloss = 8;
- if ((mask = Gmask))
- {
- for (;!(mask & 1);mask >>= 1)
- ++Gshift;
- for (;(mask & 1);mask >>= 1)
- --Gloss;
- }
- Bshift = 0;
- Bloss = 8;
- if ((mask = Bmask))
- {
- for (;!(mask & 1);mask >>= 1)
- ++Bshift;
- for (;(mask & 1);mask >>= 1)
- --Bloss;
- }
-
- BuildGammaTable16(prescale, gamma, scale, base, ramp);
+ return XF86VidModeSetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512);
+}
- // convert gamma ramp to palette (yes this seems odd)
- ncolors = vidx11_visual->map_entries;
- for (i = 0;i < ncolors;i++)
- {
- c = (256 * i / ncolors);
- xcmap[i].pixel = ((c >> Rloss) << Rshift) | ((c >> Gloss) << Gshift) | ((c >> Bloss) << Bshift);
- xcmap[i].red = ramp[c];
- xcmap[i].green = ramp[c];
- xcmap[i].blue = ramp[c];
- xcmap[i].flags = (DoRed|DoGreen|DoBlue);
- }
- XStoreColors(vidx11_display, vidx11_colormap, xcmap, ncolors);
- XSync(vidx11_display, false);
- // FIXME: should this check for BadAccess/BadColor/BadValue errors produced by XStoreColors before setting this true?
- return TRUE;
-#endif
+int VID_GetGamma(unsigned short *ramps)
+{
+ return XF86VidModeGetGammaRamp(vidx11_display, vidx11_screen, 256, ramps, ramps + 256, ramps + 512);
}
void VID_Init(void)
mouse_avail = false;
}
-void VID_BuildGLXAttrib(int *attrib, int stencil, int gamma)
+void VID_BuildGLXAttrib(int *attrib, int stencil)
{
*attrib++ = GLX_RGBA;
*attrib++ = GLX_RED_SIZE;*attrib++ = 1;
*attrib++ = GLX_STENCIL_SIZE;*attrib++ = 8;
*attrib++ = GLX_ALPHA_SIZE;*attrib++ = 1;
}
- if (gamma)
- {
- *attrib++ = GLX_X_VISUAL_TYPE;*attrib++ = GLX_DIRECT_COLOR;
- };
*attrib++ = None;
}
return false;
}
- scrnum = DefaultScreen(vidx11_display);
- root = RootWindow(vidx11_display, scrnum);
+ vidx11_screen = DefaultScreen(vidx11_display);
+ root = RootWindow(vidx11_display, vidx11_screen);
// Get video mode list
MajorVersion = MinorVersion = 0;
return false;
}
- visinfo = NULL;
-// LordHavoc: FIXME: finish this code, we need to allocate colors before we can store them
-#if 0
- if (!COM_CheckParm("-nogamma"))
- {
- VID_BuildGLXAttrib(attrib, stencil, true);
- visinfo = qglXChooseVisual(vidx11_display, scrnum, attrib);
- }
-#endif
+ VID_BuildGLXAttrib(attrib, stencil);
+ visinfo = qglXChooseVisual(vidx11_display, vidx11_screen, attrib);
if (!visinfo)
{
- VID_BuildGLXAttrib(attrib, stencil, false);
- visinfo = qglXChooseVisual(vidx11_display, scrnum, attrib);
- if (!visinfo)
- {
- Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n");
- return false;
- }
+ Con_Printf("Couldn't get an RGB, Double-buffered, Depth visual\n");
+ return false;
}
if (vidmode_ext)
{
int best_fit, best_dist, dist, x, y;
- XF86VidModeGetAllModeLines(vidx11_display, scrnum, &num_vidmodes, &vidmodes);
-
// Are we going fullscreen? If so, let's change video mode
if (fullscreen)
{
+ XF86VidModeGetAllModeLines(vidx11_display, vidx11_screen, &num_vidmodes, &vidmodes);
best_dist = 9999999;
best_fit = -1;
height = vidmodes[best_fit]->vdisplay;
// change to the mode
- XF86VidModeSwitchToMode(vidx11_display, scrnum, vidmodes[best_fit]);
+ XF86VidModeSwitchToMode(vidx11_display, vidx11_screen, vidmodes[best_fit]);
vidmode_active = true;
// Move the viewport to top left
- XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0);
+ XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
}
else
fullscreen = 0;
XWarpPointer(vidx11_display, None, win, 0, 0, 0, 0, 0, 0);
XFlush(vidx11_display);
// Move the viewport to top left
- XF86VidModeSetViewPort(vidx11_display, scrnum, 0, 0);
+ XF86VidModeSetViewPort(vidx11_display, vidx11_screen, 0, 0);
}
//XSync(vidx11_display, False);
gl_version = qglGetString(GL_VERSION);
gl_extensions = qglGetString(GL_EXTENSIONS);
gl_platform = "GLX";
- gl_platformextensions = qglXQueryExtensionsString(vidx11_display, scrnum);
+ gl_platformextensions = qglXQueryExtensionsString(vidx11_display, vidx11_screen);
GL_CheckExtension("GLX_ARB_get_proc_address", getprocaddressfuncs, "-nogetprocaddress", false);
gl_videosyncavailable = GL_CheckExtension("GLX_SGI_video_sync", videosyncfuncs, "-novideosync", false);
usingmouse = false;
vid_hidden = false;
+ vid_allowhwgamma = true;
GL_Init();
return true;
}
// LordHavoc: if window is not the active window, don't hog as much CPU time,
// let go of the mouse, turn off sound, and restore system gamma ramps...
int vid_activewindow = true;
+// LordHavoc: whether to allow use of hwgamma (disabled when window is inactive)
+int vid_allowhwgamma = false;
+
+// we don't know until we try it!
+int vid_hardwaregammasupported = true;
+// whether hardware gamma ramps are currently in effect
+int vid_usinghwgamma = false;
+
+unsigned short vid_gammaramps[768];
+unsigned short vid_systemgammaramps[768];
cvar_t vid_fullscreen = {CVAR_SAVE, "vid_fullscreen", "1"};
cvar_t vid_width = {CVAR_SAVE, "vid_width", "640"};
cvar_t m_filter = {CVAR_SAVE, "m_filter","0"};
+cvar_t v_gamma = {CVAR_SAVE, "v_gamma", "1"};
+cvar_t v_contrast = {CVAR_SAVE, "v_contrast", "1"};
+cvar_t v_brightness = {CVAR_SAVE, "v_brightness", "0"};
+cvar_t v_color_enable = {CVAR_SAVE, "v_color_enable", "0"};
+cvar_t v_color_black_r = {CVAR_SAVE, "v_color_black_r", "0"};
+cvar_t v_color_black_g = {CVAR_SAVE, "v_color_black_g", "0"};
+cvar_t v_color_black_b = {CVAR_SAVE, "v_color_black_b", "0"};
+cvar_t v_color_grey_r = {CVAR_SAVE, "v_color_grey_r", "0.5"};
+cvar_t v_color_grey_g = {CVAR_SAVE, "v_color_grey_g", "0.5"};
+cvar_t v_color_grey_b = {CVAR_SAVE, "v_color_grey_b", "0.5"};
+cvar_t v_color_white_r = {CVAR_SAVE, "v_color_white_r", "1"};
+cvar_t v_color_white_g = {CVAR_SAVE, "v_color_white_g", "1"};
+cvar_t v_color_white_b = {CVAR_SAVE, "v_color_white_b", "1"};
+cvar_t v_overbrightbits = {CVAR_SAVE, "v_overbrightbits", "0"};
+cvar_t v_hwgamma = {0, "v_hwgamma", "1"};
+
// brand of graphics chip
const char *gl_vendor;
// graphics chip model and other information
}
}
+static float cachegamma, cachebrightness, cachecontrast, cacheblack[3], cachegrey[3], cachewhite[3];
+static int cacheoverbrightbits = -1, cachecolorenable, cachehwgamma;
+#define BOUNDCVAR(cvar, m1, m2) c = &(cvar);f = bound(m1, c->value, m2);if (c->value != f) Cvar_SetValueQuick(c, f);
+void VID_UpdateGamma(qboolean force)
+{
+ cvar_t *c;
+ float f;
+
+ // LordHavoc: don't mess with gamma tables if running dedicated
+ if (cls.state == ca_dedicated)
+ return;
+
+ if (!force
+ && vid_usinghwgamma == (vid_allowhwgamma && v_hwgamma.integer)
+ && v_overbrightbits.integer == cacheoverbrightbits
+ && v_gamma.value == cachegamma
+ && v_contrast.value == cachecontrast
+ && v_brightness.value == cachebrightness
+ && cachecolorenable == v_color_enable.integer
+ && cacheblack[0] == v_color_black_r.value
+ && cacheblack[1] == v_color_black_g.value
+ && cacheblack[2] == v_color_black_b.value
+ && cachegrey[0] == v_color_grey_r.value
+ && cachegrey[1] == v_color_grey_g.value
+ && cachegrey[2] == v_color_grey_b.value
+ && cachewhite[0] == v_color_white_r.value
+ && cachewhite[1] == v_color_white_g.value
+ && cachewhite[2] == v_color_white_b.value)
+ return;
+
+ if (vid_allowhwgamma && v_hwgamma.integer)
+ {
+ if (!vid_usinghwgamma)
+ {
+ vid_usinghwgamma = true;
+ vid_hardwaregammasupported = VID_GetGamma(vid_systemgammaramps);
+ }
+
+ BOUNDCVAR(v_gamma, 0.1, 5);cachegamma = v_gamma.value;
+ BOUNDCVAR(v_contrast, 1, 5);cachecontrast = v_contrast.value;
+ BOUNDCVAR(v_brightness, 0, 0.8);cachebrightness = v_brightness.value;
+ BOUNDCVAR(v_color_black_r, 0, 0.8);cacheblack[0] = v_color_black_r.value;
+ BOUNDCVAR(v_color_black_g, 0, 0.8);cacheblack[1] = v_color_black_g.value;
+ BOUNDCVAR(v_color_black_b, 0, 0.8);cacheblack[2] = v_color_black_b.value;
+ BOUNDCVAR(v_color_grey_r, 0, 0.95);cachegrey[0] = v_color_grey_r.value;
+ BOUNDCVAR(v_color_grey_g, 0, 0.95);cachegrey[1] = v_color_grey_g.value;
+ BOUNDCVAR(v_color_grey_b, 0, 0.95);cachegrey[2] = v_color_grey_b.value;
+ BOUNDCVAR(v_color_white_r, 1, 5);cachewhite[0] = v_color_white_r.value;
+ BOUNDCVAR(v_color_white_g, 1, 5);cachewhite[1] = v_color_white_g.value;
+ BOUNDCVAR(v_color_white_b, 1, 5);cachewhite[2] = v_color_white_b.value;
+ cachecolorenable = v_color_enable.integer;
+ cacheoverbrightbits = v_overbrightbits.integer;
+ cachehwgamma = v_hwgamma.integer;
+
+ if (cachecolorenable)
+ {
+ BuildGammaTable16((float) (1 << cacheoverbrightbits), invpow(0.5, 1 - cachegrey[0]), cachewhite[0], cacheblack[0], vid_gammaramps);
+ BuildGammaTable16((float) (1 << cacheoverbrightbits), invpow(0.5, 1 - cachegrey[1]), cachewhite[1], cacheblack[1], vid_gammaramps + 256);
+ BuildGammaTable16((float) (1 << cacheoverbrightbits), invpow(0.5, 1 - cachegrey[2]), cachewhite[2], cacheblack[2], vid_gammaramps + 512);
+ }
+ else
+ {
+ BuildGammaTable16((float) (1 << cacheoverbrightbits), cachegamma, cachecontrast, cachebrightness, vid_gammaramps);
+ BuildGammaTable16((float) (1 << cacheoverbrightbits), cachegamma, cachecontrast, cachebrightness, vid_gammaramps + 256);
+ BuildGammaTable16((float) (1 << cacheoverbrightbits), cachegamma, cachecontrast, cachebrightness, vid_gammaramps + 512);
+ }
+
+ vid_hardwaregammasupported = VID_SetGamma(vid_gammaramps);
+ }
+ else
+ {
+ if (vid_usinghwgamma)
+ {
+ vid_usinghwgamma = false;
+ vid_hardwaregammasupported = VID_SetGamma(vid_systemgammaramps);
+ }
+ }
+}
+
+void VID_RestoreSystemGamma(void)
+{
+ if (vid_usinghwgamma)
+ {
+ vid_usinghwgamma = false;
+ VID_SetGamma(vid_systemgammaramps);
+ }
+}
+
void VID_Shared_Init(void)
{
+ Cvar_RegisterVariable(&v_gamma);
+ Cvar_RegisterVariable(&v_brightness);
+ Cvar_RegisterVariable(&v_contrast);
+
+ Cvar_RegisterVariable(&v_color_enable);
+ Cvar_RegisterVariable(&v_color_black_r);
+ Cvar_RegisterVariable(&v_color_black_g);
+ Cvar_RegisterVariable(&v_color_black_b);
+ Cvar_RegisterVariable(&v_color_grey_r);
+ Cvar_RegisterVariable(&v_color_grey_g);
+ Cvar_RegisterVariable(&v_color_grey_b);
+ Cvar_RegisterVariable(&v_color_white_r);
+ Cvar_RegisterVariable(&v_color_white_g);
+ Cvar_RegisterVariable(&v_color_white_b);
+
+ Cvar_RegisterVariable(&v_hwgamma);
+ Cvar_RegisterVariable(&v_overbrightbits);
+
Cvar_RegisterVariable(&vid_fullscreen);
Cvar_RegisterVariable(&vid_width);
Cvar_RegisterVariable(&vid_height);
projects / xonotic / darkplaces.git / commitdiff