From 2512e310afa2d8c7e0caf0c9e7af747c5368c5f6 Mon Sep 17 00:00:00 2001 From: havoc Date: Thu, 20 Apr 2006 07:57:38 +0000 Subject: [PATCH] renamed scr_screenshot_gamma to scr_screenshot_gammaboost and changed default to 1, this means all screenshots will be unmodified unless the user specifically changes the setting, rather than saving them very bright by default git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6316 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_screen.c | 12 ++++++------ cl_screen.h | 2 +- menu.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cl_screen.c b/cl_screen.c index 4f5c56fa..3935a46f 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -23,9 +23,9 @@ cvar_t vid_conheight = {CVAR_SAVE, "vid_conheight", "480", "virtual height of 2D cvar_t vid_pixelheight = {CVAR_SAVE, "vid_pixelheight", "1", "adjusts vertical field of vision to account for non-square pixels (1280x1024 on a CRT monitor for example)"}; cvar_t scr_screenshot_jpeg = {CVAR_SAVE, "scr_screenshot_jpeg","1", "save jpeg instead of targa"}; cvar_t scr_screenshot_jpeg_quality = {CVAR_SAVE, "scr_screenshot_jpeg_quality","0.9", "image quality of saved jpeg"}; -cvar_t scr_screenshot_gamma = {CVAR_SAVE, "scr_screenshot_gamma","2.2", "gamma correction on saved screenshots and videos, 1.0 saves unmodified images"}; +cvar_t scr_screenshot_gammaboost = {CVAR_SAVE, "scr_screenshot_gammaboost","1", "gamma correction on saved screenshots and videos, 1.0 saves unmodified images"}; // scr_screenshot_name is defined in fs.c -cvar_t cl_capturevideo = {0, "cl_capturevideo", "0", "enables saving of video to a file or files (default is .tga files, if scr_screenshot_jpeg is on it saves .jpg files (VERY SLOW), if any rawrgb or rawyv12 are on it saves those formats instead, note that scr_screenshot_gamma affects the brightness of the output)"}; +cvar_t cl_capturevideo = {0, "cl_capturevideo", "0", "enables saving of video to a file or files (default is .tga files, if scr_screenshot_jpeg is on it saves .jpg files (VERY SLOW), if any rawrgb or rawyv12 are on it saves those formats instead, note that scr_screenshot_gammaboost affects the brightness of the output)"}; cvar_t cl_capturevideo_sound = {0, "cl_capturevideo_sound", "0", "enables saving of sound to a .wav file (warning: this requires exact sync, if your hard drive can't keep up it will abort, if your graphics can't keep up it will save duplicate frames to maintain sound sync)"}; cvar_t cl_capturevideo_fps = {0, "cl_capturevideo_fps", "30", "how many frames per second to save (29.97 for NTSC, 30 for typical PC video, 15 can be useful)"}; cvar_t cl_capturevideo_rawrgb = {0, "cl_capturevideo_rawrgb", "0", "saves a single .rgb video file containing raw RGB images (you'll need special processing tools to encode this to something more useful)"}; @@ -525,7 +525,7 @@ void CL_Screen_Init(void) Cvar_RegisterVariable (&vid_pixelheight); Cvar_RegisterVariable (&scr_screenshot_jpeg); Cvar_RegisterVariable (&scr_screenshot_jpeg_quality); - Cvar_RegisterVariable (&scr_screenshot_gamma); + Cvar_RegisterVariable (&scr_screenshot_gammaboost); Cvar_RegisterVariable (&cl_capturevideo); Cvar_RegisterVariable (&cl_capturevideo_sound); Cvar_RegisterVariable (&cl_capturevideo_fps); @@ -616,7 +616,7 @@ void SCR_CaptureVideo_BeginVideo(void) cls.capturevideo_soundrate = 0; cls.capturevideo_frame = 0; cls.capturevideo_buffer = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * (3+3+3) + 18); - gamma = 1.0/scr_screenshot_gamma.value; + gamma = 1.0/scr_screenshot_gammaboost.value; /* for (i = 0;i < 256;i++) @@ -1087,10 +1087,10 @@ qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *b qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer1); CHECKGLERROR - if (scr_screenshot_gamma.value != 1 && gammacorrect) + if (scr_screenshot_gammaboost.value != 1 && gammacorrect) { int i; - double igamma = 1.0 / scr_screenshot_gamma.value; + double igamma = 1.0 / scr_screenshot_gammaboost.value; unsigned char ramp[256]; for (i = 0;i < 256;i++) ramp[i] = (unsigned char) (pow(i * (1.0 / 255.0), igamma) * 255.0); diff --git a/cl_screen.h b/cl_screen.h index 8cb32d44..471a3645 100644 --- a/cl_screen.h +++ b/cl_screen.h @@ -12,7 +12,7 @@ extern cvar_t vid_conheight; extern cvar_t vid_pixelheight; extern cvar_t scr_screenshot_jpeg; extern cvar_t scr_screenshot_jpeg_quality; -extern cvar_t scr_screenshot_gamma; +extern cvar_t scr_screenshot_gammaboost; extern cvar_t scr_screenshot_name; void CL_Screen_NewMap(void); diff --git a/menu.c b/menu.c index 19f63f67..f3e3378e 100644 --- a/menu.c +++ b/menu.c @@ -1576,7 +1576,7 @@ static void M_Menu_Options_AdjustSliders (int dir) else if (options_cursor == optnum++) Cvar_SetValueQuick (&scr_screenshot_jpeg_quality, bound(0, scr_screenshot_jpeg_quality.value + dir * 0.1, 1)); else if (options_cursor == optnum++) - Cvar_SetValueQuick (&scr_screenshot_gamma, bound(0.1, scr_screenshot_gamma.value + dir * 0.1, 4)); + Cvar_SetValueQuick (&scr_screenshot_gammaboost, bound(0.1, scr_screenshot_gammaboost.value + dir * 0.1, 4)); else if (options_cursor == optnum++) Cvar_SetValueQuick (&r_sky, !r_sky.integer); else if (options_cursor == optnum++) @@ -1704,7 +1704,7 @@ static void M_Options_Draw (void) M_Options_PrintSlider( " Field of View", true, scr_fov.integer, 1, 170); M_Options_PrintCheckbox(" JPEG screenshots", jpeg_dll != NULL, scr_screenshot_jpeg.integer); M_Options_PrintSlider( " JPEG quality", jpeg_dll != NULL, scr_screenshot_jpeg_quality.value, 0, 1); - M_Options_PrintSlider( " Screenshot Gamma", jpeg_dll != NULL, scr_screenshot_gamma.value, 0.1, 4); + M_Options_PrintSlider( " Screenshot Gamma", jpeg_dll != NULL, scr_screenshot_gammaboost.value, 0.1, 4); M_Options_PrintCheckbox(" Sky", true, r_sky.integer); M_Options_PrintCheckbox(" Dithering", true, gl_dither.integer); M_Options_PrintSlider( "Anisotropic Filter", gl_support_anisotropy, gl_texture_anisotropy.integer, 1, gl_max_anisotropy); -- 2.39.2