X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_screen.c;h=ab1d4f2ca8a6915763146842f7c892f68f5eac14;hp=5da743c7032ca6ba66ea2b4e52bb0d6d73022674;hb=f4f603c440bc0a0a2dcb774fdcb93dd9ac7df9f9;hpb=2c4a8ba43fb2cbbda7f4393176b354749bb8f35d diff --git a/cl_screen.c b/cl_screen.c index 5da743c7..ab1d4f2c 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -6,6 +6,8 @@ #include "cl_collision.h" #include "libcurl.h" #include "csprogs.h" +#include "cap_avi.h" +#include "cap_ogg.h" // we have to include snd_main.h here only to get access to snd_renderbuffer->format.speed when writing the AVI headers #include "snd_main.h" @@ -28,13 +30,18 @@ cvar_t vid_pixelheight = {CVAR_SAVE, "vid_pixelheight", "1", "adjusts vertical f 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_gammaboost = {CVAR_SAVE, "scr_screenshot_gammaboost","1", "gamma correction on saved screenshots and videos, 1.0 saves unmodified images"}; +cvar_t scr_screenshot_hwgamma = {CVAR_SAVE, "scr_screenshot_hwgamma","1", "apply the video gamma ramp to saved screenshots and videos"}; // scr_screenshot_name is defined in fs.c cvar_t cl_capturevideo = {0, "cl_capturevideo", "0", "enables saving of video to a .avi file using uncompressed I420 colorspace and PCM audio, note that scr_screenshot_gammaboost affects the brightness of the output)"}; -cvar_t cl_capturevideo_width = {0, "cl_capturevideo_width", "0", "scales all frames to this resolution before saving the video"}; -cvar_t cl_capturevideo_height = {0, "cl_capturevideo_height", "0", "scales all frames to this resolution before saving the video"}; -cvar_t cl_capturevideo_realtime = {0, "cl_capturevideo_realtime", "0", "causes video saving to operate in realtime (mostly useful while playing, not while capturing demos), this can produce a much lower quality video due to poor sound/video sync and will abort saving if your machine stalls for over 1 second"}; -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_printfps = {CVAR_SAVE, "cl_capturevideo_printfps", "1", "prints the frames per second captured in capturevideo (is only written to the log file, not to the console, as that would be visible on the video)"}; +cvar_t cl_capturevideo_width = {CVAR_SAVE, "cl_capturevideo_width", "0", "scales all frames to this resolution before saving the video"}; +cvar_t cl_capturevideo_height = {CVAR_SAVE, "cl_capturevideo_height", "0", "scales all frames to this resolution before saving the video"}; +cvar_t cl_capturevideo_realtime = {0, "cl_capturevideo_realtime", "0", "causes video saving to operate in realtime (mostly useful while playing, not while capturing demos), this can produce a much lower quality video due to poor sound/video sync and will abort saving if your machine stalls for over a minute"}; +cvar_t cl_capturevideo_fps = {CVAR_SAVE, "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_nameformat = {CVAR_SAVE, "cl_capturevideo_nameformat", "dpvideo", "prefix for saved videos (the date is encoded using strftime escapes)"}; cvar_t cl_capturevideo_number = {CVAR_SAVE, "cl_capturevideo_number", "1", "number to append to video filename, incremented each time a capture begins"}; +cvar_t cl_capturevideo_ogg = {CVAR_SAVE, "cl_capturevideo_ogg", "1", "save captured video data as Ogg/Vorbis/Theora streams"}; +cvar_t cl_capturevideo_framestep = {CVAR_SAVE, "cl_capturevideo_framestep", "1", "when set to n >= 1, render n frames to capture one (useful for motion blur like effects)"}; cvar_t r_letterbox = {0, "r_letterbox", "0", "reduces vertical height of view to simulate a letterboxed movie effect (can be used by mods for cutscenes)"}; cvar_t r_stereo_separation = {0, "r_stereo_separation", "4", "separation distance of eyes in the world (negative values are only useful for cross-eyed viewing)"}; cvar_t r_stereo_sidebyside = {0, "r_stereo_sidebyside", "0", "side by side views for those who can't afford glasses but can afford eye strain (note: use a negative r_stereo_separation if you want cross-eyed viewing)"}; @@ -48,15 +55,21 @@ cvar_t scr_zoomwindow_viewsizey = {CVAR_SAVE, "scr_zoomwindow_viewsizey", "20", cvar_t scr_zoomwindow_fov = {CVAR_SAVE, "scr_zoomwindow_fov", "20", "fov of zoom window"}; cvar_t scr_stipple = {0, "scr_stipple", "0", "interlacing-like stippling of the display"}; cvar_t scr_refresh = {0, "scr_refresh", "1", "allows you to completely shut off rendering for benchmarking purposes"}; +cvar_t scr_screenshot_name_in_mapdir = {CVAR_SAVE, "scr_screenshot_name_in_mapdir", "0", "if set to 1, screenshots are placed in a subdirectory named like the map they are from"}; cvar_t shownetgraph = {CVAR_SAVE, "shownetgraph", "0", "shows a graph of packet sizes and other information, 0 = off, 1 = show client netgraph, 2 = show client and server netgraphs (when hosting a server)"}; +cvar_t cl_demo_mousegrab = {0, "cl_demo_mousegrab", "0", "Allows reading the mouse input while playing demos. Useful for camera mods developed in csqc. (0: never, 1: always)"}; -#define AVI_MASTER_INDEX_SIZE 640 // GB ought to be enough for anyone +extern cvar_t r_glsl; +extern cvar_t v_glslgamma; +extern cvar_t sbar_info_pos; +#define WANT_SCREENSHOT_HWGAMMA (scr_screenshot_hwgamma.integer && vid_usinghwgamma) int jpeg_supported = false; qboolean scr_initialized; // ready to draw float scr_con_current; +int scr_con_margin_bottom; extern int con_vislines; @@ -64,7 +77,7 @@ static void SCR_ScreenShot_f (void); static void R_Envmap_f (void); // backend -void R_ClearScreen(void); +void R_ClearScreen(qboolean fogcolor); /* =============================================================================== @@ -80,6 +93,8 @@ float scr_centertime_off; int scr_center_lines; int scr_erase_lines; int scr_erase_center; +char scr_infobarstring[MAX_INPUTLINE]; +float scr_infobartime_off; /* ============== @@ -89,7 +104,7 @@ Called for important messages that should stay in the center of the screen for a few moments ============== */ -void SCR_CenterPrint(char *str) +void SCR_CenterPrint(const char *str) { strlcpy (scr_centerstring, str, sizeof (scr_centerstring)); scr_centertime_off = scr_centertime.value; @@ -117,6 +132,9 @@ void SCR_DrawCenterString (void) if(sb_showscores) // make TAB hide the finale message (sb_showscores overrides finale in sbar.c) return; + if(scr_centertime.value <= 0 && !cl.intermission) + return; + // the finale prints the characters one at a time, except if printspeed is an absurdly high value if (cl.intermission && scr_printspeed.value > 0 && scr_printspeed.value < 1000000) remaining = (int)(scr_printspeed.value * (cl.time - scr_centertime_start)); @@ -140,14 +158,14 @@ void SCR_DrawCenterString (void) // scan the number of characters on the line, not counting color codes char *newline = strchr(start, '\n'); int l = newline ? (newline - start) : (int)strlen(start); - int chars = COM_StringLengthNoColors(start, l, NULL); + float width = DrawQ_TextWidth_Font(start, l, false, FONT_CENTERPRINT) * 8; - x = (vid_conwidth.integer - chars*8)/2; + x = (int) (vid_conwidth.integer - width)/2; if (l > 0) { if (remaining < l) l = remaining; - DrawQ_String(x, y, start, l, 8, 8, 1, 1, 1, 1, 0, &color, false); + DrawQ_String_Font(x, y, start, l, 8, 8, 1, 1, 1, 1, 0, &color, false, FONT_CENTERPRINT); remaining -= l; if (remaining <= 0) return; @@ -180,86 +198,67 @@ void SCR_CheckDrawCenterString (void) SCR_DrawCenterString (); } -void SCR_DrawNetGraph_DrawGraph (int graphx, int graphy, int barwidth, int barheight, int bardivide, const char *label, float textsize, int packetcounter, int numparameters, const int **parameters, const float parametercolors[][4]) +void SCR_DrawNetGraph_DrawGraph (int graphx, int graphy, int graphwidth, int graphheight, float graphscale, const char *label, float textsize, int packetcounter, netgraphitem_t *netgraph) { - int j, k, x, y, index, offset, height; + netgraphitem_t *graph; + int j, x, y; + int totalbytes = 0; + char bytesstring[128]; + float g[NETGRAPH_PACKETS][6]; + float *a; + float *b; + DrawQ_Fill(graphx, graphy, graphwidth, graphheight + textsize * 2, 0, 0, 0, 0.5, 0); // draw the bar graph itself // advance the packet counter because it is the latest packet column being // built up and should come last packetcounter = (packetcounter + 1) % NETGRAPH_PACKETS; + memset(g, 0, sizeof(g)); for (j = 0;j < NETGRAPH_PACKETS;j++) { - x = graphx + j * barwidth; - y = graphy + barheight; - index = (packetcounter + j) % NETGRAPH_PACKETS; - if (parameters[0][index] == NETGRAPH_LOSTPACKET) - DrawQ_Fill(x, y - barheight, barwidth, barheight, 1, 0, 0, 1, 0); - else if (parameters[0][index] == NETGRAPH_CHOKEDPACKET) - DrawQ_Fill(x, y - min(2, barheight), barwidth, min(2, barheight), 1, 1, 0, 1, 0); + graph = netgraph + j; + g[j][0] = 1.0f - 0.25f * (realtime - graph->time); + g[j][1] = 1.0f; + g[j][2] = 1.0f; + g[j][3] = 1.0f; + g[j][4] = 1.0f; + g[j][5] = 1.0f; + if (graph->unreliablebytes == NETGRAPH_LOSTPACKET) + g[j][1] = 0.00f; + else if (graph->unreliablebytes == NETGRAPH_CHOKEDPACKET) + g[j][2] = 0.96f; else { - offset = 0; - for (k = 0;k < numparameters;k++) - { - height = (parameters[k][index] + bardivide - 1) / bardivide; - height = min(height, barheight - offset); - offset += height; - if (height) - DrawQ_Fill(x, y - offset, barwidth, height, parametercolors[k][0], parametercolors[k][1], parametercolors[k][2], parametercolors[k][3], 0); - } + g[j][3] = 1.0f - graph->unreliablebytes * graphscale; + g[j][4] = g[j][3] - graph->reliablebytes * graphscale; + g[j][5] = g[j][4] - graph->ackbytes * graphscale; + // count bytes in the last second + if (realtime - graph->time < 1.0f) + totalbytes += graph->unreliablebytes + graph->reliablebytes + graph->ackbytes; } + g[j][1] = bound(0.0f, g[j][1], 1.0f); + g[j][2] = bound(0.0f, g[j][2], 1.0f); + g[j][3] = bound(0.0f, g[j][3], 1.0f); + g[j][4] = bound(0.0f, g[j][4], 1.0f); + g[j][5] = bound(0.0f, g[j][5], 1.0f); } -} - -const float netgraphcolors[3][4] = -{ - {1 , 0.5, 0 , 1}, - {1 , 1 , 1 , 1}, - {0 , 1 , 0 , 1}, -}; - -void SCR_DrawNetGraph_DrawConnection_Client (netconn_t *conn, int graphx, int graphy, int barwidth, int barheight, int bardivide, const char *labelincoming, int separator, const char *labeloutgoing, float textsize) -{ - int numparameters; - const int *parameters[3]; - // dim background - DrawQ_Fill(graphx , graphy, barwidth * NETGRAPH_PACKETS, barheight + textsize, 0, 0, 0, 0.5, 0); - DrawQ_Fill(graphx + barwidth * NETGRAPH_PACKETS + separator, graphy, barwidth * NETGRAPH_PACKETS, barheight + textsize, 0, 0, 0, 0.5, 0); - // draw the bar graphs - numparameters = 3; - parameters[0] = conn->incoming_unreliablesize; - parameters[1] = conn->incoming_reliablesize; - parameters[2] = conn->incoming_acksize; - SCR_DrawNetGraph_DrawGraph(graphx, graphy, barwidth, barheight, bardivide, labelincoming, textsize, conn->incoming_packetcounter, numparameters, parameters, netgraphcolors); - parameters[0] = conn->outgoing_unreliablesize; - parameters[1] = conn->outgoing_reliablesize; - parameters[2] = conn->outgoing_acksize; - SCR_DrawNetGraph_DrawGraph(graphx + barwidth * NETGRAPH_PACKETS + separator, graphy, barwidth, barheight, bardivide, labeloutgoing, textsize, conn->outgoing_packetcounter, numparameters, parameters, netgraphcolors); - // draw labels - DrawQ_String(graphx , graphy + barheight, labelincoming, 0, textsize, textsize, 1, 1, 1, 1, 0, NULL, false); - DrawQ_String(graphx + barwidth * NETGRAPH_PACKETS + separator, graphy + barheight, labeloutgoing, 0, textsize, textsize, 1, 1, 1, 1, 0, NULL, false); -} - -void SCR_DrawNetGraph_DrawConnection_Server (netconn_t *conn, int graphx, int graphy, int barwidth, int barheight, int bardivide, const char *labeloutgoing, int separator, const char *labelincoming, float textsize) -{ - int numparameters; - const int *parameters[3]; - // dim background - DrawQ_Fill(graphx , graphy, barwidth * NETGRAPH_PACKETS, barheight + textsize, 0, 0, 0, 0.5, 0); - DrawQ_Fill(graphx + barwidth * NETGRAPH_PACKETS + separator, graphy, barwidth * NETGRAPH_PACKETS, barheight + textsize, 0, 0, 0, 0.5, 0); - // draw the bar graphs - numparameters = 3; - parameters[0] = conn->outgoing_unreliablesize; - parameters[1] = conn->outgoing_reliablesize; - parameters[2] = conn->outgoing_acksize; - SCR_DrawNetGraph_DrawGraph(graphx , graphy, barwidth, barheight, bardivide, labeloutgoing, textsize, conn->outgoing_packetcounter, numparameters, parameters, netgraphcolors); - parameters[0] = conn->incoming_unreliablesize; - parameters[1] = conn->incoming_reliablesize; - parameters[2] = conn->incoming_acksize; - SCR_DrawNetGraph_DrawGraph(graphx + barwidth * NETGRAPH_PACKETS + separator, graphy, barwidth, barheight, bardivide, labelincoming, textsize, conn->incoming_packetcounter, numparameters, parameters, netgraphcolors); - // draw labels - DrawQ_String(graphx , graphy + barheight, labeloutgoing, 0, textsize, textsize, 1, 1, 1, 1, 0, NULL, false); - DrawQ_String(graphx + barwidth * NETGRAPH_PACKETS + separator, graphy + barheight, labelincoming, 0, textsize, textsize, 1, 1, 1, 1, 0, NULL, false); + // render the lines for the graph + for (j = 0;j < NETGRAPH_PACKETS;j++) + { + a = g[j]; + b = g[(j+1)%NETGRAPH_PACKETS]; + if (a[0] < 0.0f || b[0] > 1.0f || b[0] < a[0]) + continue; + DrawQ_Line(0.0f, graphx + graphwidth * a[0], graphy + graphheight * a[2], graphx + graphwidth * b[0], graphy + graphheight * b[2], 1.0f, 1.0f, 0.0f, 1.0f, 0); + DrawQ_Line(0.0f, graphx + graphwidth * a[0], graphy + graphheight * a[1], graphx + graphwidth * b[0], graphy + graphheight * b[1], 1.0f, 0.0f, 0.0f, 1.0f, 0); + DrawQ_Line(0.0f, graphx + graphwidth * a[0], graphy + graphheight * a[5], graphx + graphwidth * b[0], graphy + graphheight * b[5], 0.0f, 1.0f, 0.0f, 1.0f, 0); + DrawQ_Line(0.0f, graphx + graphwidth * a[0], graphy + graphheight * a[4], graphx + graphwidth * b[0], graphy + graphheight * b[4], 1.0f, 1.0f, 1.0f, 1.0f, 0); + DrawQ_Line(0.0f, graphx + graphwidth * a[0], graphy + graphheight * a[3], graphx + graphwidth * b[0], graphy + graphheight * b[3], 1.0f, 0.5f, 0.0f, 1.0f, 0); + } + x = graphx; + y = graphy + graphheight; + dpsnprintf(bytesstring, sizeof(bytesstring), "%i", totalbytes); + DrawQ_String(x, y, label , 0, textsize, textsize, 1.0f, 1.0f, 1.0f, 1.0f, 0, NULL, false);y += textsize; + DrawQ_String(x, y, bytesstring, 0, textsize, textsize, 1.0f, 1.0f, 1.0f, 1.0f, 0, NULL, false);y += textsize; } /* @@ -269,7 +268,9 @@ SCR_DrawNetGraph */ void SCR_DrawNetGraph (void) { - int i, separator1, separator2, barwidth, barheight, bardivide, netgraph_x, netgraph_y, textsize, index, netgraphsperrow; + int i, separator1, separator2, graphwidth, graphheight, netgraph_x, netgraph_y, textsize, index, netgraphsperrow; + float graphscale; + netconn_t *c; if (cls.state != ca_connected) return; @@ -281,28 +282,32 @@ void SCR_DrawNetGraph (void) separator1 = 2; separator2 = 4; textsize = 8; - barwidth = 1; - barheight = 50; - bardivide = 20; + graphwidth = 120; + graphheight = 70; + graphscale = 1.0f / 1500.0f; - netgraphsperrow = (vid_conwidth.integer + separator2) / (barwidth * NETGRAPH_PACKETS * 2 + separator1 + separator2); + netgraphsperrow = (vid_conwidth.integer + separator2) / (graphwidth * 2 + separator1 + separator2); netgraphsperrow = max(netgraphsperrow, 1); index = 0; - netgraph_x = (vid_conwidth.integer + separator2) - (1 + (index % netgraphsperrow)) * (barwidth * NETGRAPH_PACKETS * 2 + separator1 + separator2); - netgraph_y = (vid_conheight.integer - 48 + separator2) - (1 + (index / netgraphsperrow)) * (barheight + textsize + separator2); - SCR_DrawNetGraph_DrawConnection_Client(cls.netcon, netgraph_x, netgraph_y, barwidth, barheight, bardivide, "incoming", separator1, "outgoing", textsize); + netgraph_x = (vid_conwidth.integer + separator2) - (1 + (index % netgraphsperrow)) * (graphwidth * 2 + separator1 + separator2); + netgraph_y = (vid_conheight.integer - 48 - sbar_info_pos.integer + separator2) - (1 + (index / netgraphsperrow)) * (graphheight + textsize + separator2); + c = cls.netcon; + SCR_DrawNetGraph_DrawGraph(netgraph_x , netgraph_y, graphwidth, graphheight, graphscale, "incoming", textsize, c->incoming_packetcounter, c->incoming_netgraph); + SCR_DrawNetGraph_DrawGraph(netgraph_x + graphwidth + separator1, netgraph_y, graphwidth, graphheight, graphscale, "outgoing", textsize, c->outgoing_packetcounter, c->outgoing_netgraph); index++; if (sv.active && shownetgraph.integer >= 2) { for (i = 0;i < svs.maxclients;i++) { - if (!svs.clients[i].netconnection) + c = svs.clients[i].netconnection; + if (!c) continue; - netgraph_x = (vid_conwidth.integer + separator2) - (1 + (index % netgraphsperrow)) * (barwidth * NETGRAPH_PACKETS * 2 + separator1 + separator2); - netgraph_y = (vid_conheight.integer - 48 + separator2) - (1 + (index / netgraphsperrow)) * (barheight + textsize + separator2); - SCR_DrawNetGraph_DrawConnection_Server(svs.clients[i].netconnection, netgraph_x, netgraph_y, barwidth, barheight, bardivide, va("%s", svs.clients[i].name), separator1, "", textsize); + netgraph_x = (vid_conwidth.integer + separator2) - (1 + (index % netgraphsperrow)) * (graphwidth * 2 + separator1 + separator2); + netgraph_y = (vid_conheight.integer - 48 + separator2) - (1 + (index / netgraphsperrow)) * (graphheight + textsize + separator2); + SCR_DrawNetGraph_DrawGraph(netgraph_x , netgraph_y, graphwidth, graphheight, graphscale, va("%s", svs.clients[i].name), textsize, c->outgoing_packetcounter, c->outgoing_netgraph); + SCR_DrawNetGraph_DrawGraph(netgraph_x + graphwidth + separator1, netgraph_y, graphwidth, graphheight, graphscale, "" , textsize, c->incoming_packetcounter, c->incoming_netgraph); index++; } } @@ -333,7 +338,7 @@ void SCR_DrawTurtle (void) if (count < 3) return; - DrawQ_Pic (0, 0, Draw_CachePic("gfx/turtle", true), 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (0, 0, Draw_CachePic ("gfx/turtle"), 0, 0, 1, 1, 1, 1, 0); } /* @@ -350,7 +355,7 @@ void SCR_DrawNet (void) if (cls.demoplayback) return; - DrawQ_Pic (64, 0, Draw_CachePic("gfx/net", true), 0, 0, 1, 1, 1, 1, 0); + DrawQ_Pic (64, 0, Draw_CachePic ("gfx/net"), 0, 0, 1, 1, 1, 1, 0); } /* @@ -371,7 +376,7 @@ void SCR_DrawPause (void) if (!cl.paused) return; - pic = Draw_CachePic ("gfx/pause", true); + pic = Draw_CachePic ("gfx/pause"); DrawQ_Pic ((vid_conwidth.integer - pic->width)/2, (vid_conheight.integer - pic->height)/2, pic, 0, 0, 1, 1, 1, 1, 0); } @@ -388,7 +393,7 @@ void SCR_DrawBrand (void) if (!scr_showbrand.value) return; - pic = Draw_CachePic ("gfx/brand", true); + pic = Draw_CachePic ("gfx/brand"); switch ((int)scr_showbrand.value) { @@ -438,10 +443,12 @@ SCR_DrawQWDownload */ static int SCR_DrawQWDownload(int offset) { + // sync with SCR_InfobarHeight int len; float x, y; float size = 8; char temp[256]; + if (!cls.qw_downloadname[0]) { cls.qw_downloadspeedrate = 0; @@ -460,10 +467,28 @@ static int SCR_DrawQWDownload(int offset) else dpsnprintf(temp, sizeof(temp), "Downloading %s %3i%% (%i/%i) at %i bytes/s\n", cls.qw_downloadname, cls.qw_downloadpercent, cls.qw_downloadmemorycursize, cls.qw_downloadmemorymaxsize, cls.qw_downloadspeedrate); len = (int)strlen(temp); - x = (vid_conwidth.integer - len*size) / 2; + x = (vid_conwidth.integer - DrawQ_TextWidth_Font(temp, len, true, FONT_INFOBAR) * size) / 2; y = vid_conheight.integer - size - offset; - DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, 0.5, 0); - DrawQ_String(x, y, temp, len, size, size, 1, 1, 1, 1, 0, NULL, true); + DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, cls.signon == SIGNONS ? 0.5 : 1, 0); + DrawQ_String_Font(x, y, temp, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); + return 8; +} +/* +============== +SCR_DrawInfobarString +============== +*/ +static int SCR_DrawInfobarString(int offset) +{ + int len; + float x, y; + float size = 8; + + len = (int)strlen(scr_infobarstring); + x = (vid_conwidth.integer - DrawQ_TextWidth_Font(scr_infobarstring, len, false, FONT_INFOBAR) * size) / 2; + y = vid_conheight.integer - size - offset; + DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, cls.signon == SIGNONS ? 0.5 : 1, 0); + DrawQ_String_Font(x, y, scr_infobarstring, len, size, size, 1, 1, 1, 1, 0, NULL, false, FONT_INFOBAR); return 8; } @@ -474,6 +499,7 @@ SCR_DrawCurlDownload */ static int SCR_DrawCurlDownload(int offset) { + // sync with SCR_InfobarHeight int len; int nDownloads; int i; @@ -492,9 +518,9 @@ static int SCR_DrawCurlDownload(int offset) if(addinfo) { len = (int)strlen(addinfo); - x = (vid_conwidth.integer - len*size) / 2; - DrawQ_Fill(0, y - size, vid_conwidth.integer, size, 1, 1, 1, 0.8, 0); - DrawQ_String(x, y - size, addinfo, len, size, size, 0, 0, 0, 1, 0, NULL, true); + x = (vid_conwidth.integer - DrawQ_TextWidth_Font(addinfo, len, true, FONT_INFOBAR) * size) / 2; + DrawQ_Fill(0, y - size, vid_conwidth.integer, size, 1, 1, 1, cls.signon == SIGNONS ? 0.8 : 1, 0); + DrawQ_String_Font(x, y - size, addinfo, len, size, size, 0, 0, 0, 1, 0, NULL, true, FONT_INFOBAR); } for(i = 0; i != nDownloads; ++i) @@ -506,9 +532,9 @@ static int SCR_DrawCurlDownload(int offset) else dpsnprintf(temp, sizeof(temp), "Downloading %s ... %5.1f%% @ %.1f KiB/s\n", downinfo[i].filename, 100.0 * downinfo[i].progress, downinfo[i].speed / 1024.0); len = (int)strlen(temp); - x = (vid_conwidth.integer - len*size) / 2; - DrawQ_Fill(0, y + i * size, vid_conwidth.integer, size, 0, 0, 0, 0.8, 0); - DrawQ_String(x, y + i * size, temp, len, size, size, 1, 1, 1, 1, 0, NULL, true); + x = (vid_conwidth.integer - DrawQ_TextWidth_Font(temp, len, true, FONT_INFOBAR) * size) / 2; + DrawQ_Fill(0, y + i * size, vid_conwidth.integer, size, 0, 0, 0, cls.signon == SIGNONS ? 0.5 : 1, 0); + DrawQ_String_Font(x, y + i * size, temp, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); } Z_Free(downinfo); @@ -518,16 +544,62 @@ static int SCR_DrawCurlDownload(int offset) /* ============== -SCR_DrawDownload +SCR_DrawInfobar ============== */ -static void SCR_DrawDownload() +static void SCR_DrawInfobar(void) { int offset = 0; + if(scr_infobartime_off > 0) + offset += SCR_DrawInfobarString(offset); offset += SCR_DrawQWDownload(offset); offset += SCR_DrawCurlDownload(offset); + if(offset != scr_con_margin_bottom) + Con_DPrintf("broken console margin calculation: %d != %d\n", offset, scr_con_margin_bottom); +} + +static int SCR_InfobarHeight(void) +{ + int offset = 0; + Curl_downloadinfo_t *downinfo; + const char *addinfo; + int nDownloads; + + if (cl.time > cl.oldtime) + scr_infobartime_off -= cl.time - cl.oldtime; + if(scr_infobartime_off > 0) + offset += 8; + + if(cls.qw_downloadname[0]) + offset += 8; + + downinfo = Curl_GetDownloadInfo(&nDownloads, &addinfo); + if(downinfo) + { + offset += 8 * (nDownloads + (addinfo ? 1 : 0)); + Z_Free(downinfo); + } + + return offset; } +/* +============== +SCR_InfoBar_f +============== +*/ +void SCR_InfoBar_f(void) +{ + if(Cmd_Argc() == 3) + { + scr_infobartime_off = atof(Cmd_Argv(1)); + strlcpy(scr_infobarstring, Cmd_Argv(2), sizeof(scr_infobarstring)); + } + else + { + Con_Printf("usage:\ninfobar expiretime \"string\"\n"); + } +} //============================================================================= /* @@ -574,19 +646,16 @@ SCR_DrawConsole */ void SCR_DrawConsole (void) { + scr_con_margin_bottom = SCR_InfobarHeight(); if (key_consoleactive & KEY_CONSOLEACTIVE_FORCED) { // full screen - Con_DrawConsole (vid_conheight.integer); + Con_DrawConsole (vid_conheight.integer - scr_con_margin_bottom); } else if (scr_con_current) - Con_DrawConsole ((int)scr_con_current); + Con_DrawConsole (min((int)scr_con_current, vid_conheight.integer - scr_con_margin_bottom)); else - { con_vislines = 0; - if ((key_dest == key_game || key_dest == key_message) && !r_letterbox.value) - Con_DrawNotify (); // only draw notify in game - } } /* @@ -606,9 +675,10 @@ void SCR_BeginLoadingPlaque (void) //============================================================================= -char r_speeds_string[1024]; +char r_speeds_timestring[4096]; int speedstringcount, r_timereport_active; double r_timereport_temp = 0, r_timereport_current = 0, r_timereport_start = 0; +int r_speeds_longestitem = 0; void R_TimeReport(char *desc) { @@ -620,83 +690,121 @@ void R_TimeReport(char *desc) return; CHECKGLERROR - qglFinish();CHECKGLERROR + if (r_speeds.integer == 2) + qglFinish(); + CHECKGLERROR r_timereport_temp = r_timereport_current; r_timereport_current = Sys_DoubleTime(); t = (int) ((r_timereport_current - r_timereport_temp) * 1000000.0 + 0.5); - dpsnprintf(tempbuf, sizeof(tempbuf), "%8i %-11s", t, desc); - length = (int)strlen(tempbuf); + length = dpsnprintf(tempbuf, sizeof(tempbuf), "%8i %s", t, desc); + length = min(length, (int)sizeof(tempbuf) - 1); + if (r_speeds_longestitem < length) + r_speeds_longestitem = length; + for (;length < r_speeds_longestitem;length++) + tempbuf[length] = ' '; + tempbuf[length] = 0; + if (speedstringcount + length > (vid_conwidth.integer / 8)) { - strlcat(r_speeds_string, "\n", sizeof(r_speeds_string)); + strlcat(r_speeds_timestring, "\n", sizeof(r_speeds_timestring)); speedstringcount = 0; } - strlcat(r_speeds_string, tempbuf, sizeof(r_speeds_string)); + strlcat(r_speeds_timestring, tempbuf, sizeof(r_speeds_timestring)); speedstringcount += length; } -void R_TimeReport_Frame(void) +void R_TimeReport_BeginFrame(void) +{ + speedstringcount = 0; + r_speeds_timestring[0] = 0; + r_timereport_active = false; + memset(&r_refdef.stats, 0, sizeof(r_refdef.stats)); + + if (r_speeds.integer >= 2 && cls.signon == SIGNONS && cls.state == ca_connected) + { + r_timereport_active = true; + r_timereport_start = r_timereport_current = Sys_DoubleTime(); + } +} + +static int R_CountLeafTriangles(const dp_model_t *model, const mleaf_t *leaf) +{ + int i, triangles = 0; + for (i = 0;i < leaf->numleafsurfaces;i++) + triangles += model->data_surfaces[leaf->firstleafsurface[i]].num_triangles; + return triangles; +} + +void R_TimeReport_EndFrame(void) { int i, j, lines, y; cl_locnode_t *loc; + char string[1024+4096]; + mleaf_t *viewleaf; - if (r_speeds_string[0]) + string[0] = 0; + if (r_speeds.integer && cls.signon == SIGNONS && cls.state == ca_connected) { - if (r_timereport_active) + // put the location name in the r_speeds display as it greatly helps + // when creating loc files + loc = CL_Locs_FindNearest(cl.movement_origin); + viewleaf = (r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->brush.PointInLeaf) ? r_refdef.scene.worldmodel->brush.PointInLeaf(r_refdef.scene.worldmodel, r_refdef.view.origin) : NULL; + dpsnprintf(string, sizeof(string), +"%s%s\n" +"%3i renders org:'%+8.2f %+8.2f %+8.2f' dir:'%+2.3f %+2.3f %+2.3f'\n" +"%5i viewleaf%5i cluster%2i area%4i brushes%4i surfaces(%7i triangles)\n" +"%7i surfaces%7i triangles %5i entities (%7i surfaces%7i triangles)\n" +"%5i leafs%5i portals%6i/%6i particles%6i/%6i decals %3i%% quality\n" +"%7i lightmap updates (%7i pixels)\n" +"%4i lights%4i clears%4i scissored%7i light%7i shadow%7i dynamic\n" +"rendered%6i meshes%8i triangles bloompixels%8i copied%8i drawn\n" +"%s" +, loc ? "Location: " : "", loc ? loc->name : "" +, r_refdef.stats.renders, r_refdef.view.origin[0], r_refdef.view.origin[1], r_refdef.view.origin[2], r_refdef.view.forward[0], r_refdef.view.forward[1], r_refdef.view.forward[2] +, viewleaf ? (int)(viewleaf - r_refdef.scene.worldmodel->brush.data_leafs) : -1, viewleaf ? viewleaf->clusterindex : -1, viewleaf ? viewleaf->areaindex : -1, viewleaf ? viewleaf->numleafbrushes : 0, viewleaf ? viewleaf->numleafsurfaces : 0, viewleaf ? R_CountLeafTriangles(r_refdef.scene.worldmodel, viewleaf) : 0 +, r_refdef.stats.world_surfaces, r_refdef.stats.world_triangles, r_refdef.stats.entities, r_refdef.stats.entities_surfaces, r_refdef.stats.entities_triangles +, r_refdef.stats.world_leafs, r_refdef.stats.world_portals, r_refdef.stats.particles, cl.num_particles, r_refdef.stats.decals, cl.num_decals, (int)(100 * r_refdef.view.quality) +, r_refdef.stats.lightmapupdates, r_refdef.stats.lightmapupdatepixels +, r_refdef.stats.lights, r_refdef.stats.lights_clears, r_refdef.stats.lights_scissored, r_refdef.stats.lights_lighttriangles, r_refdef.stats.lights_shadowtriangles, r_refdef.stats.lights_dynamicshadowtriangles +, r_refdef.stats.meshes, r_refdef.stats.meshes_elements / 3, r_refdef.stats.bloom_copypixels, r_refdef.stats.bloom_drawpixels +, r_speeds_timestring); + + memset(&r_refdef.stats, 0, sizeof(r_refdef.stats)); + + speedstringcount = 0; + r_speeds_timestring[0] = 0; + r_timereport_active = false; + + if (r_speeds.integer >= 2) { - r_timereport_current = r_timereport_start; - R_TimeReport("total"); + r_timereport_active = true; + r_timereport_start = r_timereport_current = Sys_DoubleTime(); } + } - if (r_speeds_string[strlen(r_speeds_string)-1] == '\n') - r_speeds_string[strlen(r_speeds_string)-1] = 0; + if (string[0]) + { + if (string[strlen(string)-1] == '\n') + string[strlen(string)-1] = 0; lines = 1; - for (i = 0;r_speeds_string[i];i++) - if (r_speeds_string[i] == '\n') + for (i = 0;string[i];i++) + if (string[i] == '\n') lines++; y = vid_conheight.integer - sb_lines - lines * 8; i = j = 0; DrawQ_Fill(0, y, vid_conwidth.integer, lines * 8, 0, 0, 0, 0.5, 0); - while (r_speeds_string[i]) + while (string[i]) { j = i; - while (r_speeds_string[i] && r_speeds_string[i] != '\n') + while (string[i] && string[i] != '\n') i++; if (i - j > 0) - DrawQ_String(0, y, r_speeds_string + j, i - j, 8, 8, 1, 1, 1, 1, 0, NULL, true); - if (r_speeds_string[i] == '\n') + DrawQ_String(0, y, string + j, i - j, 8, 8, 1, 1, 1, 1, 0, NULL, true); + if (string[i] == '\n') i++; y += 8; } - r_speeds_string[0] = 0; - r_timereport_active = false; - } - if (r_speeds.integer && cls.signon == SIGNONS && cls.state == ca_connected) - { - speedstringcount = 0; - r_speeds_string[0] = 0; - r_timereport_active = false; - // put the location name in the r_speeds display as it greatly helps - // when creating loc files - loc = CL_Locs_FindNearest(cl.movement_origin); - if (loc) - sprintf(r_speeds_string + strlen(r_speeds_string), "Location: %s\n", loc->name); - sprintf(r_speeds_string + strlen(r_speeds_string), "org:'%+8.2f %+8.2f %+8.2f' dir:'%+2.3f %+2.3f %+2.3f'\n", r_view.origin[0], r_view.origin[1], r_view.origin[2], r_view.forward[0], r_view.forward[1], r_view.forward[2]); - sprintf(r_speeds_string + strlen(r_speeds_string), "%5i entities%6i surfaces%6i triangles%5i leafs%5i portals%6i particles\n", r_refdef.stats.entities, r_refdef.stats.entities_surfaces, r_refdef.stats.entities_triangles, r_refdef.stats.world_leafs, r_refdef.stats.world_portals, r_refdef.stats.particles); - sprintf(r_speeds_string + strlen(r_speeds_string), "%4i lights%4i clears%4i scissored%7i light%7i shadow%7i dynamic\n", r_refdef.stats.lights, r_refdef.stats.lights_clears, r_refdef.stats.lights_scissored, r_refdef.stats.lights_lighttriangles, r_refdef.stats.lights_shadowtriangles, r_refdef.stats.lights_dynamicshadowtriangles); - if (r_refdef.stats.bloom) - sprintf(r_speeds_string + strlen(r_speeds_string), "rendered%6i meshes%8i triangles bloompixels%8i copied%8i drawn\n", r_refdef.stats.meshes, r_refdef.stats.meshes_elements / 3, r_refdef.stats.bloom_copypixels, r_refdef.stats.bloom_drawpixels); - else - sprintf(r_speeds_string + strlen(r_speeds_string), "rendered%6i meshes%8i triangles\n", r_refdef.stats.meshes, r_refdef.stats.meshes_elements / 3); - - memset(&r_refdef.stats, 0, sizeof(r_refdef.stats)); - - if (r_speeds.integer >= 2) - { - r_timereport_active = true; - r_timereport_start = r_timereport_current = Sys_DoubleTime(); - } } } @@ -751,12 +859,18 @@ void CL_Screen_Init(void) Cvar_RegisterVariable (&scr_screenshot_jpeg); Cvar_RegisterVariable (&scr_screenshot_jpeg_quality); Cvar_RegisterVariable (&scr_screenshot_gammaboost); + Cvar_RegisterVariable (&scr_screenshot_hwgamma); + Cvar_RegisterVariable (&scr_screenshot_name_in_mapdir); Cvar_RegisterVariable (&cl_capturevideo); + Cvar_RegisterVariable (&cl_capturevideo_printfps); Cvar_RegisterVariable (&cl_capturevideo_width); Cvar_RegisterVariable (&cl_capturevideo_height); Cvar_RegisterVariable (&cl_capturevideo_realtime); Cvar_RegisterVariable (&cl_capturevideo_fps); + Cvar_RegisterVariable (&cl_capturevideo_nameformat); Cvar_RegisterVariable (&cl_capturevideo_number); + Cvar_RegisterVariable (&cl_capturevideo_ogg); + Cvar_RegisterVariable (&cl_capturevideo_framestep); Cvar_RegisterVariable (&r_letterbox); Cvar_RegisterVariable(&r_stereo_separation); Cvar_RegisterVariable(&r_stereo_sidebyside); @@ -771,11 +885,15 @@ void CL_Screen_Init(void) Cvar_RegisterVariable(&scr_stipple); Cvar_RegisterVariable(&scr_refresh); Cvar_RegisterVariable(&shownetgraph); + Cvar_RegisterVariable(&cl_demo_mousegrab); Cmd_AddCommand ("sizeup",SCR_SizeUp_f, "increase view size (increases viewsize cvar)"); Cmd_AddCommand ("sizedown",SCR_SizeDown_f, "decrease view size (decreases viewsize cvar)"); Cmd_AddCommand ("screenshot",SCR_ScreenShot_f, "takes a screenshot of the next rendered frame"); Cmd_AddCommand ("envmap", R_Envmap_f, "render a cubemap (skybox) of the current scene"); + Cmd_AddCommand ("infobar", SCR_InfoBar_f, "display a text in the infobar (usage: infobar expiretime string)"); + + SCR_CaptureVideo_Ogg_Init(); scr_initialized = true; } @@ -788,33 +906,43 @@ SCR_ScreenShot_f void SCR_ScreenShot_f (void) { static int shotnumber; - static char oldname[MAX_QPATH]; - char base[MAX_QPATH]; + static char old_prefix_name[MAX_QPATH]; + char prefix_name[MAX_QPATH]; char filename[MAX_QPATH]; + char mapname[MAX_QPATH]; unsigned char *buffer1; unsigned char *buffer2; unsigned char *buffer3; qboolean jpeg = (scr_screenshot_jpeg.integer != 0); - sprintf (base, "screenshots/%s", scr_screenshot_name.string); + // TODO maybe make capturevideo and screenshot use similar name patterns? + if (scr_screenshot_name_in_mapdir.integer && cl.worldmodel && *cl.worldmodel->name) { + // figure out the map's filename without path or extension + strlcpy(mapname, FS_FileWithoutPath(cl.worldmodel->name), sizeof(mapname)); + if (strrchr(mapname, '.')) + *(strrchr(mapname, '.')) = 0; + dpsnprintf (prefix_name, sizeof(prefix_name), "%s/%s", mapname, Sys_TimeString(scr_screenshot_name.string)); + } else { + dpsnprintf (prefix_name, sizeof(prefix_name), "%s", Sys_TimeString(scr_screenshot_name.string)); + } - if (strcmp (oldname, scr_screenshot_name.string)) + if (strcmp(old_prefix_name, prefix_name)) { - sprintf(oldname, "%s", scr_screenshot_name.string); + dpsnprintf(old_prefix_name, sizeof(old_prefix_name), "%s", prefix_name ); shotnumber = 0; } // find a file name to save it to for (;shotnumber < 1000000;shotnumber++) - if (!FS_SysFileExists(va("%s/%s%06d.tga", fs_gamedir, base, shotnumber)) && !FS_SysFileExists(va("%s/%s%06d.jpg", fs_gamedir, base, shotnumber))) + if (!FS_SysFileExists(va("%s/screenshots/%s%06d.tga", fs_gamedir, prefix_name, shotnumber)) && !FS_SysFileExists(va("%s/screenshots/%s%06d.jpg", fs_gamedir, prefix_name, shotnumber))) break; if (shotnumber >= 1000000) { - Con_Print("SCR_ScreenShot_f: Couldn't create the image file\n"); + Con_Print("Couldn't create the image file\n"); return; } - sprintf(filename, "%s%06d.%s", base, shotnumber, jpeg ? "jpg" : "tga"); + dpsnprintf(filename, sizeof(filename), "screenshots/%s%06d.%s", prefix_name, shotnumber, jpeg ? "jpg" : "tga"); buffer1 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3); buffer2 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3); @@ -823,7 +951,7 @@ void SCR_ScreenShot_f (void) if (SCR_ScreenShot (filename, buffer1, buffer2, buffer3, 0, 0, vid.width, vid.height, false, false, false, jpeg, true)) Con_Printf("Wrote %s\n", filename); else - Con_Printf("unable to write %s\n", filename); + Con_Printf("Unable to write %s\n", filename); Mem_Free (buffer1); Mem_Free (buffer2); @@ -832,264 +960,11 @@ void SCR_ScreenShot_f (void) shotnumber++; } -static void SCR_CaptureVideo_RIFF_Start(void) -{ - memset(&cls.capturevideo.riffbuffer, 0, sizeof(sizebuf_t)); - cls.capturevideo.riffbuffer.maxsize = sizeof(cls.capturevideo.riffbufferdata); - cls.capturevideo.riffbuffer.data = cls.capturevideo.riffbufferdata; -} - -static void SCR_CaptureVideo_RIFF_Flush(void) -{ - if (cls.capturevideo.riffbuffer.cursize > 0) - { - if (!FS_Write(cls.capturevideo.videofile, cls.capturevideo.riffbuffer.data, cls.capturevideo.riffbuffer.cursize)) - cls.capturevideo.error = true; - cls.capturevideo.riffbuffer.cursize = 0; - cls.capturevideo.riffbuffer.overflowed = false; - } -} - -static void SCR_CaptureVideo_RIFF_WriteBytes(const unsigned char *data, size_t size) -{ - SCR_CaptureVideo_RIFF_Flush(); - if (!FS_Write(cls.capturevideo.videofile, data, size)) - cls.capturevideo.error = true; -} - -static void SCR_CaptureVideo_RIFF_Write32(int n) -{ - if (cls.capturevideo.riffbuffer.cursize + 4 > cls.capturevideo.riffbuffer.maxsize) - SCR_CaptureVideo_RIFF_Flush(); - MSG_WriteLong(&cls.capturevideo.riffbuffer, n); -} - -static void SCR_CaptureVideo_RIFF_Write16(int n) -{ - if (cls.capturevideo.riffbuffer.cursize + 2 > cls.capturevideo.riffbuffer.maxsize) - SCR_CaptureVideo_RIFF_Flush(); - MSG_WriteShort(&cls.capturevideo.riffbuffer, n); -} - -static void SCR_CaptureVideo_RIFF_WriteFourCC(const char *chunkfourcc) -{ - if (cls.capturevideo.riffbuffer.cursize + (int)strlen(chunkfourcc) > cls.capturevideo.riffbuffer.maxsize) - SCR_CaptureVideo_RIFF_Flush(); - MSG_WriteUnterminatedString(&cls.capturevideo.riffbuffer, chunkfourcc); -} - -static void SCR_CaptureVideo_RIFF_WriteTerminatedString(const char *string) -{ - if (cls.capturevideo.riffbuffer.cursize + (int)strlen(string) > cls.capturevideo.riffbuffer.maxsize) - SCR_CaptureVideo_RIFF_Flush(); - MSG_WriteString(&cls.capturevideo.riffbuffer, string); -} - -static fs_offset_t SCR_CaptureVideo_RIFF_GetPosition(void) -{ - SCR_CaptureVideo_RIFF_Flush(); - return FS_Tell(cls.capturevideo.videofile); -} - -static void SCR_CaptureVideo_RIFF_Push(const char *chunkfourcc, const char *listtypefourcc) -{ - SCR_CaptureVideo_RIFF_WriteFourCC(chunkfourcc); - SCR_CaptureVideo_RIFF_Write32(0); - SCR_CaptureVideo_RIFF_Flush(); - cls.capturevideo.riffstackstartoffset[cls.capturevideo.riffstacklevel++] = SCR_CaptureVideo_RIFF_GetPosition(); - if (listtypefourcc) - SCR_CaptureVideo_RIFF_WriteFourCC(listtypefourcc); -} - -static void SCR_CaptureVideo_RIFF_Pop(void) -{ - fs_offset_t offset; - int x; - unsigned char sizebytes[4]; - // write out the chunk size and then return to the current file position - cls.capturevideo.riffstacklevel--; - offset = SCR_CaptureVideo_RIFF_GetPosition(); - x = (int)(offset - (cls.capturevideo.riffstackstartoffset[cls.capturevideo.riffstacklevel])); - sizebytes[0] = (x) & 0xff;sizebytes[1] = (x >> 8) & 0xff;sizebytes[2] = (x >> 16) & 0xff;sizebytes[3] = (x >> 24) & 0xff; - FS_Seek(cls.capturevideo.videofile, -(x + 4), SEEK_END); - FS_Write(cls.capturevideo.videofile, sizebytes, 4); - FS_Seek(cls.capturevideo.videofile, 0, SEEK_END); - if (offset & 1) - { - unsigned char c = 0; - FS_Write(cls.capturevideo.videofile, &c, 1); - } -} - -static void GrowBuf(sizebuf_t *buf, int extralen) -{ - if(buf->cursize + extralen > buf->maxsize) - { - int oldsize = buf->maxsize; - unsigned char *olddata; - olddata = buf->data; - buf->maxsize = max(buf->maxsize * 2, 4096); - buf->data = Mem_Alloc(tempmempool, buf->maxsize); - if(olddata) - { - memcpy(buf->data, olddata, oldsize); - Mem_Free(olddata); - } - } -} - -static void SCR_CaptureVideo_RIFF_IndexEntry(const char *chunkfourcc, int chunksize, int flags) -{ - if (cls.capturevideo.riffstacklevel != 2) - Sys_Error("SCR_Capturevideo_RIFF_IndexEntry: RIFF stack level is %i (should be 2)\n", cls.capturevideo.riffstacklevel); - GrowBuf(&cls.capturevideo.riffindexbuffer, 16); - SCR_CaptureVideo_RIFF_Flush(); - MSG_WriteUnterminatedString(&cls.capturevideo.riffindexbuffer, chunkfourcc); - MSG_WriteLong(&cls.capturevideo.riffindexbuffer, flags); - MSG_WriteLong(&cls.capturevideo.riffindexbuffer, (int)FS_Tell(cls.capturevideo.videofile) - cls.capturevideo.riffstackstartoffset[1]); - MSG_WriteLong(&cls.capturevideo.riffindexbuffer, chunksize); -} - -static void SCR_CaptureVideo_RIFF_MakeIxChunk(const char *fcc, const char *dwChunkId, fs_offset_t masteridx_counter, int *masteridx_count, fs_offset_t masteridx_start) -{ - int nMatching; - int i; - fs_offset_t ix = SCR_CaptureVideo_RIFF_GetPosition(); - fs_offset_t pos; - - if(*masteridx_count >= AVI_MASTER_INDEX_SIZE) - return; - - nMatching = 0; // go through index and enumerate them - for(i = 0; i < cls.capturevideo.riffindexbuffer.cursize; i += 16) - if(!memcmp(cls.capturevideo.riffindexbuffer.data + i, dwChunkId, 4)) - ++nMatching; - - SCR_CaptureVideo_RIFF_Push(fcc, NULL); - SCR_CaptureVideo_RIFF_Write16(2); // wLongsPerEntry - SCR_CaptureVideo_RIFF_Write16(0x0100); // bIndexType=1, bIndexSubType=0 - SCR_CaptureVideo_RIFF_Write32(nMatching); // nEntriesInUse - SCR_CaptureVideo_RIFF_WriteFourCC(dwChunkId); // dwChunkId - SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.videofile_ix_movistart & (fs_offset_t) 0xFFFFFFFFu); - SCR_CaptureVideo_RIFF_Write32(((long long) cls.capturevideo.videofile_ix_movistart) >> 32); - SCR_CaptureVideo_RIFF_Write32(0); // dwReserved - - for(i = 0; i < cls.capturevideo.riffindexbuffer.cursize; i += 16) - if(!memcmp(cls.capturevideo.riffindexbuffer.data + i, dwChunkId, 4)) - { - unsigned int *p = (unsigned int *) (cls.capturevideo.riffindexbuffer.data + i); - unsigned int flags = p[1]; - unsigned int rpos = p[2]; - unsigned int size = p[3]; - size &= ~0x80000000; - if(!(flags & 0x10)) // no keyframe? - size |= 0x80000000; - SCR_CaptureVideo_RIFF_Write32(rpos + 8); - SCR_CaptureVideo_RIFF_Write32(size); - } - - SCR_CaptureVideo_RIFF_Pop(); - pos = SCR_CaptureVideo_RIFF_GetPosition(); - SCR_CaptureVideo_RIFF_Flush(); - - FS_Seek(cls.capturevideo.videofile, masteridx_start + 16 * *masteridx_count, SEEK_SET); - SCR_CaptureVideo_RIFF_Write32(ix & (fs_offset_t) 0xFFFFFFFFu); - SCR_CaptureVideo_RIFF_Write32(((long long) ix) >> 32); - SCR_CaptureVideo_RIFF_Write32(pos - ix); - SCR_CaptureVideo_RIFF_Write32(nMatching); - SCR_CaptureVideo_RIFF_Flush(); - - FS_Seek(cls.capturevideo.videofile, masteridx_counter, SEEK_SET); - SCR_CaptureVideo_RIFF_Write32(++*masteridx_count); - SCR_CaptureVideo_RIFF_Flush(); - - FS_Seek(cls.capturevideo.videofile, 0, SEEK_END); -} - -static void SCR_CaptureVideo_RIFF_Finish(qboolean final) -{ - // close the "movi" list - SCR_CaptureVideo_RIFF_Pop(); - if(cls.capturevideo.videofile_ix_master_video_inuse_offset) - SCR_CaptureVideo_RIFF_MakeIxChunk("ix00", "00dc", cls.capturevideo.videofile_ix_master_video_inuse_offset, &cls.capturevideo.videofile_ix_master_video_inuse, cls.capturevideo.videofile_ix_master_video_start_offset); - if(cls.capturevideo.videofile_ix_master_audio_inuse_offset) - SCR_CaptureVideo_RIFF_MakeIxChunk("ix01", "01wb", cls.capturevideo.videofile_ix_master_audio_inuse_offset, &cls.capturevideo.videofile_ix_master_audio_inuse, cls.capturevideo.videofile_ix_master_audio_start_offset); - // write the idx1 chunk that we've been building while saving the frames (for old style players) - if(final && cls.capturevideo.videofile_firstchunkframes_offset) - // TODO replace index creating by OpenDML ix##/##ix/indx chunk so it works for more than one AVI part too - { - SCR_CaptureVideo_RIFF_Push("idx1", NULL); - SCR_CaptureVideo_RIFF_WriteBytes(cls.capturevideo.riffindexbuffer.data, cls.capturevideo.riffindexbuffer.cursize); - SCR_CaptureVideo_RIFF_Pop(); - } - cls.capturevideo.riffindexbuffer.cursize = 0; - // pop the RIFF chunk itself - while (cls.capturevideo.riffstacklevel > 0) - SCR_CaptureVideo_RIFF_Pop(); - SCR_CaptureVideo_RIFF_Flush(); - if(cls.capturevideo.videofile_firstchunkframes_offset) - { - Con_DPrintf("Finishing first chunk (%d frames)\n", cls.capturevideo.frame); - FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_firstchunkframes_offset, SEEK_SET); - SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.frame); - SCR_CaptureVideo_RIFF_Flush(); - FS_Seek(cls.capturevideo.videofile, 0, SEEK_END); - cls.capturevideo.videofile_firstchunkframes_offset = 0; - } - else - Con_DPrintf("Finishing another chunk (%d frames)\n", cls.capturevideo.frame); -} - -static void SCR_CaptureVideo_RIFF_OverflowCheck(int framesize) -{ - fs_offset_t cursize, curfilesize; - if (cls.capturevideo.riffstacklevel != 2) - Sys_Error("SCR_CaptureVideo_RIFF_OverflowCheck: chunk stack leakage!\n"); - // check where we are in the file - SCR_CaptureVideo_RIFF_Flush(); - cursize = SCR_CaptureVideo_RIFF_GetPosition() - cls.capturevideo.riffstackstartoffset[0]; - curfilesize = SCR_CaptureVideo_RIFF_GetPosition(); - - // if this would overflow the windows limit of 1GB per RIFF chunk, we need - // to close the current RIFF chunk and open another for future frames - if (8 + cursize + framesize + cls.capturevideo.riffindexbuffer.cursize + 8 + cls.capturevideo.riffindexbuffer.cursize + 64 > 1<<30) // note that the Ix buffer takes less space... I just don't dare to / 2 here now... sorry, maybe later - { - SCR_CaptureVideo_RIFF_Finish(false); - // begin a new 1GB extended section of the AVI - SCR_CaptureVideo_RIFF_Push("RIFF", "AVIX"); - SCR_CaptureVideo_RIFF_Push("LIST", "movi"); - cls.capturevideo.videofile_ix_movistart = cls.capturevideo.riffstackstartoffset[1]; - } -} - -static void FindFraction(double val, int *num, int *denom, int denomMax) -{ - int i; - double bestdiff; - // initialize - bestdiff = fabs(val); - *num = 0; - *denom = 1; - - for(i = 1; i <= denomMax; ++i) - { - int inum = floor(0.5 + val * i); - double diff = fabs(val - inum / (double)i); - if(diff < bestdiff) - { - bestdiff = diff; - *num = inum; - *denom = i; - } - } -} - void SCR_CaptureVideo_BeginVideo(void) { - double gamma, g, aspect; - int width = cl_capturevideo_width.integer, height = cl_capturevideo_height.integer; - int n, d; + double r, g, b; unsigned int i; + int width = cl_capturevideo_width.integer, height = cl_capturevideo_height.integer; if (cls.capturevideo.active) return; memset(&cls.capturevideo, 0, sizeof(cls.capturevideo)); @@ -1105,8 +980,6 @@ void SCR_CaptureVideo_BeginVideo(void) if(height < 2 || height > vid.height) // can't scale up height = vid.height; - aspect = vid.width / (vid.height * vid_pixelheight.value); - // ensure it's all even; if not, scale down a little if(width % 1) --width; @@ -1116,16 +989,18 @@ void SCR_CaptureVideo_BeginVideo(void) cls.capturevideo.width = width; cls.capturevideo.height = height; cls.capturevideo.active = true; - cls.capturevideo.starttime = realtime; - cls.capturevideo.framerate = bound(1, cl_capturevideo_fps.value, 1000); + cls.capturevideo.framerate = bound(1, cl_capturevideo_fps.value, 1001) * bound(1, cl_capturevideo_framestep.integer, 64); + cls.capturevideo.framestep = cl_capturevideo_framestep.integer; cls.capturevideo.soundrate = S_GetSoundRate(); - cls.capturevideo.frame = 0; + cls.capturevideo.soundchannels = S_GetSoundChannels(); + cls.capturevideo.startrealtime = realtime; + cls.capturevideo.frame = cls.capturevideo.lastfpsframe = 0; + cls.capturevideo.starttime = cls.capturevideo.lastfpstime = Sys_DoubleTime(); cls.capturevideo.soundsampleframe = 0; cls.capturevideo.realtime = cl_capturevideo_realtime.integer != 0; - cls.capturevideo.screenbuffer = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3); - cls.capturevideo.outbuffer = (unsigned char *)Mem_Alloc(tempmempool, width * height * (3+3+3) + 18); - gamma = 1.0/scr_screenshot_gammaboost.value; - dpsnprintf(cls.capturevideo.basename, sizeof(cls.capturevideo.basename), "video/dpvideo%03i", cl_capturevideo_number.integer); + cls.capturevideo.screenbuffer = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 4); + cls.capturevideo.outbuffer = (unsigned char *)Mem_Alloc(tempmempool, width * height * (4+4) + 18); + dpsnprintf(cls.capturevideo.basename, sizeof(cls.capturevideo.basename), "video/%s%03i", Sys_TimeString(cl_capturevideo_nameformat.string), cl_capturevideo_number.integer); Cvar_SetValueQuick(&cl_capturevideo_number, cl_capturevideo_number.integer + 1); /* @@ -1145,229 +1020,61 @@ Y = R * .299 + G * .587 + B * .114; Cb = R * -.169 + G * -.332 + B * .500 + 128.; Cr = R * .500 + G * -.419 + B * -.0813 + 128.; */ + + if(WANT_SCREENSHOT_HWGAMMA) + { + VID_BuildGammaTables(&cls.capturevideo.vidramp[0], 256); + } + else + { + // identity gamma table + BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, cls.capturevideo.vidramp, 256); + BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, cls.capturevideo.vidramp + 256, 256); + BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, cls.capturevideo.vidramp + 256*2, 256); + } + if(scr_screenshot_gammaboost.value != 1) + { + double igamma = 1 / scr_screenshot_gammaboost.value; + for (i = 0;i < 256 * 3;i++) + cls.capturevideo.vidramp[i] = (unsigned short) (0.5 + pow(cls.capturevideo.vidramp[i] * (1.0 / 65535.0), igamma) * 65535.0); + } + for (i = 0;i < 256;i++) { - g = 255*pow(i/255.0, gamma); + r = 255*cls.capturevideo.vidramp[i]/65535.0; + g = 255*cls.capturevideo.vidramp[i+256]/65535.0; + b = 255*cls.capturevideo.vidramp[i+512]/65535.0; + // NOTE: we have to round DOWN here, or integer overflows happen. Sorry for slightly wrong looking colors sometimes... // Y weights from RGB - cls.capturevideo.rgbtoyuvscaletable[0][0][i] = (short)(g * 0.299); + cls.capturevideo.rgbtoyuvscaletable[0][0][i] = (short)(r * 0.299); cls.capturevideo.rgbtoyuvscaletable[0][1][i] = (short)(g * 0.587); - cls.capturevideo.rgbtoyuvscaletable[0][2][i] = (short)(g * 0.114); + cls.capturevideo.rgbtoyuvscaletable[0][2][i] = (short)(b * 0.114); // Cb weights from RGB - cls.capturevideo.rgbtoyuvscaletable[1][0][i] = (short)(g * -0.169); + cls.capturevideo.rgbtoyuvscaletable[1][0][i] = (short)(r * -0.169); cls.capturevideo.rgbtoyuvscaletable[1][1][i] = (short)(g * -0.332); - cls.capturevideo.rgbtoyuvscaletable[1][2][i] = (short)(g * 0.500); + cls.capturevideo.rgbtoyuvscaletable[1][2][i] = (short)(b * 0.500); // Cr weights from RGB - cls.capturevideo.rgbtoyuvscaletable[2][0][i] = (short)(g * 0.500); + cls.capturevideo.rgbtoyuvscaletable[2][0][i] = (short)(r * 0.500); cls.capturevideo.rgbtoyuvscaletable[2][1][i] = (short)(g * -0.419); - cls.capturevideo.rgbtoyuvscaletable[2][2][i] = (short)(g * -0.0813); + cls.capturevideo.rgbtoyuvscaletable[2][2][i] = (short)(b * -0.0813); // range reduction of YCbCr to valid signal range cls.capturevideo.yuvnormalizetable[0][i] = 16 + i * (236-16) / 256; cls.capturevideo.yuvnormalizetable[1][i] = 16 + i * (240-16) / 256; cls.capturevideo.yuvnormalizetable[2][i] = 16 + i * (240-16) / 256; } - //if (cl_capturevideo_) - //{ - //} - //else - { - cls.capturevideo.format = CAPTUREVIDEOFORMAT_AVI_I420; - cls.capturevideo.videofile = FS_Open (va("%s.avi", cls.capturevideo.basename), "wb", false, true); - SCR_CaptureVideo_RIFF_Start(); - // enclosing RIFF chunk (there can be multiple of these in >1GB files, the later ones are "AVIX" instead of "AVI " and have no header/stream info) - SCR_CaptureVideo_RIFF_Push("RIFF", "AVI "); - // AVI main header - SCR_CaptureVideo_RIFF_Push("LIST", "hdrl"); - SCR_CaptureVideo_RIFF_Push("avih", NULL); - SCR_CaptureVideo_RIFF_Write32((int)(1000000.0 / cls.capturevideo.framerate)); // microseconds per frame - SCR_CaptureVideo_RIFF_Write32(0); // max bytes per second - SCR_CaptureVideo_RIFF_Write32(0); // padding granularity - SCR_CaptureVideo_RIFF_Write32(0x910); // flags (AVIF_HASINDEX | AVIF_ISINTERLEAVED | AVIF_TRUSTCKTYPE) - cls.capturevideo.videofile_firstchunkframes_offset = SCR_CaptureVideo_RIFF_GetPosition(); - SCR_CaptureVideo_RIFF_Write32(0); // total frames - SCR_CaptureVideo_RIFF_Write32(0); // initial frames - if (cls.capturevideo.soundrate) - SCR_CaptureVideo_RIFF_Write32(2); // number of streams - else - SCR_CaptureVideo_RIFF_Write32(1); // number of streams - SCR_CaptureVideo_RIFF_Write32(0); // suggested buffer size - SCR_CaptureVideo_RIFF_Write32(width); // width - SCR_CaptureVideo_RIFF_Write32(height); // height - SCR_CaptureVideo_RIFF_Write32(0); // reserved[0] - SCR_CaptureVideo_RIFF_Write32(0); // reserved[1] - SCR_CaptureVideo_RIFF_Write32(0); // reserved[2] - SCR_CaptureVideo_RIFF_Write32(0); // reserved[3] - SCR_CaptureVideo_RIFF_Pop(); - // video stream info - SCR_CaptureVideo_RIFF_Push("LIST", "strl"); - SCR_CaptureVideo_RIFF_Push("strh", "vids"); - SCR_CaptureVideo_RIFF_WriteFourCC("I420"); // stream fourcc (I420 colorspace, uncompressed) - SCR_CaptureVideo_RIFF_Write32(0); // flags - SCR_CaptureVideo_RIFF_Write16(0); // priority - SCR_CaptureVideo_RIFF_Write16(0); // language - SCR_CaptureVideo_RIFF_Write32(0); // initial frames - // find an ideal divisor for the framerate - FindFraction(cls.capturevideo.framerate, &n, &d, 1000); - SCR_CaptureVideo_RIFF_Write32(d); // samples/second divisor - SCR_CaptureVideo_RIFF_Write32(n); // samples/second multiplied by divisor - SCR_CaptureVideo_RIFF_Write32(0); // start - cls.capturevideo.videofile_totalframes_offset1 = SCR_CaptureVideo_RIFF_GetPosition(); - SCR_CaptureVideo_RIFF_Write32(0); // length - SCR_CaptureVideo_RIFF_Write32(width*height+(width/2)*(height/2)*2); // suggested buffer size - SCR_CaptureVideo_RIFF_Write32(0); // quality - SCR_CaptureVideo_RIFF_Write32(0); // sample size - SCR_CaptureVideo_RIFF_Write16(0); // frame left - SCR_CaptureVideo_RIFF_Write16(0); // frame top - SCR_CaptureVideo_RIFF_Write16(width); // frame right - SCR_CaptureVideo_RIFF_Write16(height); // frame bottom - SCR_CaptureVideo_RIFF_Pop(); - // video stream format - SCR_CaptureVideo_RIFF_Push("strf", NULL); - SCR_CaptureVideo_RIFF_Write32(40); // BITMAPINFO struct size - SCR_CaptureVideo_RIFF_Write32(width); // width - SCR_CaptureVideo_RIFF_Write32(height); // height - SCR_CaptureVideo_RIFF_Write16(3); // planes - SCR_CaptureVideo_RIFF_Write16(12); // bitcount - SCR_CaptureVideo_RIFF_WriteFourCC("I420"); // compression - SCR_CaptureVideo_RIFF_Write32(width*height+(width/2)*(height/2)*2); // size of image - SCR_CaptureVideo_RIFF_Write32(0); // x pixels per meter - SCR_CaptureVideo_RIFF_Write32(0); // y pixels per meter - SCR_CaptureVideo_RIFF_Write32(0); // color used - SCR_CaptureVideo_RIFF_Write32(0); // color important - SCR_CaptureVideo_RIFF_Pop(); - // master index - SCR_CaptureVideo_RIFF_Push("indx", NULL); - SCR_CaptureVideo_RIFF_Write16(4); // wLongsPerEntry - SCR_CaptureVideo_RIFF_Write16(0); // bIndexSubType=0, bIndexType=0 - cls.capturevideo.videofile_ix_master_video_inuse_offset = SCR_CaptureVideo_RIFF_GetPosition(); - SCR_CaptureVideo_RIFF_Write32(0); // nEntriesInUse - SCR_CaptureVideo_RIFF_WriteFourCC("00dc"); // dwChunkId - SCR_CaptureVideo_RIFF_Write32(0); // dwReserved1 - SCR_CaptureVideo_RIFF_Write32(0); // dwReserved2 - SCR_CaptureVideo_RIFF_Write32(0); // dwReserved3 - cls.capturevideo.videofile_ix_master_video_start_offset = SCR_CaptureVideo_RIFF_GetPosition(); - for(i = 0; i < AVI_MASTER_INDEX_SIZE * 4; ++i) - SCR_CaptureVideo_RIFF_Write32(0); // fill up later - SCR_CaptureVideo_RIFF_Pop(); - // extended format (aspect!) - SCR_CaptureVideo_RIFF_Push("vprp", NULL); - SCR_CaptureVideo_RIFF_Write32(0); // VideoFormatToken - SCR_CaptureVideo_RIFF_Write32(0); // VideoStandard - SCR_CaptureVideo_RIFF_Write32((int)cls.capturevideo.framerate); // dwVerticalRefreshRate (bogus) - SCR_CaptureVideo_RIFF_Write32(width); // dwHTotalInT - SCR_CaptureVideo_RIFF_Write32(height); // dwVTotalInLines - FindFraction(aspect, &n, &d, 1000); - SCR_CaptureVideo_RIFF_Write32((n << 16) | d); // dwFrameAspectRatio // TODO a word - SCR_CaptureVideo_RIFF_Write32(width); // dwFrameWidthInPixels - SCR_CaptureVideo_RIFF_Write32(height); // dwFrameHeightInLines - SCR_CaptureVideo_RIFF_Write32(1); // nFieldPerFrame - SCR_CaptureVideo_RIFF_Write32(width); // CompressedBMWidth - SCR_CaptureVideo_RIFF_Write32(height); // CompressedBMHeight - SCR_CaptureVideo_RIFF_Write32(width); // ValidBMHeight - SCR_CaptureVideo_RIFF_Write32(height); // ValidBMWidth - SCR_CaptureVideo_RIFF_Write32(0); // ValidBMXOffset - SCR_CaptureVideo_RIFF_Write32(0); // ValidBMYOffset - SCR_CaptureVideo_RIFF_Write32(0); // ValidBMXOffsetInT - SCR_CaptureVideo_RIFF_Write32(0); // ValidBMYValidStartLine - SCR_CaptureVideo_RIFF_Pop(); - SCR_CaptureVideo_RIFF_Pop(); - if (cls.capturevideo.soundrate) - { - // audio stream info - SCR_CaptureVideo_RIFF_Push("LIST", "strl"); - SCR_CaptureVideo_RIFF_Push("strh", "auds"); - SCR_CaptureVideo_RIFF_Write32(1); // stream fourcc (PCM audio, uncompressed) - SCR_CaptureVideo_RIFF_Write32(0); // flags - SCR_CaptureVideo_RIFF_Write16(0); // priority - SCR_CaptureVideo_RIFF_Write16(0); // language - SCR_CaptureVideo_RIFF_Write32(0); // initial frames - SCR_CaptureVideo_RIFF_Write32(1); // samples/second divisor - SCR_CaptureVideo_RIFF_Write32((int)(cls.capturevideo.soundrate)); // samples/second multiplied by divisor - SCR_CaptureVideo_RIFF_Write32(0); // start - cls.capturevideo.videofile_totalsampleframes_offset = SCR_CaptureVideo_RIFF_GetPosition(); - SCR_CaptureVideo_RIFF_Write32(0); // length - SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.soundrate * 2); // suggested buffer size (this is a half second) - SCR_CaptureVideo_RIFF_Write32(0); // quality - SCR_CaptureVideo_RIFF_Write32(4); // sample size - SCR_CaptureVideo_RIFF_Write16(0); // frame left - SCR_CaptureVideo_RIFF_Write16(0); // frame top - SCR_CaptureVideo_RIFF_Write16(0); // frame right - SCR_CaptureVideo_RIFF_Write16(0); // frame bottom - SCR_CaptureVideo_RIFF_Pop(); - // audio stream format - SCR_CaptureVideo_RIFF_Push("strf", NULL); - SCR_CaptureVideo_RIFF_Write16(1); // format (uncompressed PCM?) - SCR_CaptureVideo_RIFF_Write16(2); // channels (stereo) - SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.soundrate); // sampleframes per second - SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.soundrate * 4); // average bytes per second - SCR_CaptureVideo_RIFF_Write16(4); // block align - SCR_CaptureVideo_RIFF_Write16(16); // bits per sample - SCR_CaptureVideo_RIFF_Write16(0); // size - SCR_CaptureVideo_RIFF_Pop(); - SCR_CaptureVideo_RIFF_Pop(); - // master index - SCR_CaptureVideo_RIFF_Push("indx", NULL); - SCR_CaptureVideo_RIFF_Write16(4); // wLongsPerEntry - SCR_CaptureVideo_RIFF_Write16(0); // bIndexSubType=0, bIndexType=0 - cls.capturevideo.videofile_ix_master_audio_inuse_offset = SCR_CaptureVideo_RIFF_GetPosition(); - SCR_CaptureVideo_RIFF_Write32(0); // nEntriesInUse - SCR_CaptureVideo_RIFF_WriteFourCC("01wb"); // dwChunkId - SCR_CaptureVideo_RIFF_Write32(0); // dwReserved1 - SCR_CaptureVideo_RIFF_Write32(0); // dwReserved2 - SCR_CaptureVideo_RIFF_Write32(0); // dwReserved3 - cls.capturevideo.videofile_ix_master_audio_start_offset = SCR_CaptureVideo_RIFF_GetPosition(); - for(i = 0; i < AVI_MASTER_INDEX_SIZE * 4; ++i) - SCR_CaptureVideo_RIFF_Write32(0); // fill up later - SCR_CaptureVideo_RIFF_Pop(); - } - - cls.capturevideo.videofile_ix_master_audio_inuse = cls.capturevideo.videofile_ix_master_video_inuse = 0; - - // extended header (for total #frames) - SCR_CaptureVideo_RIFF_Push("LIST", "odml"); - SCR_CaptureVideo_RIFF_Push("dmlh", NULL); - cls.capturevideo.videofile_totalframes_offset2 = SCR_CaptureVideo_RIFF_GetPosition(); - SCR_CaptureVideo_RIFF_Write32(0); - SCR_CaptureVideo_RIFF_Pop(); - SCR_CaptureVideo_RIFF_Pop(); - - // close the AVI header list - SCR_CaptureVideo_RIFF_Pop(); - // software that produced this AVI video file - SCR_CaptureVideo_RIFF_Push("LIST", "INFO"); - SCR_CaptureVideo_RIFF_Push("ISFT", NULL); - SCR_CaptureVideo_RIFF_WriteTerminatedString(engineversion); - SCR_CaptureVideo_RIFF_Pop(); - // enable this junk filler if you like the LIST movi to always begin at 4KB in the file (why?) -#if 0 - SCR_CaptureVideo_RIFF_Push("JUNK", NULL); - x = 4096 - SCR_CaptureVideo_RIFF_GetPosition(); - while (x > 0) + if (cl_capturevideo_ogg.integer) + { + if(SCR_CaptureVideo_Ogg_Available()) { - const char *junkfiller = "[ DarkPlaces junk data ]"; - int i = min(x, (int)strlen(junkfiller)); - SCR_CaptureVideo_RIFF_WriteBytes((const unsigned char *)junkfiller, i); - x -= i; + SCR_CaptureVideo_Ogg_BeginVideo(); + return; } - SCR_CaptureVideo_RIFF_Pop(); -#endif - SCR_CaptureVideo_RIFF_Pop(); - // begin the actual video section now - SCR_CaptureVideo_RIFF_Push("LIST", "movi"); - cls.capturevideo.videofile_ix_movistart = cls.capturevideo.riffstackstartoffset[1]; - // we're done with the headers now... - SCR_CaptureVideo_RIFF_Flush(); - if (cls.capturevideo.riffstacklevel != 2) - Sys_Error("SCR_CaptureVideo_BeginVideo: broken AVI writing code (stack level is %i (should be 2) at end of headers)\n", cls.capturevideo.riffstacklevel); + else + Con_Print("cl_capturevideo_ogg: libraries not available. Capturing in AVI instead.\n"); } - switch(cls.capturevideo.format) - { - case CAPTUREVIDEOFORMAT_AVI_I420: - break; - default: - break; - } + SCR_CaptureVideo_Avi_BeginVideo(); } void SCR_CaptureVideo_EndVideo(void) @@ -1375,33 +1082,12 @@ void SCR_CaptureVideo_EndVideo(void) if (!cls.capturevideo.active) return; cls.capturevideo.active = false; + + Con_Printf("Finishing capture of %s.%s (%d frames, %d audio frames)\n", cls.capturevideo.basename, cls.capturevideo.formatextension, cls.capturevideo.frame, cls.capturevideo.soundsampleframe); + if (cls.capturevideo.videofile) { - switch(cls.capturevideo.format) - { - case CAPTUREVIDEOFORMAT_AVI_I420: - // close any open chunks - SCR_CaptureVideo_RIFF_Finish(true); - // go back and fix the video frames and audio samples fields - Con_DPrintf("Finishing capture (%d frames, %d audio frames)\n", cls.capturevideo.frame, cls.capturevideo.soundsampleframe); - FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalframes_offset1, SEEK_SET); - SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.frame); - SCR_CaptureVideo_RIFF_Flush(); - FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalframes_offset2, SEEK_SET); - SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.frame); - SCR_CaptureVideo_RIFF_Flush(); - if (cls.capturevideo.soundrate) - { - FS_Seek(cls.capturevideo.videofile, cls.capturevideo.videofile_totalsampleframes_offset, SEEK_SET); - SCR_CaptureVideo_RIFF_Write32(cls.capturevideo.soundsampleframe); - SCR_CaptureVideo_RIFF_Flush(); - } - break; - default: - break; - } - FS_Close(cls.capturevideo.videofile); - cls.capturevideo.videofile = NULL; + cls.capturevideo.endvideo(); } if (cls.capturevideo.screenbuffer) @@ -1416,59 +1102,10 @@ void SCR_CaptureVideo_EndVideo(void) cls.capturevideo.outbuffer = NULL; } - if (cls.capturevideo.riffindexbuffer.data) - { - Mem_Free(cls.capturevideo.riffindexbuffer.data); - cls.capturevideo.riffindexbuffer.data = NULL; - } - memset(&cls.capturevideo, 0, sizeof(cls.capturevideo)); } -// converts from RGB24 to I420 colorspace (identical to YV12 except chroma plane order is reversed), this colorspace is handled by the Intel(r) 4:2:0 codec on Windows -void SCR_CaptureVideo_ConvertFrame_RGB_to_I420_flip(int width, int height, unsigned char *instart, unsigned char *outstart) -{ - int x, y; - int outoffset = (width/2)*(height/2); - unsigned char *b, *out; - // 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 = instart + (height-1-y)*width*3, out = outstart + y*width, x = 0;x < width;x++, b += 3, out++) - *out = cls.capturevideo.yuvnormalizetable[0][cls.capturevideo.rgbtoyuvscaletable[0][0][b[0]] + cls.capturevideo.rgbtoyuvscaletable[0][1][b[1]] + cls.capturevideo.rgbtoyuvscaletable[0][2][b[2]]]; - if ((y & 1) == 0) - { - // 2x2 Cr and Cb planes -#if 0 - // low quality, no averaging - for (b = instart + (height-2-y)*width*3, out = outstart + width*height + (y/2)*(width/2), x = 0;x < width/2;x++, b += 6, out++) - { - // Cr - out[0 ] = cls.capturevideo.yuvnormalizetable[1][cls.capturevideo.rgbtoyuvscaletable[1][0][b[0]] + cls.capturevideo.rgbtoyuvscaletable[1][1][b[1]] + cls.capturevideo.rgbtoyuvscaletable[1][2][b[2]] + 128]; - // Cb - out[outoffset] = cls.capturevideo.yuvnormalizetable[2][cls.capturevideo.rgbtoyuvscaletable[2][0][b[0]] + cls.capturevideo.rgbtoyuvscaletable[2][1][b[1]] + cls.capturevideo.rgbtoyuvscaletable[2][2][b[2]] + 128]; - } -#else - // high quality, averaging - int inpitch = width*3; - for (b = instart + (height-2-y)*width*3, out = outstart + 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 ] = cls.capturevideo.yuvnormalizetable[1][cls.capturevideo.rgbtoyuvscaletable[1][0][blockr] + cls.capturevideo.rgbtoyuvscaletable[1][1][blockg] + cls.capturevideo.rgbtoyuvscaletable[1][2][blockb] + 128]; - // Cb - out[outoffset] = cls.capturevideo.yuvnormalizetable[2][cls.capturevideo.rgbtoyuvscaletable[2][0][blockr] + cls.capturevideo.rgbtoyuvscaletable[2][1][blockg] + cls.capturevideo.rgbtoyuvscaletable[2][2][blockb] + 128]; - } -#endif - } - } -} - -static void SCR_ScaleDown(unsigned char *in, int inw, int inh, unsigned char *out, int outw, int outh) +static void SCR_ScaleDownBGRA(unsigned char *in, int inw, int inh, unsigned char *out, int outw, int outh) { // TODO optimize this function @@ -1478,7 +1115,7 @@ static void SCR_ScaleDown(unsigned char *in, int inw, int inh, unsigned char *ou // memcpy is faster than me if(inw == outw && inh == outh) { - memcpy(out, in, 3 * inw * inh); + memcpy(out, in, 4 * inw * inh); return; } @@ -1486,13 +1123,13 @@ static void SCR_ScaleDown(unsigned char *in, int inw, int inh, unsigned char *ou area = (float)outw * (float)outh / (float)inw / (float)inh; for(y = 0; y < outh; ++y) { - float iny0 = y / (float)outh * inh; int iny0_i = floor(iny0); - float iny1 = (y+1) / (float)outh * inh; int iny1_i = ceil(iny1); + float iny0 = y / (float)outh * inh; int iny0_i = (int) floor(iny0); + float iny1 = (y+1) / (float)outh * inh; int iny1_i = (int) ceil(iny1); for(x = 0; x < outw; ++x) { - float inx0 = x / (float)outw * inw; int inx0_i = floor(inx0); - float inx1 = (x+1) / (float)outw * inw; int inx1_i = ceil(inx1); - float r = 0, g = 0, b = 0; + float inx0 = x / (float)outw * inw; int inx0_i = (int) floor(inx0); + float inx1 = (x+1) / (float)outw * inw; int inx1_i = (int) ceil(inx1); + float r = 0, g = 0, b = 0, alpha = 0; int xx, yy; for(yy = iny0_i; yy < iny1_i; ++yy) @@ -1501,84 +1138,72 @@ static void SCR_ScaleDown(unsigned char *in, int inw, int inh, unsigned char *ou for(xx = inx0_i; xx < inx1_i; ++xx) { float a = ya * (min(xx+1, inx1) - max(inx0, xx)); - r += a * in[3*(xx + inw * yy)+0]; - g += a * in[3*(xx + inw * yy)+1]; - b += a * in[3*(xx + inw * yy)+2]; + r += a * in[4*(xx + inw * yy)+0]; + g += a * in[4*(xx + inw * yy)+1]; + b += a * in[4*(xx + inw * yy)+2]; + alpha += a * in[4*(xx + inw * yy)+3]; } } - out[3*(x + outw * y)+0] = r * area; - out[3*(x + outw * y)+1] = g * area; - out[3*(x + outw * y)+2] = b * area; + out[4*(x + outw * y)+0] = (unsigned char) (r * area); + out[4*(x + outw * y)+1] = (unsigned char) (g * area); + out[4*(x + outw * y)+2] = (unsigned char) (b * area); + out[4*(x + outw * y)+3] = (unsigned char) (alpha * area); } } } -qboolean SCR_CaptureVideo_VideoFrame(int newframenum) +void SCR_CaptureVideo_VideoFrame(int newframestepframenum) { - int x = 0, y = 0, width = cls.capturevideo.width, height = cls.capturevideo.height; - unsigned char *in, *out; + int x = 0, y = 0; + int width = cls.capturevideo.width, height = cls.capturevideo.height; + + if(newframestepframenum == cls.capturevideo.framestepframe) + return; + CHECKGLERROR //return SCR_ScreenShot(filename, cls.capturevideo.buffer, cls.capturevideo.buffer + vid.width * vid.height * 3, cls.capturevideo.buffer + vid.width * vid.height * 6, 0, 0, vid.width, vid.height, false, false, false, jpeg, true); // speed is critical here, so do saving as directly as possible - switch (cls.capturevideo.format) - { - case CAPTUREVIDEOFORMAT_AVI_I420: - // if there's no videofile we have to just give up, and abort saving - if (!cls.capturevideo.videofile) - return false; - // FIXME: width/height must be multiple of 2, enforce this? - qglReadPixels (x, y, vid.width, vid.height, GL_RGB, GL_UNSIGNED_BYTE, cls.capturevideo.screenbuffer);CHECKGLERROR - SCR_ScaleDown (cls.capturevideo.screenbuffer, vid.width, vid.height, cls.capturevideo.outbuffer, width, height); - in = cls.capturevideo.outbuffer; - out = cls.capturevideo.outbuffer + width*height*3; - SCR_CaptureVideo_ConvertFrame_RGB_to_I420_flip(width, height, in, out); - x = width*height+(width/2)*(height/2)*2; - SCR_CaptureVideo_RIFF_OverflowCheck(8 + x); - for (;cls.capturevideo.frame < newframenum;cls.capturevideo.frame++) + + qglReadPixels (x, y, vid.width, vid.height, GL_BGRA, GL_UNSIGNED_BYTE, cls.capturevideo.screenbuffer);CHECKGLERROR + SCR_ScaleDownBGRA (cls.capturevideo.screenbuffer, vid.width, vid.height, cls.capturevideo.outbuffer, width, height); + + cls.capturevideo.videoframes(newframestepframenum - cls.capturevideo.framestepframe); + cls.capturevideo.framestepframe = newframestepframenum; + + if(cl_capturevideo_printfps.integer) + { + char buf[80]; + double t = Sys_DoubleTime(); + if(t > cls.capturevideo.lastfpstime + 1) { - SCR_CaptureVideo_RIFF_IndexEntry("00dc", x, 0x10); // AVIIF_KEYFRAME - SCR_CaptureVideo_RIFF_Push("00dc", NULL); - SCR_CaptureVideo_RIFF_WriteBytes(out, x); - SCR_CaptureVideo_RIFF_Pop(); + double fps1 = (cls.capturevideo.frame - cls.capturevideo.lastfpsframe) / (t - cls.capturevideo.lastfpstime + 0.0000001); + double fps = (cls.capturevideo.frame ) / (t - cls.capturevideo.starttime + 0.0000001); + dpsnprintf(buf, sizeof(buf), "capturevideo: (%.1fs) last second %.3ffps, total %.3ffps\n", cls.capturevideo.frame / cls.capturevideo.framerate, fps1, fps); + Sys_PrintToTerminal(buf); + cls.capturevideo.lastfpstime = t; + cls.capturevideo.lastfpsframe = cls.capturevideo.frame; } - return true; - default: - return false; } } -void SCR_CaptureVideo_SoundFrame(unsigned char *bufstereo16le, size_t length, int rate) +void SCR_CaptureVideo_SoundFrame(const portable_sampleframe_t *paintbuffer, size_t length) { - int x; - cls.capturevideo.soundrate = rate; cls.capturevideo.soundsampleframe += length; - switch (cls.capturevideo.format) - { - case CAPTUREVIDEOFORMAT_AVI_I420: - x = length*4; - SCR_CaptureVideo_RIFF_OverflowCheck(8 + x); - SCR_CaptureVideo_RIFF_IndexEntry("01wb", x, 0x10); // AVIIF_KEYFRAME - SCR_CaptureVideo_RIFF_Push("01wb", NULL); - SCR_CaptureVideo_RIFF_WriteBytes(bufstereo16le, x); - SCR_CaptureVideo_RIFF_Pop(); - break; - default: - break; - } + cls.capturevideo.soundframe(paintbuffer, length); } void SCR_CaptureVideo(void) { int newframenum; - if (cl_capturevideo.integer && r_render.integer) + if (cl_capturevideo.integer) { if (!cls.capturevideo.active) SCR_CaptureVideo_BeginVideo(); - if (cls.capturevideo.framerate != cl_capturevideo_fps.value) + if (cls.capturevideo.framerate != cl_capturevideo_fps.value * cl_capturevideo_framestep.integer) { Con_Printf("You can not change the video framerate while recording a video.\n"); - Cvar_SetValueQuick(&cl_capturevideo_fps, cls.capturevideo.framerate); + Cvar_SetValueQuick(&cl_capturevideo_fps, cls.capturevideo.framerate / (double) cl_capturevideo_framestep.integer); } // for AVI saving we have to make sure that sound is saved before video if (cls.capturevideo.soundrate && !cls.capturevideo.soundsampleframe) @@ -1586,12 +1211,12 @@ void SCR_CaptureVideo(void) if (cls.capturevideo.realtime) { // preserve sound sync by duplicating frames when running slow - newframenum = (int)((realtime - cls.capturevideo.starttime) * cls.capturevideo.framerate); + newframenum = (int)((realtime - cls.capturevideo.startrealtime) * cls.capturevideo.framerate); } else newframenum = cls.capturevideo.frame + 1; // if falling behind more than one second, stop - if (newframenum - cls.capturevideo.frame > (int)ceil(cls.capturevideo.framerate)) + if (newframenum - cls.capturevideo.frame > 60 * (int)ceil(cls.capturevideo.framerate)) { Cvar_SetValueQuick(&cl_capturevideo, 0); Con_Printf("video saving failed on frame %i, your machine is too slow for this capture speed.\n", cls.capturevideo.frame); @@ -1599,7 +1224,8 @@ void SCR_CaptureVideo(void) return; } // write frames - SCR_CaptureVideo_VideoFrame(newframenum); + SCR_CaptureVideo_VideoFrame(newframenum / cls.capturevideo.framestep); + cls.capturevideo.frame = newframenum; if (cls.capturevideo.error) { Cvar_SetValueQuick(&cl_capturevideo, 0); @@ -1672,16 +1298,17 @@ static void R_Envmap_f (void) R_UpdateVariables(); - r_view.x = 0; - r_view.y = 0; - r_view.z = 0; - r_view.width = size; - r_view.height = size; - r_view.depth = 1; - r_view.useperspective = true; + r_refdef.view.x = 0; + r_refdef.view.y = 0; + r_refdef.view.z = 0; + r_refdef.view.width = size; + r_refdef.view.height = size; + r_refdef.view.depth = 1; + r_refdef.view.useperspective = true; + r_refdef.view.isoverlay = false; - r_view.frustum_x = tan(90 * M_PI / 360.0); - r_view.frustum_y = tan(90 * M_PI / 360.0); + r_refdef.view.frustum_x = tan(90 * M_PI / 360.0); + r_refdef.view.frustum_y = tan(90 * M_PI / 360.0); buffer1 = (unsigned char *)Mem_Alloc(tempmempool, size * size * 3); buffer2 = (unsigned char *)Mem_Alloc(tempmempool, size * size * 3); @@ -1689,13 +1316,14 @@ static void R_Envmap_f (void) for (j = 0;j < 12;j++) { - sprintf(filename, "env/%s%s.tga", basename, envmapinfo[j].name); - Matrix4x4_CreateFromQuakeEntity(&r_view.matrix, r_view.origin[0], r_view.origin[1], r_view.origin[2], envmapinfo[j].angles[0], envmapinfo[j].angles[1], envmapinfo[j].angles[2], 1); - R_ClearScreen(); + dpsnprintf(filename, sizeof(filename), "env/%s%s.tga", basename, envmapinfo[j].name); + Matrix4x4_CreateFromQuakeEntity(&r_refdef.view.matrix, r_refdef.view.origin[0], r_refdef.view.origin[1], r_refdef.view.origin[2], envmapinfo[j].angles[0], envmapinfo[j].angles[1], envmapinfo[j].angles[2], 1); + r_refdef.view.quality = 1; + r_refdef.view.clear = true; R_Mesh_Start(); R_RenderView(); R_Mesh_Finish(); - SCR_ScreenShot(filename, buffer1, buffer2, buffer3, 0, vid.height - (r_view.y + r_view.height), size, size, envmapinfo[j].flipx, envmapinfo[j].flipy, envmapinfo[j].flipdiagonaly, false, false); + SCR_ScreenShot(filename, buffer1, buffer2, buffer3, 0, vid.height - (r_refdef.view.y + r_refdef.view.height), size, size, envmapinfo[j].flipx, envmapinfo[j].flipy, envmapinfo[j].flipdiagonaly, false, false); } Mem_Free (buffer1); @@ -1707,36 +1335,22 @@ static void R_Envmap_f (void) //============================================================================= -// LordHavoc: SHOWLMP stuff -#define SHOWLMP_MAXLABELS 256 -typedef struct showlmp_s -{ - qboolean isactive; - float x; - float y; - char label[32]; - char pic[128]; -} -showlmp_t; - -showlmp_t showlmp[SHOWLMP_MAXLABELS]; - void SHOWLMP_decodehide(void) { int i; char *lmplabel; lmplabel = MSG_ReadString(); - for (i = 0;i < SHOWLMP_MAXLABELS;i++) - if (showlmp[i].isactive && strcmp(showlmp[i].label, lmplabel) == 0) + for (i = 0;i < cl.num_showlmps;i++) + if (cl.showlmps[i].isactive && strcmp(cl.showlmps[i].label, lmplabel) == 0) { - showlmp[i].isactive = false; + cl.showlmps[i].isactive = false; return; } } void SHOWLMP_decodeshow(void) { - int i, k; + int k; char lmplabel[256], picname[256]; float x, y; strlcpy (lmplabel,MSG_ReadString(), sizeof (lmplabel)); @@ -1751,41 +1365,37 @@ void SHOWLMP_decodeshow(void) x = MSG_ReadShort(); y = MSG_ReadShort(); } - k = -1; - for (i = 0;i < SHOWLMP_MAXLABELS;i++) - if (showlmp[i].isactive) - { - if (strcmp(showlmp[i].label, lmplabel) == 0) - { - k = i; - break; // drop out to replace it - } - } - else if (k < 0) // find first empty one to replace - k = i; - if (k < 0) - return; // none found to replace - // change existing one - showlmp[k].isactive = true; - strlcpy (showlmp[k].label, lmplabel, sizeof (showlmp[k].label)); - strlcpy (showlmp[k].pic, picname, sizeof (showlmp[k].pic)); - showlmp[k].x = x; - showlmp[k].y = y; + if (!cl.showlmps || cl.num_showlmps >= cl.max_showlmps) + { + showlmp_t *oldshowlmps = cl.showlmps; + cl.max_showlmps += 16; + cl.showlmps = (showlmp_t *) Mem_Alloc(cls.levelmempool, cl.max_showlmps * sizeof(showlmp_t)); + if (cl.num_showlmps) + memcpy(cl.showlmps, oldshowlmps, cl.num_showlmps * sizeof(showlmp_t)); + if (oldshowlmps) + Mem_Free(oldshowlmps); + } + for (k = 0;k < cl.max_showlmps;k++) + if (cl.showlmps[k].isactive && !strcmp(cl.showlmps[k].label, lmplabel)) + break; + if (k == cl.max_showlmps) + for (k = 0;k < cl.max_showlmps;k++) + if (!cl.showlmps[k].isactive) + break; + cl.showlmps[k].isactive = true; + strlcpy (cl.showlmps[k].label, lmplabel, sizeof (cl.showlmps[k].label)); + strlcpy (cl.showlmps[k].pic, picname, sizeof (cl.showlmps[k].pic)); + cl.showlmps[k].x = x; + cl.showlmps[k].y = y; + cl.num_showlmps = max(cl.num_showlmps, k + 1); } void SHOWLMP_drawall(void) { int i; - for (i = 0;i < SHOWLMP_MAXLABELS;i++) - if (showlmp[i].isactive) - DrawQ_Pic(showlmp[i].x, showlmp[i].y, Draw_CachePic(showlmp[i].pic, true), 0, 0, 1, 1, 1, 1, 0); -} - -void SHOWLMP_clear(void) -{ - int i; - for (i = 0;i < SHOWLMP_MAXLABELS;i++) - showlmp[i].isactive = false; + for (i = 0;i < cl.num_showlmps;i++) + if (cl.showlmps[i].isactive) + DrawQ_Pic(cl.showlmps[i].x, cl.showlmps[i].y, Draw_CachePic (cl.showlmps[i].pic), 0, 0, 1, 1, 1, 1, 0); } /* @@ -1801,21 +1411,36 @@ qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *b int indices[3] = {0,1,2}; qboolean ret; - if (!r_render.integer) - return false; - CHECKGLERROR - qglReadPixels (x, y, width, height, GL_RGB, GL_UNSIGNED_BYTE, buffer1);CHECKGLERROR + qglReadPixels (x, y, width, height, jpeg ? GL_RGB : GL_BGR, GL_UNSIGNED_BYTE, buffer1);CHECKGLERROR - if (scr_screenshot_gammaboost.value != 1 && gammacorrect) + if(gammacorrect && (scr_screenshot_gammaboost.value != 1 || WANT_SCREENSHOT_HWGAMMA)) { int i; 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); - for (i = 0;i < width*height*3;i++) - buffer1[i] = ramp[buffer1[i]]; + unsigned short vidramp[256 * 3]; + if(WANT_SCREENSHOT_HWGAMMA) + { + VID_BuildGammaTables(&vidramp[0], 256); + } + else + { + // identity gamma table + BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, vidramp, 256); + BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, vidramp + 256, 256); + BuildGammaTable16(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, vidramp + 256*2, 256); + } + if(scr_screenshot_gammaboost.value != 1) + { + for (i = 0;i < 256 * 3;i++) + vidramp[i] = (unsigned short) (0.5 + pow(vidramp[i] * (1.0 / 65535.0), igamma) * 65535.0); + } + for (i = 0;i < width*height*3;i += 3) + { + buffer1[i] = (unsigned char) (vidramp[buffer1[i]] * 255.0 / 65535.0 + 0.5); + buffer1[i+1] = (unsigned char) (vidramp[buffer1[i+1] + 256] * 255.0 / 65535.0 + 0.5); + buffer1[i+2] = (unsigned char) (vidramp[buffer1[i+2] + 512] * 255.0 / 65535.0 + 0.5); + } } Image_CopyMux (buffer2, buffer1, width, height, flipx, flipy, flipdiagonal, 3, 3, indices); @@ -1823,19 +1448,21 @@ qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *b if (jpeg) ret = JPEG_SaveImage_preflipped (filename, width, height, buffer2); else - ret = Image_WriteTGARGB_preflipped (filename, width, height, buffer2, buffer3); + ret = Image_WriteTGABGR_preflipped (filename, width, height, buffer2, buffer3); return ret; } //============================================================================= -void R_ClearScreen(void) +extern void R_UpdateFogColor(void); +void R_ClearScreen(qboolean fogcolor) { // clear to black CHECKGLERROR - if (r_refdef.fogenabled) + if (fogcolor) { + R_UpdateFogColor(); qglClearColor(r_refdef.fogcolor[0],r_refdef.fogcolor[1],r_refdef.fogcolor[2],0);CHECKGLERROR } else @@ -1851,8 +1478,7 @@ void R_ClearScreen(void) qglClearStencil(128);CHECKGLERROR } // clear the screen - if (r_render.integer) - GL_Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (gl_stencil ? GL_STENCIL_BUFFER_BIT : 0)); + GL_Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (gl_stencil ? GL_STENCIL_BUFFER_BIT : 0)); // set dithering mode if (gl_dither.integer) { @@ -1870,18 +1496,18 @@ void R_Shadow_EditLights_DrawSelectedLightProperties(void); int r_stereo_side; +extern void Sbar_ShowFPS(void); void SCR_DrawScreen (void) { R_Mesh_Start(); - if (r_timereport_active) - R_TimeReport("setup"); + R_TimeReport_BeginFrame(); R_UpdateVariables(); // Quake uses clockwise winding, so these are swapped - r_view.cullface_front = GL_BACK; - r_view.cullface_back = GL_FRONT; + r_refdef.view.cullface_front = GL_BACK; + r_refdef.view.cullface_back = GL_FRONT; if (cls.signon == SIGNONS) { @@ -1892,23 +1518,23 @@ void SCR_DrawScreen (void) if (r_stereo_sidebyside.integer) { - r_view.width = (int)(vid.width * size / 2.5); - r_view.height = (int)(vid.height * size / 2.5 * (1 - bound(0, r_letterbox.value, 100) / 100)); - r_view.depth = 1; - r_view.x = (int)((vid.width - r_view.width * 2.5) * 0.5); - r_view.y = (int)((vid.height - r_view.height)/2); - r_view.z = 0; + r_refdef.view.width = (int)(vid.width * size / 2.5); + r_refdef.view.height = (int)(vid.height * size / 2.5 * (1 - bound(0, r_letterbox.value, 100) / 100)); + r_refdef.view.depth = 1; + r_refdef.view.x = (int)((vid.width - r_refdef.view.width * 2.5) * 0.5); + r_refdef.view.y = (int)((vid.height - r_refdef.view.height)/2); + r_refdef.view.z = 0; if (r_stereo_side) - r_view.x += (int)(r_view.width * 1.5); + r_refdef.view.x += (int)(r_refdef.view.width * 1.5); } else { - r_view.width = (int)(vid.width * size); - r_view.height = (int)(vid.height * size * (1 - bound(0, r_letterbox.value, 100) / 100)); - r_view.depth = 1; - r_view.x = (int)((vid.width - r_view.width)/2); - r_view.y = (int)((vid.height - r_view.height)/2); - r_view.z = 0; + r_refdef.view.width = (int)(vid.width * size); + r_refdef.view.height = (int)(vid.height * size * (1 - bound(0, r_letterbox.value, 100) / 100)); + r_refdef.view.depth = 1; + r_refdef.view.x = (int)((vid.width - r_refdef.view.width)/2); + r_refdef.view.y = (int)((vid.height - r_refdef.view.height)/2); + r_refdef.view.z = 0; } // LordHavoc: viewzoom (zoom in for sniper rifles, etc) @@ -1917,12 +1543,12 @@ void SCR_DrawScreen (void) // this it simply assumes the requested fov is the vertical fov // for a 4x3 display, if the ratio is not 4x3 this makes the fov // higher/lower according to the ratio - r_view.useperspective = true; - r_view.frustum_y = tan(scr_fov.value * M_PI / 360.0) * (3.0/4.0) * cl.viewzoom; - r_view.frustum_x = r_view.frustum_y * (float)r_view.width / (float)r_view.height / vid_pixelheight.value; + r_refdef.view.useperspective = true; + r_refdef.view.frustum_y = tan(scr_fov.value * M_PI / 360.0) * (3.0/4.0) * cl.viewzoom; + r_refdef.view.frustum_x = r_refdef.view.frustum_y * (float)r_refdef.view.width / (float)r_refdef.view.height / vid_pixelheight.value; - r_view.frustum_x *= r_refdef.frustumscale_x; - r_view.frustum_y *= r_refdef.frustumscale_y; + r_refdef.view.frustum_x *= r_refdef.frustumscale_x; + r_refdef.view.frustum_y *= r_refdef.frustumscale_y; if(!CL_VM_UpdateView()) R_RenderView(); @@ -1931,19 +1557,19 @@ void SCR_DrawScreen (void) { float sizex = bound(10, scr_zoomwindow_viewsizex.value, 100) / 100.0; float sizey = bound(10, scr_zoomwindow_viewsizey.value, 100) / 100.0; - r_view.width = (int)(vid.width * sizex); - r_view.height = (int)(vid.height * sizey); - r_view.depth = 1; - r_view.x = (int)((vid.width - r_view.width)/2); - r_view.y = 0; - r_view.z = 0; + r_refdef.view.width = (int)(vid.width * sizex); + r_refdef.view.height = (int)(vid.height * sizey); + r_refdef.view.depth = 1; + r_refdef.view.x = (int)((vid.width - r_refdef.view.width)/2); + r_refdef.view.y = 0; + r_refdef.view.z = 0; - r_view.useperspective = true; - r_view.frustum_y = tan(scr_zoomwindow_fov.value * M_PI / 360.0) * (3.0/4.0) * cl.viewzoom; - r_view.frustum_x = r_view.frustum_y * vid_pixelheight.value * (float)r_view.width / (float)r_view.height; + r_refdef.view.useperspective = true; + r_refdef.view.frustum_y = tan(scr_zoomwindow_fov.value * M_PI / 360.0) * (3.0/4.0) * cl.viewzoom; + r_refdef.view.frustum_x = r_refdef.view.frustum_y * vid_pixelheight.value * (float)r_refdef.view.width / (float)r_refdef.view.height; - r_view.frustum_x *= r_refdef.frustumscale_x; - r_view.frustum_y *= r_refdef.frustumscale_y; + r_refdef.view.frustum_x *= r_refdef.frustumscale_x; + r_refdef.view.frustum_y *= r_refdef.frustumscale_y; if(!CL_VM_UpdateView()) R_RenderView(); @@ -1952,16 +1578,19 @@ void SCR_DrawScreen (void) if (!r_stereo_sidebyside.integer) { - r_view.width = vid.width; - r_view.height = vid.height; - r_view.depth = 1; - r_view.x = 0; - r_view.y = 0; - r_view.z = 0; - r_view.useperspective = false; + r_refdef.view.width = vid.width; + r_refdef.view.height = vid.height; + r_refdef.view.depth = 1; + r_refdef.view.x = 0; + r_refdef.view.y = 0; + r_refdef.view.z = 0; + r_refdef.view.useperspective = false; } // draw 2D stuff + if(!scr_con_current && !(key_consoleactive & KEY_CONSOLEACTIVE_FORCED)) + if ((key_dest == key_game || key_dest == key_message) && !r_letterbox.value) + Con_DrawNotify (); // only draw notify in game if (cls.signon == SIGNONS) { @@ -1970,6 +1599,7 @@ void SCR_DrawScreen (void) SCR_DrawPause (); if (!r_letterbox.value) Sbar_Draw(); + Sbar_ShowFPS(); SHOWLMP_drawall(); SCR_CheckDrawCenterString(); } @@ -1982,105 +1612,387 @@ void SCR_DrawScreen (void) SCR_DrawBrand(); - SCR_DrawDownload(); + SCR_DrawInfobar(); if (r_timereport_active) R_TimeReport("2d"); if (cls.signon == SIGNONS) - R_TimeReport_Frame(); + R_TimeReport_EndFrame(); DrawQ_Finish(); R_DrawGamma(); R_Mesh_Finish(); +} - if (r_timereport_active) - R_TimeReport("meshfinish"); +typedef struct loadingscreenstack_s +{ + struct loadingscreenstack_s *prev; + char msg[MAX_QPATH]; + float absolute_loading_amount_min; // this corresponds to relative completion 0 of this item + float absolute_loading_amount_len; // this corresponds to relative completion 1 of this item + float relative_completion; // 0 .. 1 +} +loadingscreenstack_t; +static loadingscreenstack_t *loadingscreenstack = NULL; +static double loadingscreentime = -1; +static qboolean loadingscreencleared = false; +static float loadingscreenheight = 0; +rtexture_t *loadingscreentexture = NULL; +static float loadingscreentexture_vertex3f[12]; +static float loadingscreentexture_texcoord2f[8]; + +static void SCR_ClearLoadingScreenTexture(void) +{ + if(loadingscreentexture) + R_FreeTexture(loadingscreentexture); + loadingscreentexture = NULL; } -void SCR_UpdateLoadingScreen (qboolean clear) +extern rtexturepool_t *r_main_texturepool; +static void SCR_SetLoadingScreenTexture(void) { - float x, y; - cachepic_t *pic; - float vertex3f[12]; - float texcoord2f[8]; - // don't do anything if not initialized yet - if (vid_hidden || !scr_refresh.integer) + int w, h; + float loadingscreentexture_w; + float loadingscreentexture_h; + + SCR_ClearLoadingScreenTexture(); + + if (gl_support_arb_texture_non_power_of_two) + { + w = vid.width; h = vid.height; + loadingscreentexture_w = loadingscreentexture_h = 1; + } + else + { + w = CeilPowerOf2(vid.width); h = CeilPowerOf2(vid.height); + loadingscreentexture_w = vid.width / (float) w; + loadingscreentexture_h = vid.height / (float) h; + } + + loadingscreentexture = R_LoadTexture2D(r_main_texturepool, "loadingscreentexture", w, h, NULL, TEXTYPE_BGRA, TEXF_FORCENEAREST | TEXF_CLAMP | TEXF_ALWAYSPRECACHE, NULL); + R_Mesh_TexBind(0, R_GetTexture(loadingscreentexture)); + GL_ActiveTexture(0); + CHECKGLERROR + qglCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, vid.width, vid.height);CHECKGLERROR + + loadingscreentexture_vertex3f[2] = loadingscreentexture_vertex3f[5] = loadingscreentexture_vertex3f[8] = loadingscreentexture_vertex3f[11] = 0; + loadingscreentexture_vertex3f[0] = loadingscreentexture_vertex3f[9] = 0; + loadingscreentexture_vertex3f[1] = loadingscreentexture_vertex3f[4] = 0; + loadingscreentexture_vertex3f[3] = loadingscreentexture_vertex3f[6] = vid_conwidth.integer; + loadingscreentexture_vertex3f[7] = loadingscreentexture_vertex3f[10] = vid_conheight.integer; + loadingscreentexture_texcoord2f[0] = 0;loadingscreentexture_texcoord2f[1] = loadingscreentexture_h; + loadingscreentexture_texcoord2f[2] = loadingscreentexture_w;loadingscreentexture_texcoord2f[3] = loadingscreentexture_h; + loadingscreentexture_texcoord2f[4] = loadingscreentexture_w;loadingscreentexture_texcoord2f[5] = 0; + loadingscreentexture_texcoord2f[6] = 0;loadingscreentexture_texcoord2f[7] = 0; +} + +void SCR_UpdateLoadingScreenIfShown(void) +{ + if(realtime == loadingscreentime) + SCR_UpdateLoadingScreen(loadingscreencleared); +} + +void SCR_PushLoadingScreen (qboolean redraw, const char *msg, float len_in_parent) +{ + loadingscreenstack_t *s = (loadingscreenstack_t *) Z_Malloc(sizeof(loadingscreenstack_t)); + s->prev = loadingscreenstack; + loadingscreenstack = s; + + strlcpy(s->msg, msg, sizeof(s->msg)); + s->relative_completion = 0; + + if(s->prev) + { + s->absolute_loading_amount_min = s->prev->absolute_loading_amount_min + s->prev->absolute_loading_amount_len * s->prev->relative_completion; + s->absolute_loading_amount_len = s->prev->absolute_loading_amount_len * len_in_parent; + if(s->absolute_loading_amount_len > s->prev->absolute_loading_amount_min + s->prev->absolute_loading_amount_len - s->absolute_loading_amount_min) + s->absolute_loading_amount_len = s->prev->absolute_loading_amount_min + s->prev->absolute_loading_amount_len - s->absolute_loading_amount_min; + } + else + { + s->absolute_loading_amount_min = 0; + s->absolute_loading_amount_len = 1; + } + + if(redraw) + SCR_UpdateLoadingScreenIfShown(); +} + +void SCR_PopLoadingScreen (qboolean redraw) +{ + loadingscreenstack_t *s = loadingscreenstack; + + if(!s) + { + Con_DPrintf("Popping a loading screen item from an empty stack!\n"); return; + } + + loadingscreenstack = s->prev; + if(s->prev) + s->prev->relative_completion = (s->absolute_loading_amount_min + s->absolute_loading_amount_len - s->prev->absolute_loading_amount_min) / s->prev->absolute_loading_amount_len; + Z_Free(s); + + if(redraw) + SCR_UpdateLoadingScreenIfShown(); +} + +void SCR_ClearLoadingScreen (qboolean redraw) +{ + while(loadingscreenstack) + SCR_PopLoadingScreen(redraw && !loadingscreenstack->prev); +} + +static float SCR_DrawLoadingStack_r(loadingscreenstack_t *s, float y) +{ + float size = 8; + float x; + size_t len; + float total; + + total = 0; +#if 0 + if(s) + { + total += SCR_DrawLoadingStack_r(s->prev, y); + y -= total; + if(!s->prev || strcmp(s->msg, s->prev->msg)) + { + len = strlen(s->msg); + x = (vid_conwidth.integer - DrawQ_TextWidth_Font(s->msg, len, true, FONT_INFOBAR) * size) / 2; + y -= size; + DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, 1, 0); + DrawQ_String_Font(x, y, s->msg, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); + total += size; + } + } +#else + if(s) + { + len = strlen(s->msg); + x = (vid_conwidth.integer - DrawQ_TextWidth_Font(s->msg, len, true, FONT_INFOBAR) * size) / 2; + y -= size; + DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, 1, 0); + DrawQ_String_Font(x, y, s->msg, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR); + total += size; + } +#endif + return total; +} + +static void SCR_DrawLoadingStack(void) +{ + float verts[12]; + float colors[16]; + int i; + + loadingscreenheight = SCR_DrawLoadingStack_r(loadingscreenstack, vid_conheight.integer); + if(loadingscreenstack) + { + // height = 32; // sorry, using the actual one is ugly + GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); + GL_DepthRange(0, 1); + GL_PolygonOffset(0, 0); + GL_DepthTest(false); + R_Mesh_VertexPointer(verts, 0, 0); + R_Mesh_ColorPointer(colors, 0, 0); + R_Mesh_ResetTextureState(); + R_SetupGenericShader(false); + verts[2] = verts[5] = verts[8] = verts[11] = 0; + verts[0] = verts[9] = 0; + verts[1] = verts[4] = vid_conheight.integer - 8; + verts[3] = verts[6] = vid_conwidth.integer * loadingscreenstack->absolute_loading_amount_min; + verts[7] = verts[10] = vid_conheight.integer; + + for(i = 0; i < 16; ++i) + colors[i] = (i % 4 == 3) ? 1 : (i >= 8 && i % 4 == 2) ? 1 : 0; + // ^^^^^^^^^^ blue component + // ^^^^^^ bottom row + // ^^^^^^^^^^^^ alpha is always on + R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, polygonelement3s, 0, 0); + + // make sure everything is cleared, including the progress indicator + if(loadingscreenheight < 8) + loadingscreenheight = 8; + } +} + +static cachepic_t *loadingscreenpic; +static float loadingscreenpic_vertex3f[12]; +static float loadingscreenpic_texcoord2f[8]; + +static void SCR_DrawLoadingScreen_SharedSetup (qboolean clear) +{ + r_viewport_t viewport; + float x, y; + // release mouse grab while loading + if (!vid.fullscreen) + VID_SetMouse(false, false, false); CHECKGLERROR - qglViewport(0, 0, vid.width, vid.height);CHECKGLERROR + R_Viewport_InitOrtho(&viewport, &identitymatrix, 0, 0, vid.width, vid.height, 0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100, NULL); + R_SetViewport(&viewport); //qglDisable(GL_SCISSOR_TEST);CHECKGLERROR //qglDepthMask(1);CHECKGLERROR qglColorMask(1,1,1,1);CHECKGLERROR qglClearColor(0,0,0,0);CHECKGLERROR // when starting up a new video mode, make sure the screen is cleared to black if (clear) - { qglClear(GL_COLOR_BUFFER_BIT);CHECKGLERROR - } - //qglDisable(GL_CULL_FACE);CHECKGLERROR - //R_ClearScreen(); R_Textures_Frame(); - GL_SetupView_Mode_Ortho(0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100); R_Mesh_Start(); R_Mesh_Matrix(&identitymatrix); // draw the loading plaque - pic = Draw_CachePic("gfx/loading", true); - x = (vid_conwidth.integer - pic->width)/2; - y = (vid_conheight.integer - pic->height)/2; + loadingscreenpic = Draw_CachePic ("gfx/loading"); + x = (vid_conwidth.integer - loadingscreenpic->width)/2; + y = (vid_conheight.integer - loadingscreenpic->height)/2; + loadingscreenpic_vertex3f[2] = loadingscreenpic_vertex3f[5] = loadingscreenpic_vertex3f[8] = loadingscreenpic_vertex3f[11] = 0; + loadingscreenpic_vertex3f[0] = loadingscreenpic_vertex3f[9] = x; + loadingscreenpic_vertex3f[1] = loadingscreenpic_vertex3f[4] = y; + loadingscreenpic_vertex3f[3] = loadingscreenpic_vertex3f[6] = x + loadingscreenpic->width; + loadingscreenpic_vertex3f[7] = loadingscreenpic_vertex3f[10] = y + loadingscreenpic->height; + loadingscreenpic_texcoord2f[0] = 0;loadingscreenpic_texcoord2f[1] = 0; + loadingscreenpic_texcoord2f[2] = 1;loadingscreenpic_texcoord2f[3] = 0; + loadingscreenpic_texcoord2f[4] = 1;loadingscreenpic_texcoord2f[5] = 1; + loadingscreenpic_texcoord2f[6] = 0;loadingscreenpic_texcoord2f[7] = 1; +} + +static void SCR_DrawLoadingScreen (qboolean clear) +{ + // we only need to draw the image if it isn't already there GL_Color(1,1,1,1); GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); GL_DepthRange(0, 1); GL_PolygonOffset(0, 0); GL_DepthTest(false); - R_Mesh_VertexPointer(vertex3f, 0, 0); + R_SetupGenericShader(true); R_Mesh_ColorPointer(NULL, 0, 0); + if(loadingscreentexture) + { + R_Mesh_VertexPointer(loadingscreentexture_vertex3f, 0, 0); + R_Mesh_ResetTextureState(); + R_Mesh_TexBind(0, R_GetTexture(loadingscreentexture)); + R_Mesh_TexCoordPointer(0, 2, loadingscreentexture_texcoord2f, 0, 0); + R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, polygonelement3s, 0, 0); + } + R_Mesh_VertexPointer(loadingscreenpic_vertex3f, 0, 0); R_Mesh_ResetTextureState(); - R_Mesh_TexBind(0, R_GetTexture(pic->tex)); - R_Mesh_TexCoordPointer(0, 2, texcoord2f, 0, 0); - vertex3f[2] = vertex3f[5] = vertex3f[8] = vertex3f[11] = 0; - vertex3f[0] = vertex3f[9] = x; - vertex3f[1] = vertex3f[4] = y; - vertex3f[3] = vertex3f[6] = x + pic->width; - vertex3f[7] = vertex3f[10] = y + pic->height; - texcoord2f[0] = 0;texcoord2f[1] = 0; - texcoord2f[2] = 1;texcoord2f[3] = 0; - texcoord2f[4] = 1;texcoord2f[5] = 1; - texcoord2f[6] = 0;texcoord2f[7] = 1; + R_Mesh_TexBind(0, R_GetTexture(loadingscreenpic->tex)); + R_Mesh_TexCoordPointer(0, 2, loadingscreenpic_texcoord2f, 0, 0); + R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, polygonelement3s, 0, 0); + SCR_DrawLoadingStack(); +} + +static void SCR_DrawLoadingScreen_SharedFinish (qboolean clear) +{ + R_Mesh_Finish(); + // refresh + VID_Finish(); + // however this IS necessary on Windows Vista + qglFinish(); +} + +void SCR_UpdateLoadingScreen (qboolean clear) +{ + keydest_t old_key_dest; + int old_key_consoleactive; + + // don't do anything if not initialized yet + if (vid_hidden || cls.state == ca_dedicated) + return; + + if(loadingscreentime == realtime) + clear |= loadingscreencleared; + + if(clear) + SCR_ClearLoadingScreenTexture(); + else if(loadingscreentime != realtime) + SCR_SetLoadingScreenTexture(); + + if(loadingscreentime != realtime) + { + loadingscreentime = realtime; + loadingscreenheight = 0; + } + loadingscreencleared = clear; + + SCR_DrawLoadingScreen_SharedSetup(clear); if (vid.stereobuffer) { - qglDrawBuffer(GL_FRONT_LEFT); - R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0); - qglDrawBuffer(GL_FRONT_RIGHT); - R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0); + qglDrawBuffer(GL_BACK_LEFT); + SCR_DrawLoadingScreen(clear); + qglDrawBuffer(GL_BACK_RIGHT); + SCR_DrawLoadingScreen(clear); } else { - qglDrawBuffer(GL_FRONT); - R_Mesh_Draw(0, 4, 2, polygonelements, 0, 0); + qglDrawBuffer(GL_BACK); + SCR_DrawLoadingScreen(clear); } - R_Mesh_Finish(); - // refresh - // not necessary when rendering to GL_FRONT buffers - //VID_Finish(false); - // however this IS necessary on Windows Vista - qglFinish(); + SCR_DrawLoadingScreen_SharedFinish(clear); + + // this goes into the event loop, and should prevent unresponsive cursor on vista + old_key_dest = key_dest; + old_key_consoleactive = key_consoleactive; + key_dest = key_void; + key_consoleactive = false; + Sys_SendKeyEvents(); + key_dest = old_key_dest; + key_consoleactive = old_key_consoleactive; } +qboolean R_Stereo_ColorMasking(void) +{ + return r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer; +} + +qboolean R_Stereo_Active(void) +{ + return (vid.stereobuffer || r_stereo_sidebyside.integer || R_Stereo_ColorMasking()); +} + +extern cvar_t cl_minfps; +extern cvar_t cl_minfps_fade; +extern cvar_t cl_minfps_qualitymax; +extern cvar_t cl_minfps_qualitymin; +extern cvar_t cl_minfps_qualitypower; +extern cvar_t cl_minfps_qualityscale; +static double cl_updatescreen_rendertime = 0; +static double cl_updatescreen_quality = 1; +extern void Sbar_ShowFPS_Update(void); void CL_UpdateScreen(void) { + double rendertime1; float conwidth, conheight; + float f; - if (vid_hidden || !scr_refresh.integer) - return; + Sbar_ShowFPS_Update(); - if (!scr_initialized || !con_initialized) + if (!scr_initialized || !con_initialized || !scr_refresh.integer) return; // not initialized yet - conwidth = bound(320, vid_conwidth.value, 2048); - conheight = bound(200, vid_conheight.value, 1536); + if(gamemode == GAME_NEXUIZ) + { + // play a bit with the palette (experimental) + palette_rgb_pantscolormap[15][0] = (unsigned char) (128 + 127 * sin(cl.time / exp(1.0f) + 0.0f*M_PI/3.0f)); + palette_rgb_pantscolormap[15][1] = (unsigned char) (128 + 127 * sin(cl.time / exp(1.0f) + 2.0f*M_PI/3.0f)); + palette_rgb_pantscolormap[15][2] = (unsigned char) (128 + 127 * sin(cl.time / exp(1.0f) + 4.0f*M_PI/3.0f)); + palette_rgb_shirtcolormap[15][0] = (unsigned char) (128 + 127 * sin(cl.time / M_PI + 5.0f*M_PI/3.0f)); + palette_rgb_shirtcolormap[15][1] = (unsigned char) (128 + 127 * sin(cl.time / M_PI + 3.0f*M_PI/3.0f)); + palette_rgb_shirtcolormap[15][2] = (unsigned char) (128 + 127 * sin(cl.time / M_PI + 1.0f*M_PI/3.0f)); + memcpy(palette_rgb_pantsscoreboard[15], palette_rgb_pantscolormap[15], sizeof(*palette_rgb_pantscolormap)); + memcpy(palette_rgb_shirtscoreboard[15], palette_rgb_shirtcolormap[15], sizeof(*palette_rgb_shirtcolormap)); + } + + if (vid_hidden) + return; + + rendertime1 = Sys_DoubleTime(); + + conwidth = bound(160, vid_conwidth.value, 32768); + conheight = bound(90, vid_conheight.value, 24576); if (vid_conwidth.value != conwidth) Cvar_SetValue("vid_conwidth", conwidth); if (vid_conheight.value != conheight) @@ -2121,25 +2033,24 @@ void CL_UpdateScreen(void) sb_lines = 24+16+8; } - r_view.colormask[0] = 1; - r_view.colormask[1] = 1; - r_view.colormask[2] = 1; - - if (r_timereport_active) - R_TimeReport("other"); + r_refdef.view.colormask[0] = 1; + r_refdef.view.colormask[1] = 1; + r_refdef.view.colormask[2] = 1; SCR_SetUpToDrawConsole(); - if (r_timereport_active) - R_TimeReport("start"); - CHECKGLERROR + qglDrawBuffer(GL_BACK);CHECKGLERROR qglViewport(0, 0, vid.width, vid.height);CHECKGLERROR qglDisable(GL_SCISSOR_TEST);CHECKGLERROR qglDepthMask(1);CHECKGLERROR qglColorMask(1,1,1,1);CHECKGLERROR qglClearColor(0,0,0,0);CHECKGLERROR - qglClear(GL_COLOR_BUFFER_BIT);CHECKGLERROR + R_ClearScreen(false); + r_refdef.view.clear = false; + r_refdef.view.isoverlay = false; + f = pow((float)cl_updatescreen_quality, cl_minfps_qualitypower.value) * cl_minfps_qualityscale.value; + r_refdef.view.quality = bound(cl_minfps_qualitymin.value, f, cl_minfps_qualitymax.value); if(scr_stipple.integer) { @@ -2163,26 +2074,21 @@ void CL_UpdateScreen(void) else qglDisable(GL_POLYGON_STIPPLE); - if (r_timereport_active) - R_TimeReport("clear"); - - qglDrawBuffer(GL_BACK); - - if (vid.stereobuffer || r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer || r_stereo_sidebyside.integer) + if (R_Stereo_Active()) { - matrix4x4_t originalmatrix = r_view.matrix; + matrix4x4_t originalmatrix = r_refdef.view.matrix; matrix4x4_t offsetmatrix; Matrix4x4_CreateFromQuakeEntity(&offsetmatrix, 0, r_stereo_separation.value * 0.5f, 0, 0, r_stereo_angle.value * 0.5f, 0, 1); - Matrix4x4_Concat(&r_view.matrix, &originalmatrix, &offsetmatrix); + Matrix4x4_Concat(&r_refdef.view.matrix, &originalmatrix, &offsetmatrix); if (r_stereo_sidebyside.integer) r_stereo_side = 0; if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer) { - r_view.colormask[0] = 1; - r_view.colormask[1] = 0; - r_view.colormask[2] = 0; + r_refdef.view.colormask[0] = 1; + r_refdef.view.colormask[1] = 0; + r_refdef.view.colormask[2] = 0; } if (vid.stereobuffer) @@ -2191,16 +2097,16 @@ void CL_UpdateScreen(void) SCR_DrawScreen(); Matrix4x4_CreateFromQuakeEntity(&offsetmatrix, 0, r_stereo_separation.value * -0.5f, 0, 0, r_stereo_angle.value * -0.5f, 0, 1); - Matrix4x4_Concat(&r_view.matrix, &originalmatrix, &offsetmatrix); + Matrix4x4_Concat(&r_refdef.view.matrix, &originalmatrix, &offsetmatrix); if (r_stereo_sidebyside.integer) r_stereo_side = 1; if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer) { - r_view.colormask[0] = 0; - r_view.colormask[1] = r_stereo_redcyan.integer || r_stereo_redgreen.integer; - r_view.colormask[2] = r_stereo_redcyan.integer || r_stereo_redblue.integer; + r_refdef.view.colormask[0] = 0; + r_refdef.view.colormask[1] = r_stereo_redcyan.integer || r_stereo_redgreen.integer; + r_refdef.view.colormask[2] = r_stereo_redcyan.integer || r_stereo_redblue.integer; } if (vid.stereobuffer) @@ -2208,19 +2114,35 @@ void CL_UpdateScreen(void) SCR_DrawScreen(); - r_view.matrix = originalmatrix; + r_refdef.view.matrix = originalmatrix; } else SCR_DrawScreen(); SCR_CaptureVideo(); - VID_Finish(true); - if (r_timereport_active) - R_TimeReport("finish"); + // quality adjustment according to render time + qglFlush(); + cl_updatescreen_rendertime += ((Sys_DoubleTime() - rendertime1) - cl_updatescreen_rendertime) * bound(0, cl_minfps_fade.value, 1); + if (cl_minfps.value > 0 && cl_updatescreen_rendertime > 0 && !cls.timedemo && (!cls.capturevideo.active || !cls.capturevideo.realtime)) + cl_updatescreen_quality = 1 / (cl_updatescreen_rendertime * cl_minfps.value); + else + cl_updatescreen_quality = 1; + + if (!vid_activewindow) + VID_SetMouse(false, false, false); + else if (key_consoleactive) + VID_SetMouse(vid.fullscreen, false, false); + else if (key_dest == key_menu_grabbed) + VID_SetMouse(true, vid_mouse.integer && !in_client_mouse, true); + else if (key_dest == key_menu) + VID_SetMouse(vid.fullscreen, vid_mouse.integer && !in_client_mouse, true); + else + VID_SetMouse(vid.fullscreen, vid_mouse.integer && !cl.csqc_wantsmousemove && (!cls.demoplayback || cl_demo_mousegrab.integer), true); + + VID_Finish(); } void CL_Screen_NewMap(void) { - SHOWLMP_clear(); }