X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=cl_screen.c;h=473d8a60c49b4171682edef7aa46ed70d09e0bc8;hb=b678677fe374b9ae4f591cbf23ca62a19f890722;hp=52d93d4564ffb6d0ad339be4a4c88c9f65a9e9ac;hpb=cc3473e216fce052672ec4600896124584866e52;p=xonotic%2Fdarkplaces.git diff --git a/cl_screen.c b/cl_screen.c index 52d93d45..473d8a60 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -49,6 +49,7 @@ cvar_t scr_zoomwindow_fov = {CVAR_SAVE, "scr_zoomwindow_fov", "20", "fov of zoom 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 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 @@ -81,6 +82,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; /* ============== @@ -146,7 +149,7 @@ void SCR_DrawCenterString (void) int l = newline ? (newline - start) : (int)strlen(start); float width = DrawQ_TextWidth_Font(start, l, false, FONT_CENTERPRINT) * 8; - x = (vid_conwidth.integer - width)/2; + x = (int) (vid_conwidth.integer - width)/2; if (l > 0) { if (remaining < l) @@ -442,7 +445,7 @@ SCR_DrawQWDownload */ static int SCR_DrawQWDownload(int offset) { - // sync with SCR_DownloadHeight + // sync with SCR_InfobarHeight int len; float x, y; float size = 8; @@ -466,12 +469,30 @@ 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 - DrawQ_TextWidth_Font(temp, len, 0, FONT_INFOBAR) * 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, 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; +} /* ============== @@ -480,7 +501,7 @@ SCR_DrawCurlDownload */ static int SCR_DrawCurlDownload(int offset) { - // sync with SCR_DownloadHeight + // sync with SCR_InfobarHeight int len; int nDownloads; int i; @@ -499,7 +520,7 @@ static int SCR_DrawCurlDownload(int offset) if(addinfo) { len = (int)strlen(addinfo); - x = (vid_conwidth.integer - DrawQ_TextWidth_Font(addinfo, len, false, FONT_INFOBAR) * size) / 2; + 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); } @@ -513,7 +534,7 @@ 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 - DrawQ_TextWidth_Font(temp, len, false, FONT_INFOBAR) * size) / 2; + 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); } @@ -525,27 +546,34 @@ static int SCR_DrawCurlDownload(int offset) /* ============== -SCR_DrawDownload +SCR_DrawInfobar ============== */ -static void SCR_DrawDownload() +static void SCR_DrawInfobar() { 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_DownloadHeight() +static int SCR_InfobarHeight() { 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 += 0; + offset += 8; downinfo = Curl_GetDownloadInfo(&nDownloads, &addinfo); if(downinfo) @@ -557,6 +585,23 @@ static int SCR_DownloadHeight() 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"); + } +} //============================================================================= /* @@ -603,7 +648,7 @@ SCR_DrawConsole */ void SCR_DrawConsole (void) { - scr_con_margin_bottom = SCR_DownloadHeight(); + scr_con_margin_bottom = SCR_InfobarHeight(); if (key_consoleactive & KEY_CONSOLEACTIVE_FORCED) { // full screen @@ -697,18 +742,23 @@ void R_TimeReport_EndFrame(void) // 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(string + strlen(string), "Location: %s\n", loc->name); - sprintf(string + strlen(string), "%3i renders org:'%+8.2f %+8.2f %+8.2f' dir:'%+2.3f %+2.3f %+2.3f'\n", 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]); - sprintf(string + strlen(string), "%7i surfaces%7i triangles %5i entities (%7i surfaces%7i triangles)\n", r_refdef.stats.world_surfaces, r_refdef.stats.world_triangles, r_refdef.stats.entities, r_refdef.stats.entities_surfaces, r_refdef.stats.entities_triangles); - sprintf(string + strlen(string), "%5i leafs%5i portals%6i/%6i particles%6i/%6i decals %3i%% quality\n", 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)); - sprintf(string + strlen(string), "%7i lightmap updates (%7i pixels)\n", r_refdef.stats.lightmapupdates, r_refdef.stats.lightmapupdatepixels); - sprintf(string + strlen(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(string + strlen(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(string + strlen(string), "rendered%6i meshes%8i triangles\n", r_refdef.stats.meshes, r_refdef.stats.meshes_elements / 3); - strlcat(string, r_speeds_timestring, sizeof(string)); + dpsnprintf(string, sizeof(string), +"%s%s\n" +"%3i renders org:'%+8.2f %+8.2f %+8.2f' dir:'%+2.3f %+2.3f %+2.3f'\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] +, 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)); @@ -819,11 +869,13 @@ 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_initialized = true; } @@ -844,11 +896,11 @@ void SCR_ScreenShot_f (void) unsigned char *buffer3; qboolean jpeg = (scr_screenshot_jpeg.integer != 0); - sprintf (base, "screenshots/%s", scr_screenshot_name.string); + dpsnprintf (base, sizeof(base), "screenshots/%s", scr_screenshot_name.string); if (strcmp (oldname, scr_screenshot_name.string)) { - sprintf(oldname, "%s", scr_screenshot_name.string); + dpsnprintf(oldname, sizeof(oldname), "%s", scr_screenshot_name.string); shotnumber = 0; } @@ -862,7 +914,7 @@ void SCR_ScreenShot_f (void) return; } - sprintf(filename, "%s%06d.%s", base, shotnumber, jpeg ? "jpg" : "tga"); + dpsnprintf(filename, sizeof(filename), "%s%06d.%s", base, 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); @@ -977,7 +1029,7 @@ static void GrowBuf(sizebuf_t *buf, int extralen) unsigned char *olddata; olddata = buf->data; buf->maxsize = max(buf->maxsize * 2, 4096); - buf->data = Mem_Alloc(tempmempool, buf->maxsize); + buf->data = (unsigned char *) Mem_Alloc(tempmempool, buf->maxsize); if(olddata) { memcpy(buf->data, olddata, oldsize); @@ -1121,7 +1173,7 @@ static void FindFraction(double val, int *num, int *denom, int denomMax) for(i = 1; i <= denomMax; ++i) { - int inum = floor(0.5 + val * i); + int inum = (int) floor(0.5 + val * i); double diff = fabs(val - inum / (double)i); if(diff < bestdiff) { @@ -1220,7 +1272,7 @@ Cr = R * .500 + G * -.419 + B * -.0813 + 128.; //else { cls.capturevideo.format = CAPTUREVIDEOFORMAT_AVI_I420; - cls.capturevideo.videofile = FS_Open (va("%s.avi", cls.capturevideo.basename), "wb", false, true); + cls.capturevideo.videofile = FS_OpenRealFile(va("%s.avi", cls.capturevideo.basename), "wb", false); 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 "); @@ -1527,12 +1579,12 @@ static void SCR_ScaleDownBGRA(unsigned char *in, int inw, int inh, unsigned char 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 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; @@ -1549,10 +1601,10 @@ static void SCR_ScaleDownBGRA(unsigned char *in, int inw, int inh, unsigned char } } - out[4*(x + outw * y)+0] = r * area; - out[4*(x + outw * y)+1] = g * area; - out[4*(x + outw * y)+2] = b * area; - out[4*(x + outw * y)+3] = alpha * 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); } } } @@ -1733,7 +1785,7 @@ static void R_Envmap_f (void) for (j = 0;j < 12;j++) { - sprintf(filename, "env/%s%s.tga", basename, envmapinfo[j].name); + 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; @@ -1786,7 +1838,7 @@ void SHOWLMP_decodeshow(void) { showlmp_t *oldshowlmps = cl.showlmps; cl.max_showlmps += 16; - cl.showlmps = Mem_Alloc(cls.levelmempool, cl.max_showlmps * sizeof(showlmp_t)); + 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) @@ -2013,7 +2065,7 @@ void SCR_DrawScreen (void) SCR_DrawBrand(); - SCR_DrawDownload(); + SCR_DrawInfobar(); if (r_timereport_active) R_TimeReport("2d"); @@ -2120,12 +2172,12 @@ void CL_UpdateScreen(void) if(gamemode == GAME_NEXUIZ) { // play a bit with the palette (experimental) - palette_rgb_pantscolormap[15][0] = 128 + 127 * sin(cl.time / exp(1) + 0*M_PI/3); - palette_rgb_pantscolormap[15][1] = 128 + 127 * sin(cl.time / exp(1) + 2*M_PI/3); - palette_rgb_pantscolormap[15][2] = 128 + 127 * sin(cl.time / exp(1) + 4*M_PI/3); - palette_rgb_shirtcolormap[15][0] = 128 + 127 * sin(cl.time / M_PI + 5*M_PI/3); - palette_rgb_shirtcolormap[15][1] = 128 + 127 * sin(cl.time / M_PI + 3*M_PI/3); - palette_rgb_shirtcolormap[15][2] = 128 + 127 * sin(cl.time / M_PI + 1*M_PI/3); + palette_rgb_pantscolormap[15][0] = (unsigned char) (128 + 127 * sin(cl.time / exp(1) + 0*M_PI/3)); + palette_rgb_pantscolormap[15][1] = (unsigned char) (128 + 127 * sin(cl.time / exp(1) + 2*M_PI/3)); + palette_rgb_pantscolormap[15][2] = (unsigned char) (128 + 127 * sin(cl.time / exp(1) + 4*M_PI/3)); + palette_rgb_shirtcolormap[15][0] = (unsigned char) (128 + 127 * sin(cl.time / M_PI + 5*M_PI/3)); + palette_rgb_shirtcolormap[15][1] = (unsigned char) (128 + 127 * sin(cl.time / M_PI + 3*M_PI/3)); + palette_rgb_shirtcolormap[15][2] = (unsigned char) (128 + 127 * sin(cl.time / M_PI + 1*M_PI/3)); 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)); } @@ -2277,11 +2329,11 @@ void CL_UpdateScreen(void) else if (key_consoleactive) VID_SetMouse(vid.fullscreen, false, false); else if (key_dest == key_menu_grabbed) - VID_SetMouse(true, !in_client_mouse, true); + VID_SetMouse(true, vid_mouse.integer && !in_client_mouse, true); else if (key_dest == key_menu) - VID_SetMouse(vid.fullscreen, !in_client_mouse, true); + VID_SetMouse(vid.fullscreen, vid_mouse.integer && !in_client_mouse, true); else - VID_SetMouse(vid.fullscreen, vid_mouse.integer && !cls.demoplayback && !cl.csqc_wantsmousemove, true); + VID_SetMouse(vid.fullscreen, vid_mouse.integer && !cl.csqc_wantsmousemove && (!cls.demoplayback || cl_demo_mousegrab.integer), true); VID_Finish(); }