X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=cl_screen.c;h=dc0418a19968096b6fdf22f8af521f61bf972817;hb=07c3a57d8ea2e9ecb5c0a98f99939d931e9f91d6;hp=f6d2eee210fa6bd65d4f903a369dea8913c05b83;hpb=4783df41f6ff0d12c21d4fb13dfb56447c4a8e7c;p=xonotic%2Fdarkplaces.git diff --git a/cl_screen.c b/cl_screen.c index f6d2eee2..dc0418a1 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -20,10 +20,12 @@ cvar_t vid_conheight = {CVAR_SAVE, "vid_conheight", "480"}; cvar_t vid_pixelaspect = {CVAR_SAVE, "vid_pixelaspect", "1"}; cvar_t scr_screenshot_jpeg = {CVAR_SAVE, "scr_screenshot_jpeg","0"}; cvar_t scr_screenshot_jpeg_quality = {CVAR_SAVE, "scr_screenshot_jpeg_quality","0.9"}; +cvar_t scr_screenshot_gamma = {CVAR_SAVE, "scr_screenshot_gamma","2.2"}; cvar_t scr_screenshot_name = {0, "scr_screenshot_name","dp"}; cvar_t cl_capturevideo = {0, "cl_capturevideo", "0"}; cvar_t cl_capturevideo_fps = {0, "cl_capturevideo_fps", "30"}; -cvar_t cl_capturevideo_raw = {0, "cl_capturevideo_raw", "0"}; +cvar_t cl_capturevideo_rawrgb = {0, "cl_capturevideo_rawrgb", "0"}; +cvar_t cl_capturevideo_rawyv12 = {0, "cl_capturevideo_rawyv12", "0"}; cvar_t r_textshadow = {0, "r_textshadow", "0"}; cvar_t r_letterbox = {0, "r_letterbox", "0"}; @@ -32,12 +34,9 @@ int jpeg_supported = false; qboolean scr_initialized; // ready to draw float scr_con_current; -float scr_conlines; // lines of console to display extern int con_vislines; -qboolean scr_drawloading = false; - void DrawCrosshair(int num); static void SCR_ScreenShot_f (void); static void R_Envmap_f (void); @@ -109,7 +108,7 @@ void SCR_DrawCenterString (void) do { // scan the width of the line - for (l=0 ; l<40 ; l++) + for (l=0 ; lwidth)/2, (vid.conheight - pic->height)/2, "gfx/loading.lmp", 0, 0, 1, 1, 1, 1, 0); -} - //============================================================================= @@ -247,6 +233,9 @@ SCR_SetUpToDrawConsole */ void SCR_SetUpToDrawConsole (void) { + // lines of console to display + float conlines; + Con_CheckResize (); if (key_dest == key_game && cls.signon != SIGNONS && scr_conforcewhiledisconnected.integer) @@ -255,31 +244,29 @@ void SCR_SetUpToDrawConsole (void) key_consoleactive &= ~KEY_CONSOLEACTIVE_FORCED; // decide on the height of the console - if (key_consoleactive & KEY_CONSOLEACTIVE_FORCED) - scr_conlines = vid.conheight; // full screen - else if (key_consoleactive & KEY_CONSOLEACTIVE_USER) - scr_conlines = vid.conheight/2; // half screen + if (key_consoleactive & KEY_CONSOLEACTIVE_USER) + conlines = vid.conheight/2; // half screen else - scr_conlines = 0; // none visible + conlines = 0; // none visible if (scr_conspeed.value) { - if (scr_conlines < scr_con_current) + if (scr_con_current > conlines) { scr_con_current -= scr_conspeed.value*host_realframetime; - if (scr_conlines > scr_con_current) - scr_con_current = scr_conlines; + if (scr_con_current < conlines) + scr_con_current = conlines; } - else if (scr_conlines > scr_con_current) + else if (scr_con_current < conlines) { scr_con_current += scr_conspeed.value*host_realframetime; - if (scr_conlines < scr_con_current) - scr_con_current = scr_conlines; + if (scr_con_current > conlines) + scr_con_current = conlines; } } else - scr_con_current = scr_conlines; + scr_con_current = conlines; } /* @@ -289,7 +276,12 @@ SCR_DrawConsole */ void SCR_DrawConsole (void) { - if (scr_con_current) + if (key_consoleactive & KEY_CONSOLEACTIVE_FORCED) + { + // full screen + Con_DrawConsole (vid.conheight); + } + else if (scr_con_current) Con_DrawConsole (scr_con_current); else { @@ -307,15 +299,8 @@ SCR_BeginLoadingPlaque */ void SCR_BeginLoadingPlaque (void) { - if (scr_drawloading) - return; - S_StopAllSounds (); - - scr_drawloading = true; - CL_UpdateScreen (); - scr_drawloading = true; - CL_UpdateScreen (); + SCR_UpdateLoadingScreen(); } //============================================================================= @@ -360,9 +345,6 @@ void R_TimeReport(char *desc) } } -extern int c_rt_lights, c_rt_clears, c_rt_scissored; -extern int c_rt_shadowmeshes, c_rt_shadowtris, c_rt_lightmeshes, c_rt_lighttris; -extern int c_rtcached_shadowmeshes, c_rtcached_shadowtris; void R_TimeReport_Start(void) { r_timereport_active = r_speeds.integer && cls.signon == SIGNONS && cls.state == ca_connected; @@ -370,23 +352,14 @@ void R_TimeReport_Start(void) if (r_timereport_active) { speedstringcount = 0; - sprintf(r_speeds_string, - "org:'%+8.2f %+8.2f %+8.2f' dir:'%+2.3f %+2.3f %+2.3f'\n" - "world:%6i faces%6i nodes%6i leafs%6i dlitwalls\n" - "%5i models%5i bmodels%5i sprites%6i particles%4i dlights\n" - "%6i modeltris%6i meshs%6i meshtris\n", - r_vieworigin[0], r_vieworigin[1], r_vieworigin[2], r_viewforward[0], r_viewforward[1], r_viewforward[2], - c_faces, c_nodes, c_leafs, c_light_polys, - c_models, c_bmodels, c_sprites, c_particles, c_dlights, - c_alias_polys, c_meshs, c_meshelements / 3); - - sprintf(r_speeds_string + strlen(r_speeds_string), - "realtime lighting:%4i lights%4i clears%4i scissored\n" - "dynamic: %6i shadowmeshes%6i shadowtris%6i lightmeshes%6i lighttris\n" - "precomputed: %6i shadowmeshes%6i shadowtris\n", - c_rt_lights, c_rt_clears, c_rt_scissored, - c_rt_shadowmeshes, c_rt_shadowtris, c_rt_lightmeshes, c_rt_lighttris, - c_rtcached_shadowmeshes, c_rtcached_shadowtris); + sprintf(r_speeds_string + strlen(r_speeds_string), "org:'%+8.2f %+8.2f %+8.2f' dir:'%+2.3f %+2.3f %+2.3f'\n", r_vieworigin[0], r_vieworigin[1], r_vieworigin[2], r_viewforward[0], r_viewforward[1], r_viewforward[2]); + sprintf(r_speeds_string + strlen(r_speeds_string), "world:%6i faces%6i nodes%6i leafs%6i dlitwalls\n", c_faces, c_nodes, c_leafs, c_light_polys); + sprintf(r_speeds_string + strlen(r_speeds_string), "%5i models%5i bmodels%5i sprites%6i particles%4i dlights\n", c_models, c_bmodels, c_sprites, c_particles, c_dlights); + sprintf(r_speeds_string + strlen(r_speeds_string), "%6i modeltris%6i meshs%6i meshtris\n", c_alias_polys, c_meshs, c_meshelements / 3); + sprintf(r_speeds_string + strlen(r_speeds_string), "bloom %s: %i copies (%i pixels) %i draws (%i pixels)\n", c_bloom ? "active" : "inactive", c_bloomcopies, c_bloomcopypixels, c_bloomdraws, c_bloomdrawpixels); + sprintf(r_speeds_string + strlen(r_speeds_string), "realtime lighting:%4i lights%4i clears%4i scissored\n", c_rt_lights, c_rt_clears, c_rt_scissored); + sprintf(r_speeds_string + strlen(r_speeds_string), "dynamic: %6i shadowmeshes%6i shadowtris%6i lightmeshes%6i lighttris\n", c_rt_shadowmeshes, c_rt_shadowtris, c_rt_lightmeshes, c_rt_lighttris); + sprintf(r_speeds_string + strlen(r_speeds_string), "precomputed: %6i shadowmeshes%6i shadowtris\n", c_rtcached_shadowmeshes, c_rtcached_shadowtris); c_alias_polys = 0; c_light_polys = 0; @@ -397,8 +370,23 @@ void R_TimeReport_Start(void) c_bmodels = 0; c_sprites = 0; c_particles = 0; + c_dlights = 0; c_meshs = 0; c_meshelements = 0; + c_rt_lights = 0; + c_rt_clears = 0; + c_rt_scissored = 0; + c_rt_shadowmeshes = 0; + c_rt_shadowtris = 0; + c_rt_lightmeshes = 0; + c_rt_lighttris = 0; + c_rtcached_shadowmeshes = 0; + c_rtcached_shadowtris = 0; + c_bloom = 0; + c_bloomcopies = 0; + c_bloomcopypixels = 0; + c_bloomdraws = 0; + c_bloomdrawpixels = 0; r_timereport_start = Sys_DoubleTime(); } @@ -476,9 +464,11 @@ void CL_Screen_Init(void) Cvar_RegisterVariable (&vid_pixelaspect); Cvar_RegisterVariable (&scr_screenshot_jpeg); Cvar_RegisterVariable (&scr_screenshot_jpeg_quality); + Cvar_RegisterVariable (&scr_screenshot_gamma); Cvar_RegisterVariable (&cl_capturevideo); Cvar_RegisterVariable (&cl_capturevideo_fps); - Cvar_RegisterVariable (&cl_capturevideo_raw); + Cvar_RegisterVariable (&cl_capturevideo_rawrgb); + Cvar_RegisterVariable (&cl_capturevideo_rawyv12); Cvar_RegisterVariable (&r_textshadow); Cvar_RegisterVariable (&r_letterbox); @@ -516,7 +506,7 @@ void DrawQ_String_Real(float x, float y, const char *string, int maxlen, float s for (;len > 0 && string[len - 1] == ' ';len--); if (len < 1) return; - if (x >= vid.conwidth || y >= vid.conheight || x < (-scalex * maxlen) || y < (-scaley)) + if (x >= vid.conwidth || y >= vid.conheight || x < (-scalex * len) || y < (-scaley)) return; size = sizeof(*dq) + ((len + 1 + 3) & ~3); if (r_refdef.drawqueuesize + size > r_refdef.maxdrawqueuesize) @@ -545,7 +535,7 @@ void DrawQ_String(float x, float y, const char *string, int maxlen, float scalex if (r_textshadow.integer) DrawQ_String_Real(x+scalex*0.25,y+scaley*0.25,string,maxlen,scalex,scaley,0,0,0,alpha*0.8,flags); - DrawQ_String_Real(x,y,string,maxlen,scalex,scaley,red,green,blue,alpha,flags); + DrawQ_String_Real(x,y,string,maxlen,scalex,scaley,red,green,blue,alpha,flags); } void DrawQ_Fill (float x, float y, float w, float h, float red, float green, float blue, float alpha, int flags) @@ -719,7 +709,8 @@ typedef enum capturevideoformat_e { CAPTUREVIDEOFORMAT_TARGA, CAPTUREVIDEOFORMAT_JPEG, - CAPTUREVIDEOFORMAT_RAW + CAPTUREVIDEOFORMAT_RAWRGB, + CAPTUREVIDEOFORMAT_RAWYV12 } capturevideoformat_t; @@ -732,9 +723,14 @@ static int cl_capturevideo_frame = 0; static qbyte *cl_capturevideo_buffer = NULL; static qfile_t *cl_capturevideo_videofile = NULL; static qfile_t *cl_capturevideo_soundfile = NULL; +static short cl_capturevideo_rgbtoyuvscaletable[3][3][256]; +static unsigned char cl_capturevideo_yuvnormalizetable[3][256]; +//static unsigned char cl_capturevideo_rgbgammatable[3][256]; void SCR_CaptureVideo_BeginVideo(void) { + double gamma, g; + unsigned int i; qbyte out[44]; if (cl_capturevideo_active) return; @@ -745,11 +741,55 @@ void SCR_CaptureVideo_BeginVideo(void) cl_capturevideo_soundrate = 0; cl_capturevideo_frame = 0; cl_capturevideo_buffer = Mem_Alloc(tempmempool, vid.realwidth * vid.realheight * (3+3+3) + 18); + gamma = 1.0/scr_screenshot_gamma.value; + + /* + for (i = 0;i < 256;i++) + { + unsigned char j = (unsigned char)bound(0, 255*pow(i/255.0, gamma), 255); + cl_capturevideo_rgbgammatable[0][i] = j; + cl_capturevideo_rgbgammatable[1][i] = j; + cl_capturevideo_rgbgammatable[2][i] = j; + } + */ +/* +R = Y + 1.4075 * (Cr - 128); +G = Y + -0.3455 * (Cb - 128) + -0.7169 * (Cr - 128); +B = Y + 1.7790 * (Cb - 128); +Y = R * .299 + G * .587 + B * .114; +Cb = R * -.169 + G * -.332 + B * .500 + 128.; +Cr = R * .500 + G * -.419 + B * -.0813 + 128.; +*/ + for (i = 0;i < 256;i++) + { + g = 255*pow(i/255.0, gamma); + // Y weights from RGB + cl_capturevideo_rgbtoyuvscaletable[0][0][i] = (short)(g * 0.299); + cl_capturevideo_rgbtoyuvscaletable[0][1][i] = (short)(g * 0.587); + cl_capturevideo_rgbtoyuvscaletable[0][2][i] = (short)(g * 0.114); + // Cb weights from RGB + cl_capturevideo_rgbtoyuvscaletable[1][0][i] = (short)(g * -0.169); + cl_capturevideo_rgbtoyuvscaletable[1][1][i] = (short)(g * -0.332); + cl_capturevideo_rgbtoyuvscaletable[1][2][i] = (short)(g * 0.500); + // Cr weights from RGB + cl_capturevideo_rgbtoyuvscaletable[2][0][i] = (short)(g * 0.500); + cl_capturevideo_rgbtoyuvscaletable[2][1][i] = (short)(g * -0.419); + cl_capturevideo_rgbtoyuvscaletable[2][2][i] = (short)(g * -0.0813); + // range reduction of YCbCr to valid signal range + cl_capturevideo_yuvnormalizetable[0][i] = 16 + i * (236-16) / 256; + cl_capturevideo_yuvnormalizetable[1][i] = 16 + i * (240-16) / 256; + cl_capturevideo_yuvnormalizetable[2][i] = 16 + i * (240-16) / 256; + } - if (cl_capturevideo_raw.integer) + if (cl_capturevideo_rawrgb.integer) + { + cl_capturevideo_format = CAPTUREVIDEOFORMAT_RAWRGB; + cl_capturevideo_videofile = FS_Open ("video/dpvideo.rgb", "wb", false, true); + } + else if (cl_capturevideo_rawyv12.integer) { - cl_capturevideo_format = CAPTUREVIDEOFORMAT_RAW; - cl_capturevideo_videofile = FS_Open ("video/dpvideo.rgb", "wb", false); + cl_capturevideo_format = CAPTUREVIDEOFORMAT_RAWYV12; + cl_capturevideo_videofile = FS_Open ("video/dpvideo.yv12", "wb", false, true); } else if (scr_screenshot_jpeg.integer) { @@ -762,7 +802,7 @@ void SCR_CaptureVideo_BeginVideo(void) cl_capturevideo_videofile = NULL; } - cl_capturevideo_soundfile = FS_Open ("video/dpvideo.wav", "wb", false); + cl_capturevideo_soundfile = FS_Open ("video/dpvideo.wav", "wb", false, true); // wave header will be filled out when video ends memset(out, 0, 44); @@ -832,25 +872,76 @@ void SCR_CaptureVideo_EndVideo(void) cl_capturevideo_frame = 0; } -qboolean SCR_CaptureVideo_VideoFrame(void) +qboolean SCR_CaptureVideo_VideoFrame(int newframenum) { int x = vid.realx, y = vid.realy, width = vid.realwidth, height = vid.realheight; + unsigned char *b, *out; char filename[32]; + int outoffset = (width/2)*(height/2); //return SCR_ScreenShot(filename, cl_capturevideo_buffer, cl_capturevideo_buffer + vid.realwidth * vid.realheight * 3, cl_capturevideo_buffer + vid.realwidth * vid.realheight * 6, vid.realx, vid.realy, vid.realwidth, vid.realheight, false, false, false, jpeg); // speed is critical here, so do saving as directly as possible - if (!r_render.integer) - return false; switch (cl_capturevideo_format) { - case CAPTUREVIDEOFORMAT_RAW: + case CAPTUREVIDEOFORMAT_RAWYV12: + // FIXME: width/height must be multiple of 2, enforce this? qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, cl_capturevideo_buffer); CHECKGLERROR - return FS_Write (cl_capturevideo_videofile, cl_capturevideo_buffer, width*height*3); + // process one line at a time, and CbCr every other line at 2 pixel intervals + for (y = 0;y < height;y++) + { + // 1x1 Y + for (b = cl_capturevideo_buffer + (height-1-y)*width*3, out = cl_capturevideo_buffer + width*height*3 + y*width, x = 0;x < width;x++, b += 3, out++) + *out = cl_capturevideo_yuvnormalizetable[0][cl_capturevideo_rgbtoyuvscaletable[0][0][b[0]] + cl_capturevideo_rgbtoyuvscaletable[0][1][b[1]] + cl_capturevideo_rgbtoyuvscaletable[0][2][b[2]]]; + if ((y & 1) == 0) + { + // 2x2 Cb and Cr planes +#if 1 + // low quality, no averaging + for (b = cl_capturevideo_buffer + (height-2-y)*width*3, out = cl_capturevideo_buffer + width*height*3 + width*height + (y/2)*(width/2), x = 0;x < width/2;x++, b += 6, out++) + { + // Cr + out[0 ] = cl_capturevideo_yuvnormalizetable[2][cl_capturevideo_rgbtoyuvscaletable[2][0][b[0]] + cl_capturevideo_rgbtoyuvscaletable[2][1][b[1]] + cl_capturevideo_rgbtoyuvscaletable[2][2][b[2]] + 128]; + // Cb + out[outoffset] = cl_capturevideo_yuvnormalizetable[1][cl_capturevideo_rgbtoyuvscaletable[1][0][b[0]] + cl_capturevideo_rgbtoyuvscaletable[1][1][b[1]] + cl_capturevideo_rgbtoyuvscaletable[1][2][b[2]] + 128]; + } +#else + // high quality, averaging + int inpitch = width*3; + for (b = cl_capturevideo_buffer + (height-2-y)*width*3, out = cl_capturevideo_buffer + width*height*3 + width*height + (y/2)*(width/2), x = 0;x < width/2;x++, b += 6, out++) + { + int blockr, blockg, blockb; + blockr = (b[0] + b[3] + b[inpitch+0] + b[inpitch+3]) >> 2; + blockg = (b[1] + b[4] + b[inpitch+1] + b[inpitch+4]) >> 2; + blockb = (b[2] + b[5] + b[inpitch+2] + b[inpitch+5]) >> 2; + // Cr + out[0 ] = cl_capturevideo_yuvnormalizetable[2][cl_capturevideo_rgbtoyuvscaletable[2][0][blockr] + cl_capturevideo_rgbtoyuvscaletable[2][1][blockg] + cl_capturevideo_rgbtoyuvscaletable[2][2][blockb] + 128]; + // Cb + out[outoffset] = cl_capturevideo_yuvnormalizetable[1][cl_capturevideo_rgbtoyuvscaletable[1][0][blockr] + cl_capturevideo_rgbtoyuvscaletable[1][1][blockg] + cl_capturevideo_rgbtoyuvscaletable[1][2][blockb] + 128]; + } +#endif + } + } + for (;cl_capturevideo_frame < newframenum;cl_capturevideo_frame++) + if (!FS_Write (cl_capturevideo_videofile, cl_capturevideo_buffer + width*height*3, width*height+(width/2)*(height/2)*2)) + return false; + return true; + case CAPTUREVIDEOFORMAT_RAWRGB: + qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, cl_capturevideo_buffer); + CHECKGLERROR + for (;cl_capturevideo_frame < newframenum;cl_capturevideo_frame++) + if (!FS_Write (cl_capturevideo_videofile, cl_capturevideo_buffer, width*height*3)) + return false; + return true; case CAPTUREVIDEOFORMAT_JPEG: - sprintf(filename, "video/dp%06d.jpg", cl_capturevideo_frame); qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, cl_capturevideo_buffer); CHECKGLERROR - return JPEG_SaveImage_preflipped (filename, width, height, cl_capturevideo_buffer); + for (;cl_capturevideo_frame < newframenum;cl_capturevideo_frame++) + { + sprintf(filename, "video/dp%06d.jpg", cl_capturevideo_frame); + if (!JPEG_SaveImage_preflipped (filename, width, height, cl_capturevideo_buffer)) + return false; + } + return true; case CAPTUREVIDEOFORMAT_TARGA: //return Image_WriteTGARGB_preflipped (filename, width, height, cl_capturevideo_buffer, cl_capturevideo_buffer + vid.realwidth * vid.realheight * 3, ); memset (cl_capturevideo_buffer, 0, 18); @@ -862,8 +953,13 @@ qboolean SCR_CaptureVideo_VideoFrame(void) cl_capturevideo_buffer[16] = 24; // pixel size qglReadPixels (x, y, width, height, GL_BGR, GL_UNSIGNED_BYTE, cl_capturevideo_buffer + 18); CHECKGLERROR - sprintf(filename, "video/dp%06d.tga", cl_capturevideo_frame); - return FS_WriteFile (filename, cl_capturevideo_buffer, width*height*3 + 18); + for (;cl_capturevideo_frame < newframenum;cl_capturevideo_frame++) + { + sprintf(filename, "video/dp%06d.tga", cl_capturevideo_frame); + if (!FS_WriteFile (filename, cl_capturevideo_buffer, width*height*3 + 18)) + return false; + } + return true; default: return false; } @@ -882,8 +978,8 @@ void SCR_CaptureVideo_SoundFrame(qbyte *bufstereo16le, size_t length, int rate) void SCR_CaptureVideo(void) { - int newframenum, c; - if (cl_capturevideo.integer) + int newframenum; + if (cl_capturevideo.integer && r_render.integer) { if (!cl_capturevideo_active) SCR_CaptureVideo_BeginVideo(); @@ -893,21 +989,20 @@ void SCR_CaptureVideo(void) Cvar_SetValueQuick(&cl_capturevideo_fps, cl_capturevideo_framerate); } newframenum = (Sys_DoubleTime() - cl_capturevideo_starttime) * cl_capturevideo_framerate; - c = (int)ceil(cl_capturevideo_framerate); - while (cl_capturevideo_frame < newframenum) + // if falling behind more than one second, stop + if (newframenum - cl_capturevideo_frame > (int)ceil(cl_capturevideo_framerate)) { - if ((c--) && SCR_CaptureVideo_VideoFrame()) - cl_capturevideo_frame++; - else - { - Cvar_SetValueQuick(&cl_capturevideo, 0); - if (c == 0) - Con_Printf("video saving failed on frame %i, your machine is too slow for this capture speed.\n", cl_capturevideo_frame); - else - Con_Printf("video saving failed on frame %i, out of disk space? stopping video capture.\n", cl_capturevideo_frame); - SCR_CaptureVideo_EndVideo(); - break; - } + Cvar_SetValueQuick(&cl_capturevideo, 0); + Con_Printf("video saving failed on frame %i, your machine is too slow for this capture speed.\n", cl_capturevideo_frame); + SCR_CaptureVideo_EndVideo(); + return; + } + // write frames + if (!SCR_CaptureVideo_VideoFrame(newframenum)) + { + Cvar_SetValueQuick(&cl_capturevideo, 0); + Con_Printf("video saving failed on frame %i, out of disk space? stopping video capture.\n", cl_capturevideo_frame); + SCR_CaptureVideo_EndVideo(); } } else if (cl_capturevideo_active) @@ -1121,6 +1216,44 @@ void CL_UpdateScreen(void) if (!scr_initialized || !con_initialized || vid_hidden) return; // not initialized yet + // don't allow cheats in multiplayer + if (!cl.islocalgame && cl.worldmodel) + { + if (r_fullbright.integer != 0) + Cvar_Set ("r_fullbright", "0"); + if (r_ambient.value != 0) + Cvar_Set ("r_ambient", "0"); + } + + // bound viewsize + if (scr_viewsize.value < 30) + Cvar_Set ("viewsize","30"); + if (scr_viewsize.value > 120) + Cvar_Set ("viewsize","120"); + + // bound field of view + if (scr_fov.value < 1) + Cvar_Set ("fov","1"); + if (scr_fov.value > 170) + Cvar_Set ("fov","170"); + + // intermission is always full screen + if (cl.intermission) + sb_lines = 0; + else + { + if (scr_viewsize.value >= 120) + sb_lines = 0; // no status bar at all + else if (scr_viewsize.value >= 110) + sb_lines = 24; // no inventory + else + sb_lines = 24+16+8; + } + + r_refdef.colormask[0] = 1; + r_refdef.colormask[1] = 1; + r_refdef.colormask[2] = 1; + SCR_CaptureVideo(); if (cls.signon == SIGNONS) @@ -1136,35 +1269,28 @@ void CL_UpdateScreen(void) //FIXME: force menu if nothing else to look at? //if (key_dest == key_game && cls.signon != SIGNONS && cls.state == ca_disconnected) - if (scr_drawloading) + if (cls.signon == SIGNONS) { - scr_drawloading = false; - SCR_DrawLoading(); + SCR_DrawNet (); + SCR_DrawTurtle (); + SCR_DrawPause (); + if (!r_letterbox.value) + Sbar_Draw(); + SHOWLMP_drawall(); + SCR_CheckDrawCenterString(); } - else + MR_Draw(); + UI_Callback_Draw(); + CL_DrawVideo(); + //ui_draw(); + if (cls.signon == SIGNONS) { - if (cls.signon == SIGNONS) - { - SCR_DrawNet (); - SCR_DrawTurtle (); - SCR_DrawPause (); - if (!r_letterbox.value) - Sbar_Draw(); - SHOWLMP_drawall(); - SCR_CheckDrawCenterString(); - } - MR_Draw(); - UI_Callback_Draw(); - CL_DrawVideo(); - //ui_draw(); - if (cls.signon == SIGNONS) - { - R_TimeReport("2d"); - R_TimeReport_End(); - R_TimeReport_Start(); - } - R_Shadow_EditLights_DrawSelectedLightProperties(); + R_TimeReport("2d"); + R_TimeReport_End(); + R_TimeReport_Start(); } + R_Shadow_EditLights_DrawSelectedLightProperties(); + SCR_DrawConsole(); SCR_UpdateScreen();