#include "cl_collision.h"
#include "libcurl.h"
#include "csprogs.h"
+#include "r_stats.h"
#ifdef CONFIG_VIDEO_CAPTURE
#include "cap_avi.h"
#include "cap_ogg.h"
cvar_t scr_conalpha2factor = {CF_CLIENT | CF_ARCHIVE, "scr_conalpha2factor", "0", "opacity of console background gfx/conback2 relative to scr_conalpha; when 0, gfx/conback2 is not drawn"};
cvar_t scr_conalpha3factor = {CF_CLIENT | CF_ARCHIVE, "scr_conalpha3factor", "0", "opacity of console background gfx/conback3 relative to scr_conalpha; when 0, gfx/conback3 is not drawn"};
cvar_t scr_conbrightness = {CF_CLIENT | CF_ARCHIVE, "scr_conbrightness", "1", "brightness of console background (0 = black, 1 = image)"};
-cvar_t scr_conforcewhiledisconnected = {CF_CLIENT, "scr_conforcewhiledisconnected", "1", "forces fullscreen console while disconnected"};
+cvar_t scr_conforcewhiledisconnected = {CF_CLIENT, "scr_conforcewhiledisconnected", "1", "1 forces fullscreen console while disconnected, 2 also forces it when the listen server has started but the client is still loading"};
+cvar_t scr_conheight = {CF_CLIENT | CF_ARCHIVE, "scr_conheight", "0.5", "fraction of screen height occupied by console (reduced as necessary for visibility of loading progress and infobar)"};
cvar_t scr_conscroll_x = {CF_CLIENT | CF_ARCHIVE, "scr_conscroll_x", "0", "scroll speed of gfx/conback in x direction"};
cvar_t scr_conscroll_y = {CF_CLIENT | CF_ARCHIVE, "scr_conscroll_y", "0", "scroll speed of gfx/conback in y direction"};
cvar_t scr_conscroll2_x = {CF_CLIENT | CF_ARCHIVE, "scr_conscroll2_x", "0", "scroll speed of gfx/conback2 in x direction"};
cvar_t scr_loadingscreen_firstforstartup = {CF_CLIENT, "scr_loadingscreen_firstforstartup","0", "remove loading.tga from random scr_loadingscreen_count selection and only display it on client startup, 0 = normal, 1 = firstforstartup"};
cvar_t scr_loadingscreen_barcolor = {CF_CLIENT, "scr_loadingscreen_barcolor", "0 0 1", "rgb color of loadingscreen progress bar"};
cvar_t scr_loadingscreen_barheight = {CF_CLIENT, "scr_loadingscreen_barheight", "8", "the height of the loadingscreen progress bar"};
-cvar_t scr_loadingscreen_maxfps = {CF_CLIENT, "scr_loadingscreen_maxfps", "10", "restrict maximal FPS for loading screen so it will not update very often (this will make lesser loading times on a maps loading large number of models)"};
+cvar_t scr_loadingscreen_maxfps = {CF_CLIENT, "scr_loadingscreen_maxfps", "20", "maximum FPS for loading screen so it will not update very often (this reduces loading time with lots of models)"};
cvar_t scr_infobar_height = {CF_CLIENT, "scr_infobar_height", "8", "the height of the infobar items"};
cvar_t vid_conwidthauto = {CF_CLIENT | CF_ARCHIVE, "vid_conwidthauto", "1", "automatically update vid_conwidth to match aspect ratio"};
cvar_t vid_conwidth = {CF_CLIENT | CF_ARCHIVE, "vid_conwidth", "640", "virtual width of 2D graphics system (note: changes may be overwritten, see vid_conwidthauto)"};
cvar_t timedemo_screenshotframelist = {CF_CLIENT, "timedemo_screenshotframelist", "", "when performing a timedemo, take screenshots of each frame in this space-separated list - example: 1 201 401"};
cvar_t vid_touchscreen_outlinealpha = {CF_CLIENT, "vid_touchscreen_outlinealpha", "0", "opacity of touchscreen area outlines"};
cvar_t vid_touchscreen_overlayalpha = {CF_CLIENT, "vid_touchscreen_overlayalpha", "0.25", "opacity of touchscreen area icons"};
-cvar_t r_speeds_graph = {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph", "0", "display a graph of renderer statistics "};
-cvar_t r_speeds_graph_filter[8] =
-{
- {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_filter_r", "timedelta", "Red - display the specified renderer statistic"},
- {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_filter_g", "batch_batches", "Green - display the specified renderer statistic"},
- {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_filter_b", "batch_triangles", "Blue - display the specified renderer statistic"},
- {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_filter_y", "fast_triangles", "Yellow - display the specified renderer statistic"},
- {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_filter_c", "copytriangles_triangles", "Cyan - display the specified renderer statistic"},
- {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_filter_m", "dynamic_triangles", "Magenta - display the specified renderer statistic"},
- {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_filter_w", "animcache_shade_vertices", "White - display the specified renderer statistic"},
- {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_filter_o", "animcache_shape_vertices", "Orange - display the specified renderer statistic"},
-};
-cvar_t r_speeds_graph_length = {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_length", "1024", "number of frames in statistics graph, can be from 4 to 8192"};
-cvar_t r_speeds_graph_seconds = {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_seconds", "2", "number of seconds in graph, can be from 0.1 to 120"};
-cvar_t r_speeds_graph_x = {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_x", "0", "position of graph"};
-cvar_t r_speeds_graph_y = {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_y", "0", "position of graph"};
-cvar_t r_speeds_graph_width = {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_width", "256", "size of graph"};
-cvar_t r_speeds_graph_height = {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_height", "128", "size of graph"};
-cvar_t r_speeds_graph_maxtimedelta = {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_maxtimedelta", "16667", "maximum timedelta to display in the graph (this value will be the top line)"};
-cvar_t r_speeds_graph_maxdefault = {CF_CLIENT | CF_ARCHIVE, "r_speeds_graph_maxdefault", "100", "if the minimum and maximum observed values are closer than this, use this value as the graph range (keeps small numbers from being big graphs)"};
-
-
extern cvar_t sbar_info_pos;
extern cvar_t r_fog_clear;
qbool scr_initialized; // ready to draw
-float scr_con_current;
-int scr_con_margin_bottom;
+static qbool scr_loading = false; // we are in a loading screen
+
+unsigned int scr_con_current;
+static unsigned int scr_con_margin_bottom;
extern int con_vislines;
*/
static void SCR_DrawInfobar(void)
{
- int offset = 0;
+ unsigned int offset = 0;
offset += SCR_DrawQWDownload(offset);
offset += SCR_DrawCurlDownload(offset);
if(scr_infobartime_off > 0)
offset += SCR_DrawInfobarString(offset);
+ if(!offset && scr_loading)
+ offset = scr_loadingscreen_barheight.integer;
if(offset != scr_con_margin_bottom)
Con_DPrintf("broken console margin calculation: %d != %d\n", offset, scr_con_margin_bottom);
}
*/
static void SCR_SetUpToDrawConsole (void)
{
- // lines of console to display
- float conlines;
#ifdef CONFIG_MENU
static int framecounter = 0;
#endif
else
key_consoleactive &= ~KEY_CONSOLEACTIVE_FORCED;
-// decide on the height of the console
+ // decide on the height of the console
if (key_consoleactive & KEY_CONSOLEACTIVE_USER)
- conlines = vid_conheight.integer/2; // half screen
+ scr_con_current = vid_conheight.integer * scr_conheight.value;
else
- conlines = 0; // none visible
-
- scr_con_current = conlines;
+ scr_con_current = 0; // none visible
}
/*
*/
void SCR_DrawConsole (void)
{
- scr_con_margin_bottom = SCR_InfobarHeight();
+ // infobar and loading progress are not drawn simultaneously
+ scr_con_margin_bottom = SCR_InfobarHeight() ?: scr_loading * scr_loadingscreen_barheight.integer;
if (key_consoleactive & KEY_CONSOLEACTIVE_FORCED)
{
// full screen
Con_DrawConsole (vid_conheight.integer - scr_con_margin_bottom);
}
else if (scr_con_current)
- Con_DrawConsole (min((int)scr_con_current, vid_conheight.integer - scr_con_margin_bottom));
+ Con_DrawConsole (min(scr_con_current, vid_conheight.integer - scr_con_margin_bottom));
else
con_vislines = 0;
}
-qbool scr_loading = false;
-
-/*
-===============
-SCR_BeginLoadingPlaque
-
-================
-*/
-void SCR_BeginLoadingPlaque (qbool startup)
-{
- scr_loading = true;
- SCR_UpdateLoadingScreen(false, startup);
-}
-
-void SCR_EndLoadingPlaque(void)
-{
- scr_loading = false;
-}
-
//=============================================================================
-const char *r_stat_name[r_stat_count] =
-{
- "timedelta",
- "quality",
- "renders",
- "entities",
- "entities_surfaces",
- "entities_triangles",
- "world_leafs",
- "world_portals",
- "world_surfaces",
- "world_triangles",
- "lightmapupdates",
- "lightmapupdatepixels",
- "particles",
- "drawndecals",
- "totaldecals",
- "draws",
- "draws_vertices",
- "draws_elements",
- "lights",
- "lights_clears",
- "lights_scissored",
- "lights_lighttriangles",
- "lights_shadowtriangles",
- "lights_dynamicshadowtriangles",
- "bouncegrid_lights",
- "bouncegrid_particles",
- "bouncegrid_traces",
- "bouncegrid_hits",
- "bouncegrid_splats",
- "bouncegrid_bounces",
- "photoncache_animated",
- "photoncache_cached",
- "photoncache_traced",
- "bloom",
- "bloom_copypixels",
- "bloom_drawpixels",
- "rendertargets_used",
- "rendertargets_pixels",
- "indexbufferuploadcount",
- "indexbufferuploadsize",
- "vertexbufferuploadcount",
- "vertexbufferuploadsize",
- "framedatacurrent",
- "framedatasize",
- "bufferdatacurrent_vertex", // R_BUFFERDATA_ types are added to this index
- "bufferdatacurrent_index16",
- "bufferdatacurrent_index32",
- "bufferdatacurrent_uniform",
- "bufferdatasize_vertex", // R_BUFFERDATA_ types are added to this index
- "bufferdatasize_index16",
- "bufferdatasize_index32",
- "bufferdatasize_uniform",
- "animcache_skeletal_count",
- "animcache_skeletal_bones",
- "animcache_skeletal_maxbones",
- "animcache_shade_count",
- "animcache_shade_vertices",
- "animcache_shade_maxvertices",
- "animcache_shape_count",
- "animcache_shape_vertices",
- "animcache_shape_maxvertices",
- "batch_batches",
- "batch_withgaps",
- "batch_surfaces",
- "batch_vertices",
- "batch_triangles",
- "fast_batches",
- "fast_surfaces",
- "fast_vertices",
- "fast_triangles",
- "copytriangles_batches",
- "copytriangles_surfaces",
- "copytriangles_vertices",
- "copytriangles_triangles",
- "dynamic_batches",
- "dynamic_surfaces",
- "dynamic_vertices",
- "dynamic_triangles",
- "dynamicskeletal_batches",
- "dynamicskeletal_surfaces",
- "dynamicskeletal_vertices",
- "dynamicskeletal_triangles",
- "dynamic_batches_because_cvar",
- "dynamic_surfaces_because_cvar",
- "dynamic_vertices_because_cvar",
- "dynamic_triangles_because_cvar",
- "dynamic_batches_because_lightmapvertex",
- "dynamic_surfaces_because_lightmapvertex",
- "dynamic_vertices_because_lightmapvertex",
- "dynamic_triangles_because_lightmapvertex",
- "dynamic_batches_because_deformvertexes_autosprite",
- "dynamic_surfaces_because_deformvertexes_autosprite",
- "dynamic_vertices_because_deformvertexes_autosprite",
- "dynamic_triangles_because_deformvertexes_autosprite",
- "dynamic_batches_because_deformvertexes_autosprite2",
- "dynamic_surfaces_because_deformvertexes_autosprite2",
- "dynamic_vertices_because_deformvertexes_autosprite2",
- "dynamic_triangles_because_deformvertexes_autosprite2",
- "dynamic_batches_because_deformvertexes_normal",
- "dynamic_surfaces_because_deformvertexes_normal",
- "dynamic_vertices_because_deformvertexes_normal",
- "dynamic_triangles_because_deformvertexes_normal",
- "dynamic_batches_because_deformvertexes_wave",
- "dynamic_surfaces_because_deformvertexes_wave",
- "dynamic_vertices_because_deformvertexes_wave",
- "dynamic_triangles_because_deformvertexes_wave",
- "dynamic_batches_because_deformvertexes_bulge",
- "dynamic_surfaces_because_deformvertexes_bulge",
- "dynamic_vertices_because_deformvertexes_bulge",
- "dynamic_triangles_because_deformvertexes_bulge",
- "dynamic_batches_because_deformvertexes_move",
- "dynamic_surfaces_because_deformvertexes_move",
- "dynamic_vertices_because_deformvertexes_move",
- "dynamic_triangles_because_deformvertexes_move",
- "dynamic_batches_because_tcgen_lightmap",
- "dynamic_surfaces_because_tcgen_lightmap",
- "dynamic_vertices_because_tcgen_lightmap",
- "dynamic_triangles_because_tcgen_lightmap",
- "dynamic_batches_because_tcgen_vector",
- "dynamic_surfaces_because_tcgen_vector",
- "dynamic_vertices_because_tcgen_vector",
- "dynamic_triangles_because_tcgen_vector",
- "dynamic_batches_because_tcgen_environment",
- "dynamic_surfaces_because_tcgen_environment",
- "dynamic_vertices_because_tcgen_environment",
- "dynamic_triangles_because_tcgen_environment",
- "dynamic_batches_because_tcmod_turbulent",
- "dynamic_surfaces_because_tcmod_turbulent",
- "dynamic_vertices_because_tcmod_turbulent",
- "dynamic_triangles_because_tcmod_turbulent",
- "dynamic_batches_because_nogaps",
- "dynamic_surfaces_because_nogaps",
- "dynamic_vertices_because_nogaps",
- "dynamic_triangles_because_nogaps",
- "dynamic_batches_because_derived",
- "dynamic_surfaces_because_derived",
- "dynamic_vertices_because_derived",
- "dynamic_triangles_because_derived",
- "entitycache_count",
- "entitycache_surfaces",
- "entitycache_vertices",
- "entitycache_triangles",
- "entityanimate_count",
- "entityanimate_surfaces",
- "entityanimate_vertices",
- "entityanimate_triangles",
- "entityskeletal_count",
- "entityskeletal_surfaces",
- "entityskeletal_vertices",
- "entityskeletal_triangles",
- "entitystatic_count",
- "entitystatic_surfaces",
- "entitystatic_vertices",
- "entitystatic_triangles",
- "entitycustom_count",
- "entitycustom_surfaces",
- "entitycustom_vertices",
- "entitycustom_triangles",
-};
-
-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(const char *desc)
-{
- char tempbuf[256];
- int length;
- int t;
-
- if (r_speeds.integer < 2 || !r_timereport_active)
- return;
-
- CHECKGLERROR
- if (r_speeds.integer == 2)
- GL_Finish();
- CHECKGLERROR
- r_timereport_temp = r_timereport_current;
- r_timereport_current = Sys_DirtyTime();
- t = (int) ((r_timereport_current - r_timereport_temp) * 1000000.0 + 0.5);
-
- length = dpsnprintf(tempbuf, sizeof(tempbuf), "%8i %s", t, desc);
- if (length < 0)
- 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_timestring, "\n", sizeof(r_speeds_timestring));
- speedstringcount = 0;
- }
- strlcat(r_speeds_timestring, tempbuf, sizeof(r_speeds_timestring));
- speedstringcount += length;
-}
-
-static 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)
- {
- r_timereport_active = true;
- r_timereport_start = r_timereport_current = Sys_DirtyTime();
- }
-}
-
-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;
-}
-
-#define R_SPEEDS_GRAPH_COLORS 8
-#define R_SPEEDS_GRAPH_TEXTLENGTH 64
-static float r_speeds_graph_colors[R_SPEEDS_GRAPH_COLORS][4] = {{1, 0, 0, 1}, {0, 1, 0, 1}, {0, 0, 1, 1}, {1, 1, 0, 1}, {0, 1, 1, 1}, {1, 0, 1, 1}, {1, 1, 1, 1}, {1, 0.5f, 0, 1}};
-
-extern cvar_t r_viewscale;
-extern float viewscalefpsadjusted;
-static void R_TimeReport_EndFrame(void)
-{
- int j, lines;
- cl_locnode_t *loc;
- char string[1024+4096];
- mleaf_t *viewleaf;
- static double oldtime = 0;
-
- r_refdef.stats[r_stat_timedelta] = (int)((host.realtime - oldtime) * 1000000.0);
- oldtime = host.realtime;
- r_refdef.stats[r_stat_quality] = (int)(100 * r_refdef.view.quality);
-
- string[0] = 0;
- if (r_speeds.integer)
- {
- // 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),
-"%6ius time delta %s%s %.3f cl.time%2.4f brightness\n"
-"%3i renders org:'%+8.2f %+8.2f %+8.2f' dir:'%+2.3f %+2.3f %+2.3f'\n"
-"%5i viewleaf%5i cluster%3i 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)%8i/%8i framedata\n"
-"%4i lights%4i clears%4i scissored%7i light%7i shadow%7i dynamic\n"
-"bouncegrid:%4i lights%6i particles%6i traces%6i hits%6i splats%6i bounces\n"
-"photon cache efficiency:%6i cached%6i traced%6ianimated\n"
-"%6i draws%8i vertices%8i triangles bloompixels%8i copied%8i drawn\n"
-"%3i rendertargets%8i pixels\n"
-"updated%5i indexbuffers%8i bytes%5i vertexbuffers%8i bytes\n"
-"animcache%5ib gpuskeletal%7i vertices (%7i with normals)\n"
-"fastbatch%5i count%5i surfaces%7i vertices %7i triangles\n"
-"copytris%5i count%5i surfaces%7i vertices %7i triangles\n"
-"dynamic%5i count%5i surfaces%7i vertices%7i triangles\n"
-"%s"
-, r_refdef.stats[r_stat_timedelta], loc ? "Location: " : "", loc ? loc->name : "", cl.time, r_refdef.view.colorscale
-, r_refdef.stats[r_stat_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[r_stat_world_surfaces], r_refdef.stats[r_stat_world_triangles], r_refdef.stats[r_stat_entities], r_refdef.stats[r_stat_entities_surfaces], r_refdef.stats[r_stat_entities_triangles]
-, r_refdef.stats[r_stat_world_leafs], r_refdef.stats[r_stat_world_portals], r_refdef.stats[r_stat_particles], cl.num_particles, r_refdef.stats[r_stat_drawndecals], r_refdef.stats[r_stat_totaldecals], r_refdef.stats[r_stat_quality]
-, r_refdef.stats[r_stat_lightmapupdates], r_refdef.stats[r_stat_lightmapupdatepixels], r_refdef.stats[r_stat_framedatacurrent], r_refdef.stats[r_stat_framedatasize]
-, r_refdef.stats[r_stat_lights], r_refdef.stats[r_stat_lights_clears], r_refdef.stats[r_stat_lights_scissored], r_refdef.stats[r_stat_lights_lighttriangles], r_refdef.stats[r_stat_lights_shadowtriangles], r_refdef.stats[r_stat_lights_dynamicshadowtriangles]
-, r_refdef.stats[r_stat_bouncegrid_lights], r_refdef.stats[r_stat_bouncegrid_particles], r_refdef.stats[r_stat_bouncegrid_traces], r_refdef.stats[r_stat_bouncegrid_hits], r_refdef.stats[r_stat_bouncegrid_splats], r_refdef.stats[r_stat_bouncegrid_bounces]
-, r_refdef.stats[r_stat_photoncache_cached], r_refdef.stats[r_stat_photoncache_traced], r_refdef.stats[r_stat_photoncache_animated]
-, r_refdef.stats[r_stat_draws], r_refdef.stats[r_stat_draws_vertices], r_refdef.stats[r_stat_draws_elements] / 3, r_refdef.stats[r_stat_bloom_copypixels], r_refdef.stats[r_stat_bloom_drawpixels]
-, r_refdef.stats[r_stat_rendertargets_used], r_refdef.stats[r_stat_rendertargets_pixels]
-, r_refdef.stats[r_stat_indexbufferuploadcount], r_refdef.stats[r_stat_indexbufferuploadsize], r_refdef.stats[r_stat_vertexbufferuploadcount], r_refdef.stats[r_stat_vertexbufferuploadsize]
-, r_refdef.stats[r_stat_animcache_skeletal_bones], r_refdef.stats[r_stat_animcache_shape_vertices], r_refdef.stats[r_stat_animcache_shade_vertices]
-, r_refdef.stats[r_stat_batch_fast_batches], r_refdef.stats[r_stat_batch_fast_surfaces], r_refdef.stats[r_stat_batch_fast_vertices], r_refdef.stats[r_stat_batch_fast_triangles]
-, r_refdef.stats[r_stat_batch_copytriangles_batches], r_refdef.stats[r_stat_batch_copytriangles_surfaces], r_refdef.stats[r_stat_batch_copytriangles_vertices], r_refdef.stats[r_stat_batch_copytriangles_triangles]
-, r_refdef.stats[r_stat_batch_dynamic_batches], r_refdef.stats[r_stat_batch_dynamic_surfaces], r_refdef.stats[r_stat_batch_dynamic_vertices], r_refdef.stats[r_stat_batch_dynamic_triangles]
-, r_speeds_timestring);
- }
-
- speedstringcount = 0;
- r_speeds_timestring[0] = 0;
- r_timereport_active = false;
-
- if (r_speeds.integer >= 2)
- {
- r_timereport_active = true;
- r_timereport_start = r_timereport_current = Sys_DirtyTime();
- }
-
- if (string[0])
- {
- int i, y;
- if (string[strlen(string)-1] == '\n')
- string[strlen(string)-1] = 0;
- lines = 1;
- for (i = 0;string[i];i++)
- if (string[i] == '\n')
- lines++;
- y = vid_conheight.integer - sb_lines - lines * 8;
- i = j = 0;
- r_draw2d_force = true;
- DrawQ_Fill(0, y, vid_conwidth.integer, lines * 8, 0, 0, 0, 0.5, 0);
- while (string[i])
- {
- j = i;
- while (string[i] && string[i] != '\n')
- i++;
- if (i - j > 0)
- DrawQ_String(0, y, string + j, i - j, 8, 8, 1, 1, 1, 1, 0, NULL, true, FONT_DEFAULT);
- if (string[i] == '\n')
- i++;
- y += 8;
- }
- r_draw2d_force = false;
- }
-
- if (r_speeds_graph_length.integer != bound(4, r_speeds_graph_length.integer, 8192))
- Cvar_SetValueQuick(&r_speeds_graph_length, bound(4, r_speeds_graph_length.integer, 8192));
- if (fabs(r_speeds_graph_seconds.value - bound(0.1f, r_speeds_graph_seconds.value, 120.0f)) > 0.01f)
- Cvar_SetValueQuick(&r_speeds_graph_seconds, bound(0.1f, r_speeds_graph_seconds.value, 120.0f));
- if (r_speeds_graph.integer)
- {
- // if we currently have no graph data, reset the graph data entirely
- int i;
- if (!cls.r_speeds_graph_data)
- for (i = 0;i < r_stat_count;i++)
- cls.r_speeds_graph_datamin[i] = cls.r_speeds_graph_datamax[i] = 0;
- if (cls.r_speeds_graph_length != r_speeds_graph_length.integer)
- {
- int stat, index, d, graph_length, *graph_data;
- cls.r_speeds_graph_length = r_speeds_graph_length.integer;
- cls.r_speeds_graph_current = 0;
- if (cls.r_speeds_graph_data)
- Mem_Free(cls.r_speeds_graph_data);
- cls.r_speeds_graph_data = (int *)Mem_Alloc(cls.permanentmempool, cls.r_speeds_graph_length * sizeof(r_refdef.stats));
- // initialize the graph to have the current values throughout history
- graph_data = cls.r_speeds_graph_data;
- graph_length = cls.r_speeds_graph_length;
- index = 0;
- for (stat = 0;stat < r_stat_count;stat++)
- {
- d = r_refdef.stats[stat];
- if (stat == r_stat_timedelta)
- d = 0;
- for (i = 0;i < graph_length;i++)
- graph_data[index++] = d;
- }
- }
- }
- else
- {
- if (cls.r_speeds_graph_length)
- {
- cls.r_speeds_graph_length = 0;
- Mem_Free(cls.r_speeds_graph_data);
- cls.r_speeds_graph_data = NULL;
- cls.r_speeds_graph_current = 0;
- }
- }
-
- if (cls.r_speeds_graph_length)
- {
- char legend[128];
- int i;
- const int *data;
- float x, y, width, height, scalex, scaley;
- int range_default = max(r_speeds_graph_maxdefault.integer, 1);
- int color, stat, stats, index, range_min, range_max;
- int graph_current, graph_length, *graph_data;
- int statindex[R_SPEEDS_GRAPH_COLORS];
- int sum;
-
- // add current stats to the graph_data
- cls.r_speeds_graph_current++;
- if (cls.r_speeds_graph_current >= cls.r_speeds_graph_length)
- cls.r_speeds_graph_current = 0;
- // poke each new stat into the current offset of its graph
- graph_data = cls.r_speeds_graph_data;
- graph_current = cls.r_speeds_graph_current;
- graph_length = cls.r_speeds_graph_length;
- for (stat = 0;stat < r_stat_count;stat++)
- graph_data[stat * graph_length + graph_current] = r_refdef.stats[stat];
-
- // update the graph ranges
- for (stat = 0;stat < r_stat_count;stat++)
- {
- if (cls.r_speeds_graph_datamin[stat] > r_refdef.stats[stat])
- cls.r_speeds_graph_datamin[stat] = r_refdef.stats[stat];
- if (cls.r_speeds_graph_datamax[stat] < r_refdef.stats[stat])
- cls.r_speeds_graph_datamax[stat] = r_refdef.stats[stat];
- }
-
- // force 2D drawing to occur even if r_render is 0
- r_draw2d_force = true;
-
- // position the graph
- width = r_speeds_graph_width.value;
- height = r_speeds_graph_height.value;
- x = bound(0, r_speeds_graph_x.value, vid_conwidth.value - width);
- y = bound(0, r_speeds_graph_y.value, vid_conheight.value - height);
-
- // fill background with a pattern of gray and black at one second intervals
- scalex = (float)width / (float)r_speeds_graph_seconds.value;
- for (i = 0;i < r_speeds_graph_seconds.integer + 1;i++)
- {
- float x1 = x + width - (i + 1) * scalex;
- float x2 = x + width - i * scalex;
- if (x1 < x)
- x1 = x;
- if (i & 1)
- DrawQ_Fill(x1, y, x2 - x1, height, 0.0f, 0.0f, 0.0f, 0.5f, 0);
- else
- DrawQ_Fill(x1, y, x2 - x1, height, 0.2f, 0.2f, 0.2f, 0.5f, 0);
- }
-
- // count how many stats match our pattern
- stats = 0;
- color = 0;
- for (color = 0;color < R_SPEEDS_GRAPH_COLORS;color++)
- {
- // look at all stat names and find ones matching the filter
- statindex[color] = -1;
- if (!r_speeds_graph_filter[color].string)
- continue;
- for (stat = 0;stat < r_stat_count;stat++)
- if (!strcmp(r_stat_name[stat], r_speeds_graph_filter[color].string))
- break;
- if (stat >= r_stat_count)
- continue;
- // record that this color is this stat for the line drawing loop
- statindex[color] = stat;
- // draw the legend text in the background of the graph
- dpsnprintf(legend, sizeof(legend), "%10i :%s", graph_data[stat * graph_length + graph_current], r_stat_name[stat]);
- DrawQ_String(x, y + stats * 8, legend, 0, 8, 8, r_speeds_graph_colors[color][0], r_speeds_graph_colors[color][1], r_speeds_graph_colors[color][2], r_speeds_graph_colors[color][3] * 1.00f, 0, NULL, true, FONT_DEFAULT);
- // count how many stats we need to graph in vertex buffer
- stats++;
- }
-
- if (stats)
- {
- // legend text is drawn after the graphs
- // render the graph lines, we'll go back and render the legend text later
- scalex = (float)width / (1000000.0 * r_speeds_graph_seconds.value);
- stats = 0;
- for (color = 0;color < R_SPEEDS_GRAPH_COLORS;color++)
- {
- // look at all stat names and find ones matching the filter
- stat = statindex[color];
- if (stat < 0)
- continue;
- // prefer to graph stats with 0 base, but if they are
- // negative we have no choice
- range_min = cls.r_speeds_graph_datamin[stat];
- range_max = max(cls.r_speeds_graph_datamax[stat], range_min + range_default);
- // some stats we specifically override the graph scale on
- if (stat == r_stat_timedelta)
- range_max = r_speeds_graph_maxtimedelta.integer;
- scaley = height / (range_max - range_min);
- // generate lines (2 vertices each)
- // to deal with incomplete data we walk right to left
- data = graph_data + stat * graph_length;
- index = graph_current;
- sum = 0;
- for (i = 0;i < graph_length - 1;)
- {
- float x1, y1, x2, y2;
- x1 = max(x, x + width - sum * scalex);
- y1 = y + height - (data[index] - range_min) * scaley;
- sum += graph_data[r_stat_timedelta * graph_length + index];
- index--;
- if (index < 0)
- index = graph_length - 1;
- i++;
- x2 = max(x, x + width - sum * scalex);
- y2 = y + height - (data[index] - range_min) * scaley;
- DrawQ_Line(1, x1, y1, x2, y2, r_speeds_graph_colors[color][0], r_speeds_graph_colors[color][1], r_speeds_graph_colors[color][2], r_speeds_graph_colors[color][3], 0);
- }
- }
- }
-
- // return to not drawing anything if r_render is 0
- r_draw2d_force = false;
- }
-
- memset(&r_refdef.stats, 0, sizeof(r_refdef.stats));
-}
-
/*
=================
SCR_SizeUp_f
Cvar_RegisterVariable (&scr_conscroll3_y);
Cvar_RegisterVariable (&scr_conbrightness);
Cvar_RegisterVariable (&scr_conforcewhiledisconnected);
+ Cvar_RegisterVariable (&scr_conheight);
#ifdef CONFIG_MENU
Cvar_RegisterVariable (&scr_menuforcewhiledisconnected);
#endif
Cvar_RegisterVariable(&scr_stipple);
Cvar_RegisterVariable(&scr_refresh);
Cvar_RegisterVariable(&net_graph);
- Cvar_RegisterAlias(&net_graph, "shownetgraph");
+ Cvar_RegisterVirtual(&net_graph, "shownetgraph");
Cvar_RegisterVariable(&cl_demo_mousegrab);
Cvar_RegisterVariable(&timedemo_screenshotframelist);
Cvar_RegisterVariable(&vid_touchscreen_outlinealpha);
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);
+ Sys_Print(buf);
cls.capturevideo.lastfpstime = t;
cls.capturevideo.lastfpsframe = cls.capturevideo.frame;
}
}
loadingscreenstack_t;
static loadingscreenstack_t *loadingscreenstack = NULL;
-static qbool loadingscreendone = false;
-static qbool loadingscreencleared = false;
-static float loadingscreenheight = 0;
-rtexture_t *loadingscreentexture = NULL;
+rtexture_t *loadingscreentexture = NULL; // last framebuffer before loading screen, kept for the background
static float loadingscreentexture_vertex3f[12];
static float loadingscreentexture_texcoord2f[8];
static int loadingscreenpic_number = 0;
static void SCR_DrawScreen (void)
{
Draw_Frame();
-
+ DrawQ_Start();
R_Mesh_Start();
-
R_UpdateVariables();
- // this will be set back to 0 by R_RenderView during CL_VM_UpdateView
- r_refdef.draw2dstage = 1;
- R_ResetViewRendering2D_Common(0, NULL, NULL, 0, 0, vid.width, vid.height, vid_conwidth.integer, vid_conheight.integer);
-
// Quake uses clockwise winding, so these are swapped
r_refdef.view.cullface_front = GL_BACK;
r_refdef.view.cullface_back = GL_FRONT;
- if (cls.signon == SIGNONS)
+ if (!scr_loading && cls.signon == SIGNONS)
{
float size;
R_RenderView(0, NULL, NULL, r_refdef.view.x, r_refdef.view.y, r_refdef.view.width, r_refdef.view.height);
}
}
- else if (key_dest == key_game && key_consoleactive == 0 && (cls.state == ca_connected || cls.connect_trying))
- {
- // draw the loading screen for a while if we're still connecting and not forcing the console or menu to show up
- char temp[64];
- if (cls.signon > 0)
- SCR_PushLoadingScreen(va(temp, sizeof(temp), "Connect: Signon stage %i of %i", cls.signon, SIGNONS), 1.0);
- else if (cls.connect_remainingtries > 0)
- SCR_PushLoadingScreen(va(temp, sizeof(temp), "Connect: Trying... %i", cls.connect_remainingtries), 1.0);
- else
- SCR_PushLoadingScreen(va(temp, sizeof(temp), "Connect: Waiting %i seconds for reply", 10 + cls.connect_remainingtries), 1.0);
- SCR_DrawLoadingScreen();
- SCR_PopLoadingScreen(false);
- }
// Don't apply debugging stuff like r_showsurfaces to the UI
r_refdef.view.showdebug = false;
// draw 2D stuff
- // Don't flicker when starting a local server.
- if(scr_loading && !loadingscreenstack && ((!cls.signon && !sv.active) || (cls.signon == SIGNONS)))
- SCR_EndLoadingPlaque();
-
if(!scr_con_current && !(key_consoleactive & KEY_CONSOLEACTIVE_FORCED))
if ((key_dest == key_game || key_dest == key_message) && !r_letterbox.value && !scr_loading)
Con_DrawNotify (); // only draw notify in game
else
host.paused = false;
- if (cls.signon == SIGNONS)
+ if (!scr_loading && cls.signon == SIGNONS)
{
SCR_DrawNet ();
SCR_DrawTurtle ();
CL_DrawVideo();
R_Shadow_EditLights_DrawSelectedLightProperties();
- SCR_DrawConsole();
-
- if(!scr_loading) {
- SCR_DrawBrand();
+ if (scr_loading)
+ {
+ loadingscreenstack_t connect_status;
+ qbool show_connect_status = !loadingscreenstack && (cls.connect_trying || cls.state == ca_connected);
+ if (show_connect_status)
+ {
+ connect_status.absolute_loading_amount_min = 0;
+ if (cls.signon > 0)
+ dpsnprintf(connect_status.msg, sizeof(connect_status.msg), "Connect: Signon stage %i of %i", cls.signon, SIGNONS);
+ else if (cls.connect_remainingtries > 0)
+ dpsnprintf(connect_status.msg, sizeof(connect_status.msg), "Connect: Trying... %i", cls.connect_remainingtries);
+ else
+ dpsnprintf(connect_status.msg, sizeof(connect_status.msg), "Connect: Waiting %i seconds for reply", 10 + cls.connect_remainingtries);
+ loadingscreenstack = &connect_status;
+ }
+
+ SCR_DrawLoadingScreen();
- SCR_DrawInfobar();
+ if (show_connect_status)
+ loadingscreenstack = NULL;
+ }
+
+ SCR_DrawConsole();
+ SCR_DrawInfobar();
+ if (!scr_loading)
+ {
+ SCR_DrawBrand();
SCR_DrawTouchscreenOverlay();
}
if (r_timereport_active)
if(!scr_loading)
Sbar_ShowFPS();
- DrawQ_Finish();
-
R_Mesh_Finish();
+ DrawQ_Finish();
R_RenderTarget_FreeUnused(false);
}
loadingscreentexture_texcoord2f[6] = 0;loadingscreentexture_texcoord2f[7] = 0;
}
-void SCR_UpdateLoadingScreenIfShown(void)
+static void SCR_ChooseLoadingPic(qbool startup)
{
- if(loadingscreendone)
- SCR_UpdateLoadingScreen(loadingscreencleared, false);
+ if(startup && scr_loadingscreen_firstforstartup.integer)
+ loadingscreenpic_number = 0;
+ else if(scr_loadingscreen_firstforstartup.integer)
+ if(scr_loadingscreen_count.integer > 1)
+ loadingscreenpic_number = rand() % (scr_loadingscreen_count.integer - 1) + 1;
+ else
+ loadingscreenpic_number = 0;
+ else
+ loadingscreenpic_number = rand() % (scr_loadingscreen_count.integer > 1 ? scr_loadingscreen_count.integer : 1);
+}
+
+/*
+===============
+SCR_BeginLoadingPlaque
+
+================
+*/
+void SCR_BeginLoadingPlaque(qbool startup)
+{
+ loadingscreenstack_t dummy_status;
+
+ // we need to push a dummy status so CL_UpdateScreen knows we have things to load...
+ if (!loadingscreenstack)
+ {
+ dummy_status.msg[0] = '\0';
+ dummy_status.absolute_loading_amount_min = 0;
+ loadingscreenstack = &dummy_status;
+ }
+
+ SCR_DeferLoadingPlaque(startup);
+ if (scr_loadingscreen_background.integer)
+ SCR_SetLoadingScreenTexture();
+ CL_UpdateScreen();
+
+ if (loadingscreenstack == &dummy_status)
+ loadingscreenstack = NULL;
}
+void SCR_DeferLoadingPlaque(qbool startup)
+{
+ SCR_ChooseLoadingPic(startup);
+ scr_loading = true;
+}
+
+void SCR_EndLoadingPlaque(void)
+{
+ scr_loading = false;
+ SCR_ClearLoadingScreenTexture();
+}
+
+//=============================================================================
+
void SCR_PushLoadingScreen (const char *msg, float len_in_parent)
{
loadingscreenstack_t *s = (loadingscreenstack_t *) Z_Malloc(sizeof(loadingscreenstack_t));
s->absolute_loading_amount_len = 1;
}
- SCR_UpdateLoadingScreenIfShown();
+ if (scr_loading)
+ CL_UpdateScreen();
}
void SCR_PopLoadingScreen (qbool redraw)
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();
+ if (scr_loading && redraw)
+ CL_UpdateScreen();
}
void SCR_ClearLoadingScreen (qbool redraw)
len = strlen(s->msg);
x = (vid_conwidth.integer - DrawQ_TextWidth(s->msg, len, size, size, true, FONT_INFOBAR)) / 2;
y -= size;
- DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, 1, 0);
DrawQ_String(x, y, s->msg, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
total += size;
}
len = strlen(s->msg);
x = (vid_conwidth.integer - DrawQ_TextWidth(s->msg, len, size, size, true, FONT_INFOBAR)) / 2;
y -= size;
- DrawQ_Fill(0, y, vid_conwidth.integer, size, 0, 0, 0, 1, 0);
DrawQ_String(x, y, s->msg, len, size, size, 1, 1, 1, 1, 0, NULL, true, FONT_INFOBAR);
total += size;
}
float verts[12];
float colors[16];
- loadingscreenheight = SCR_DrawLoadingStack_r(loadingscreenstack, vid_conheight.integer, scr_loadingscreen_barheight.value);
+ SCR_DrawLoadingStack_r(loadingscreenstack, vid_conheight.integer, scr_loadingscreen_barheight.value);
if(loadingscreenstack)
{
// height = 32; // sorry, using the actual one is ugly
GL_DepthRange(0, 1);
GL_PolygonOffset(0, 0);
GL_DepthTest(false);
-// R_Mesh_ResetTextureState();
+ //R_Mesh_ResetTextureState();
verts[2] = verts[5] = verts[8] = verts[11] = 0;
verts[0] = verts[9] = 0;
verts[1] = verts[4] = vid_conheight.integer - scr_loadingscreen_barheight.value;
#if _MSC_VER >= 1400
#define sscanf sscanf_s
#endif
- // ^^^^^^^^^^ blue component
- // ^^^^^^ bottom row
- // ^^^^^^^^^^^^ alpha is always on
colors[0] = 0; colors[1] = 0; colors[2] = 0; colors[3] = 1;
colors[4] = 0; colors[5] = 0; colors[6] = 0; colors[7] = 1;
sscanf(scr_loadingscreen_barcolor.string, "%f %f %f", &colors[8], &colors[9], &colors[10]); colors[11] = 1;
R_Mesh_PrepareVertices_Generic_Arrays(4, verts, colors, NULL);
R_SetupShader_Generic_NoTexture(true, true);
R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 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 (qbool clear)
+static void SCR_DrawLoadingScreen (void)
{
- r_viewport_t viewport;
+ cachepic_t *loadingscreenpic;
+ float loadingscreenpic_vertex3f[12];
+ float loadingscreenpic_texcoord2f[8];
float x, y, w, h, sw, sh, f;
char vabuf[1024];
- // release mouse grab while loading
- if (!vid.fullscreen)
- VID_SetMouse(false, false, false);
-// CHECKGLERROR
- r_refdef.draw2dstage = true;
- R_Viewport_InitOrtho(&viewport, &identitymatrix, 0, 0, vid.width, vid.height, 0, 0, vid_conwidth.integer, vid_conheight.integer, -10, 100, NULL);
- R_Mesh_SetRenderTargets(0, NULL, NULL, NULL, NULL, NULL);
- R_SetViewport(&viewport);
- GL_ColorMask(1,1,1,1);
- // when starting up a new video mode, make sure the screen is cleared to black
- if (clear || loadingscreentexture)
- GL_Clear(GL_COLOR_BUFFER_BIT, NULL, 1.0f, 0);
- R_Textures_Frame();
- R_Mesh_Start();
- R_EntityMatrix(&identitymatrix);
- // draw the loading plaque
- loadingscreenpic = Draw_CachePic_Flags (loadingscreenpic_number ? va(vabuf, sizeof(vabuf), "%s%d", scr_loadingscreen_picture.string, loadingscreenpic_number+1) : scr_loadingscreen_picture.string, loadingscreenpic_number ? CACHEPICFLAG_NOTPERSISTENT : 0);
+ GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+ GL_DepthRange(0, 1);
+ GL_PolygonOffset(0, 0);
+ GL_DepthTest(false);
+ GL_Color(1,1,1,1);
+
+ if(loadingscreentexture)
+ {
+ R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreentexture_vertex3f, NULL, loadingscreentexture_texcoord2f);
+ R_SetupShader_Generic(loadingscreentexture, false, true, true);
+ R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
+ }
+
+ loadingscreenpic = Draw_CachePic_Flags(loadingscreenpic_number ? va(vabuf, sizeof(vabuf), "%s%d", scr_loadingscreen_picture.string, loadingscreenpic_number+1) : scr_loadingscreen_picture.string, loadingscreenpic_number ? CACHEPICFLAG_NOTPERSISTENT : 0);
w = Draw_GetPicWidth(loadingscreenpic);
h = Draw_GetPicHeight(loadingscreenpic);
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 (void)
-{
- // we only need to draw the image if it isn't already there
- GL_BlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- GL_DepthRange(0, 1);
- GL_PolygonOffset(0, 0);
- GL_DepthTest(false);
-// R_Mesh_ResetTextureState();
- GL_Color(1,1,1,1);
- if(loadingscreentexture)
- {
- R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreentexture_vertex3f, NULL, loadingscreentexture_texcoord2f);
- R_SetupShader_Generic(loadingscreentexture, false, true, true);
- R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
- }
R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreenpic_vertex3f, NULL, loadingscreenpic_texcoord2f);
R_SetupShader_Generic(Draw_GetPicTexture(loadingscreenpic), true, true, false);
R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0);
- SCR_DrawLoadingStack();
-}
-
-static double loadingscreen_lastupdate;
-
-static void SCR_UpdateVars(void);
-
-void SCR_UpdateLoadingScreen (qbool clear, qbool startup)
-{
- 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;
-
- // limit update rate
- if (scr_loadingscreen_maxfps.value)
- {
- double t = Sys_DirtyTime();
- if ((t - loadingscreen_lastupdate) < 1.0f/scr_loadingscreen_maxfps.value)
- return;
- loadingscreen_lastupdate = t;
- }
-
- // set up the r_texture_gammaramps texture which we need for rendering the loadingscreenpic
- R_UpdateVariables();
-
- if(!scr_loadingscreen_background.integer)
- clear = true;
-
- if(loadingscreendone)
- clear |= loadingscreencleared;
-
- if(!loadingscreendone)
- {
- if(startup && scr_loadingscreen_firstforstartup.integer)
- loadingscreenpic_number = 0;
- else if(scr_loadingscreen_firstforstartup.integer)
- if(scr_loadingscreen_count.integer > 1)
- loadingscreenpic_number = rand() % (scr_loadingscreen_count.integer - 1) + 1;
- else
- loadingscreenpic_number = 0;
- else
- loadingscreenpic_number = rand() % (scr_loadingscreen_count.integer > 1 ? scr_loadingscreen_count.integer : 1);
- }
-
- if(clear)
- SCR_ClearLoadingScreenTexture();
- else if(!loadingscreendone)
- SCR_SetLoadingScreenTexture();
-
- if(!loadingscreendone)
- {
- loadingscreendone = true;
- loadingscreenheight = 0;
- }
- loadingscreencleared = clear;
-#ifdef USE_GLES2
- SCR_DrawLoadingScreen_SharedSetup(clear);
- SCR_DrawLoadingScreen();
-#else
- SCR_DrawLoadingScreen_SharedSetup(clear);
- if (vid.stereobuffer)
- {
- qglDrawBuffer(GL_BACK_LEFT);
- SCR_DrawLoadingScreen();
- qglDrawBuffer(GL_BACK_RIGHT);
- SCR_DrawLoadingScreen();
- }
- else
- {
- qglDrawBuffer(GL_BACK);
- SCR_DrawLoadingScreen();
- }
-#endif
-
- DrawQ_Finish();
- R_Mesh_Finish();
- // refresh
- VID_Finish();
-
- // 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;
- Key_EventQueue_Block(); Sys_SendKeyEvents();
- key_dest = old_key_dest;
- key_consoleactive = old_key_consoleactive;
+ SCR_DrawLoadingStack();
}
qbool R_Stereo_ColorMasking(void)
return (vid.stereobuffer || r_stereo_sidebyside.integer || r_stereo_horizontal.integer || r_stereo_vertical.integer || R_Stereo_ColorMasking());
}
-void SCR_UpdateVars(void)
+static void SCR_UpdateVars(void)
{
float conwidth = bound(160, vid_conwidth.value, 32768);
float conheight = bound(90, vid_conheight.value, 24576);
extern cvar_t cl_minfps_qualityhysteresis;
extern cvar_t cl_minfps_qualitystepmax;
extern cvar_t cl_minfps_force;
-static double cl_updatescreen_quality = 1;
void CL_UpdateScreen(void)
{
+ static double cl_updatescreen_quality = 1;
+
vec3_t vieworigin;
static double drawscreenstart = 0.0;
double drawscreendelta;
if (!scr_initialized || !con_initialized || !scr_refresh.integer)
return; // not initialized yet
- loadingscreendone = false;
-
if(IS_NEXUIZ_DERIVED(gamemode))
{
// play a bit with the palette (experimental)
memcpy(palette_rgb_shirtscoreboard[15], palette_rgb_shirtcolormap[15], sizeof(*palette_rgb_shirtcolormap));
}
+#ifdef CONFIG_VIDEO_CAPTURE
+ if (vid_hidden && !cls.capturevideo.active && !cl_capturevideo.integer)
+#else
if (vid_hidden)
+#endif
{
VID_Finish();
return;
}
+ if (scr_loading)
+ {
+ if(!loadingscreenstack && !cls.connect_trying && (cls.state != ca_connected || cls.signon == SIGNONS))
+ SCR_EndLoadingPlaque();
+ else if (scr_loadingscreen_maxfps.value)
+ {
+ static float lastupdate;
+ float now = Sys_DirtyTime();
+ if (now - lastupdate < 1.0f / scr_loadingscreen_maxfps.value)
+ return;
+ lastupdate = now;
+ }
+ }
+
SCR_UpdateVars();
R_FrameData_NewFrame();
qglFlush(); // ensure that the commands are submitted to the GPU before we do other things
- 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 && !vid_touchscreen.integer, !vid_touchscreen.integer);
- else if (key_dest == key_menu)
- VID_SetMouse(vid.fullscreen, vid_mouse.integer && !in_client_mouse && !vid_touchscreen.integer, !vid_touchscreen.integer);
+ if (!vid_activewindow || key_consoleactive)
+ VID_SetMouse(false, false);
+ else if (key_dest == key_menu || key_dest == key_menu_grabbed || scr_loading)
+ VID_SetMouse(vid_mouse.integer && !in_client_mouse && !vid_touchscreen.integer, !vid_touchscreen.integer);
else
- VID_SetMouse(vid.fullscreen, vid_mouse.integer && !cl.csqc_wantsmousemove && cl_prydoncursor.integer <= 0 && (!cls.demoplayback || cl_demo_mousegrab.integer) && !vid_touchscreen.integer, !vid_touchscreen.integer);
+ VID_SetMouse(vid_mouse.integer && !cl.csqc_wantsmousemove && cl_prydoncursor.integer <= 0 && (!cls.demoplayback || cl_demo_mousegrab.integer) && !vid_touchscreen.integer, !vid_touchscreen.integer);
VID_Finish();
}