X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_screen.c;h=611bd82f0e1dca038101cfd56f86ff14573b6e42;hp=5945f690c1e34994024c510f51f8eaddd5e31d65;hb=cbbf18e419ad4d6b1848192cf86aba37b9fb6df4;hpb=fb095018cbcd11dadb81dbb53ea29deb2a14e2df diff --git a/cl_screen.c b/cl_screen.c index 5945f690..611bd82f 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -35,6 +35,9 @@ cvar_t scr_showpause = {CVAR_SAVE, "showpause","1", "show pause icon when game i cvar_t scr_showbrand = {0, "showbrand","0", "shows gfx/brand.tga in a corner of the screen (different values select different positions, including centered)"}; cvar_t scr_printspeed = {0, "scr_printspeed","0", "speed of intermission printing (episode end texts), a value of 0 disables the slow printing"}; cvar_t scr_loadingscreen_background = {0, "scr_loadingscreen_background","0", "show the last visible background during loading screen (costs one screenful of video memory)"}; +cvar_t scr_loadingscreen_scale = {0, "scr_loadingscreen_scale","1", "scale factor of the background"}; +cvar_t scr_loadingscreen_scale_base = {0, "scr_loadingscreen_scale_base","0", "0 = console pixels, 1 = video pixels"}; +cvar_t scr_loadingscreen_scale_limit = {0, "scr_loadingscreen_scale_limit","0", "0 = no limit, 1 = until first edge hits screen edge, 2 = until last edge hits screen edge, 3 = until width hits screen width, 4 = until height hits screen height"}; cvar_t scr_loadingscreen_count = {0, "scr_loadingscreen_count","1", "number of loading screen files to use randomly (named loading.tga, loading2.tga, loading3.tga, ...)"}; cvar_t scr_loadingscreen_barcolor = {0, "scr_loadingscreen_barcolor", "0 0 1", "rgb color of loadingscreen progress bar"}; cvar_t scr_loadingscreen_barheight = {0, "scr_loadingscreen_barheight", "8", "a height loadingscreen progress bar"}; @@ -61,6 +64,8 @@ cvar_t cl_capturevideo_framestep = {CVAR_SAVE, "cl_capturevideo_framestep", "1", 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)"}; +cvar_t r_stereo_horizontal = {0, "r_stereo_horizontal", "0", "aspect skewed side by side view for special decoder/display hardware"}; +cvar_t r_stereo_vertical = {0, "r_stereo_vertical", "0", "aspect skewed top and bottom view for special decoder/display hardware"}; cvar_t r_stereo_redblue = {0, "r_stereo_redblue", "0", "red/blue anaglyph stereo glasses (note: most of these glasses are actually red/cyan, try that one too)"}; cvar_t r_stereo_redcyan = {0, "r_stereo_redcyan", "0", "red/cyan anaglyph stereo glasses, the kind given away at drive-in movies like Creature From The Black Lagoon In 3D"}; cvar_t r_stereo_redgreen = {0, "r_stereo_redgreen", "0", "red/green anaglyph stereo glasses (for those who don't mind yellow)"}; @@ -217,12 +222,16 @@ void SCR_CheckDrawCenterString (void) void SCR_DrawNetGraph_DrawGraph (int graphx, int graphy, int graphwidth, int graphheight, float graphscale, const char *label, float textsize, int packetcounter, netgraphitem_t *netgraph) { netgraphitem_t *graph; - int j, x, y; + int j, x, y, numlines; int totalbytes = 0; char bytesstring[128]; float g[NETGRAPH_PACKETS][6]; float *a; float *b; + float vertex3f[(NETGRAPH_PACKETS+2)*5*2*3]; + float color4f[(NETGRAPH_PACKETS+2)*5*2*4]; + float *v; + float *c; 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 @@ -258,18 +267,34 @@ void SCR_DrawNetGraph_DrawGraph (int graphx, int graphy, int graphwidth, int gra g[j][5] = bound(0.0f, g[j][5], 1.0f); } // render the lines for the graph + numlines = 0; + v = vertex3f; + c = color4f; 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); + VectorSet(v, graphx + graphwidth * a[0], graphy + graphheight * a[2], 0.0f);v += 3;Vector4Set(c, 1.0f, 1.0f, 0.0f, 1.0f);c += 4; + VectorSet(v, graphx + graphwidth * b[0], graphy + graphheight * b[2], 0.0f);v += 3;Vector4Set(c, 1.0f, 1.0f, 0.0f, 1.0f);c += 4; + + VectorSet(v, graphx + graphwidth * a[0], graphy + graphheight * a[1], 0.0f);v += 3;Vector4Set(c, 1.0f, 0.0f, 0.0f, 1.0f);c += 4; + VectorSet(v, graphx + graphwidth * b[0], graphy + graphheight * b[1], 0.0f);v += 3;Vector4Set(c, 1.0f, 0.0f, 0.0f, 1.0f);c += 4; + + VectorSet(v, graphx + graphwidth * a[0], graphy + graphheight * a[5], 0.0f);v += 3;Vector4Set(c, 0.0f, 1.0f, 0.0f, 1.0f);c += 4; + VectorSet(v, graphx + graphwidth * b[0], graphy + graphheight * b[5], 0.0f);v += 3;Vector4Set(c, 0.0f, 1.0f, 0.0f, 1.0f);c += 4; + + VectorSet(v, graphx + graphwidth * a[0], graphy + graphheight * a[4], 0.0f);v += 3;Vector4Set(c, 1.0f, 1.0f, 1.0f, 1.0f);c += 4; + VectorSet(v, graphx + graphwidth * b[0], graphy + graphheight * b[4], 0.0f);v += 3;Vector4Set(c, 1.0f, 1.0f, 1.0f, 1.0f);c += 4; + + VectorSet(v, graphx + graphwidth * a[0], graphy + graphheight * a[3], 0.0f);v += 3;Vector4Set(c, 1.0f, 0.5f, 0.0f, 1.0f);c += 4; + VectorSet(v, graphx + graphwidth * b[0], graphy + graphheight * b[3], 0.0f);v += 3;Vector4Set(c, 1.0f, 0.5f, 0.0f, 1.0f);c += 4; + + numlines += 5; } + if (numlines > 0) + DrawQ_Lines(0.0f, numlines, vertex3f, color4f, 0); x = graphx; y = graphy + graphheight; dpsnprintf(bytesstring, sizeof(bytesstring), "%i", totalbytes); @@ -479,9 +504,9 @@ static int SCR_DrawQWDownload(int offset) cls.qw_downloadspeedcount = 0; } if (cls.protocol == PROTOCOL_QUAKEWORLD) - dpsnprintf(temp, sizeof(temp), "Downloading %s %3i%% (%i) at %i bytes/s\n", cls.qw_downloadname, cls.qw_downloadpercent, cls.qw_downloadmemorycursize, cls.qw_downloadspeedrate); + dpsnprintf(temp, sizeof(temp), "Downloading %s %3i%% (%i) at %i bytes/s", cls.qw_downloadname, cls.qw_downloadpercent, cls.qw_downloadmemorycursize, cls.qw_downloadspeedrate); 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); + dpsnprintf(temp, sizeof(temp), "Downloading %s %3i%% (%i/%i) at %i bytes/s", 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(temp, len, size, size, true, FONT_INFOBAR)) / 2; y = vid_conheight.integer - size - offset; @@ -542,11 +567,11 @@ static int SCR_DrawCurlDownload(int offset) for(i = 0; i != nDownloads; ++i) { if(downinfo[i].queued) - dpsnprintf(temp, sizeof(temp), "Still in queue: %s\n", downinfo[i].filename); + dpsnprintf(temp, sizeof(temp), "Still in queue: %s", downinfo[i].filename); else if(downinfo[i].progress <= 0) - dpsnprintf(temp, sizeof(temp), "Downloading %s ... ???.?%% @ %.1f KiB/s\n", downinfo[i].filename, downinfo[i].speed / 1024.0); + dpsnprintf(temp, sizeof(temp), "Downloading %s ... ???.?%% @ %.1f KiB/s", downinfo[i].filename, downinfo[i].speed / 1024.0); 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); + dpsnprintf(temp, sizeof(temp), "Downloading %s ... %5.1f%% @ %.1f KiB/s", downinfo[i].filename, 100.0 * downinfo[i].progress, downinfo[i].speed / 1024.0); len = (int)strlen(temp); x = (vid_conwidth.integer - DrawQ_TextWidth(temp, len, size, size, true, FONT_INFOBAR)) / 2; DrawQ_Fill(0, y + i * size, vid_conwidth.integer, size, 0, 0, 0, cls.signon == SIGNONS ? 0.5 : 1, 0); @@ -696,7 +721,7 @@ 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) +void R_TimeReport(const char *desc) { char tempbuf[256]; int length; @@ -706,7 +731,7 @@ void R_TimeReport(char *desc) return; CHECKGLERROR - if (r_speeds.integer == 2) + if (r_speeds.integer == 2 && qglFinish) qglFinish(); CHECKGLERROR r_timereport_temp = r_timereport_current; @@ -774,7 +799,7 @@ void R_TimeReport_EndFrame(void) "%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" +"%6i draws%8i vertices%8i triangles bloompixels%8i copied%8i drawn\n" "updated%5i indexbuffers%8i bytes%5i vertexbuffers%8i bytes\n" "%s" , loc ? "Location: " : "", loc ? loc->name : "" @@ -784,7 +809,7 @@ void R_TimeReport_EndFrame(void) , r_refdef.stats.world_leafs, r_refdef.stats.world_portals, r_refdef.stats.particles, cl.num_particles, r_refdef.stats.drawndecals, r_refdef.stats.totaldecals, (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_refdef.stats.draws, r_refdef.stats.draws_vertices, r_refdef.stats.draws_elements / 3, r_refdef.stats.bloom_copypixels, r_refdef.stats.bloom_drawpixels , r_refdef.stats.indexbufferuploadcount, r_refdef.stats.indexbufferuploadsize, r_refdef.stats.vertexbufferuploadcount, r_refdef.stats.vertexbufferuploadsize , r_speeds_timestring); @@ -877,6 +902,9 @@ void CL_Screen_Init(void) Cvar_RegisterVariable (&scr_conforcewhiledisconnected); Cvar_RegisterVariable (&scr_menuforcewhiledisconnected); Cvar_RegisterVariable (&scr_loadingscreen_background); + Cvar_RegisterVariable (&scr_loadingscreen_scale); + Cvar_RegisterVariable (&scr_loadingscreen_scale_base); + Cvar_RegisterVariable (&scr_loadingscreen_scale_limit); Cvar_RegisterVariable (&scr_loadingscreen_count); Cvar_RegisterVariable (&scr_loadingscreen_barcolor); Cvar_RegisterVariable (&scr_loadingscreen_barheight); @@ -909,6 +937,8 @@ void CL_Screen_Init(void) Cvar_RegisterVariable (&r_letterbox); Cvar_RegisterVariable(&r_stereo_separation); Cvar_RegisterVariable(&r_stereo_sidebyside); + Cvar_RegisterVariable(&r_stereo_horizontal); + Cvar_RegisterVariable(&r_stereo_vertical); Cvar_RegisterVariable(&r_stereo_redblue); Cvar_RegisterVariable(&r_stereo_redcyan); Cvar_RegisterVariable(&r_stereo_redgreen); @@ -1231,7 +1261,8 @@ void SCR_CaptureVideo_VideoFrame(int newframestepframenum) CHECKGLERROR // speed is critical here, so do saving as directly as possible - qglReadPixels (x, y, vid.width, vid.height, GL_BGRA, GL_UNSIGNED_BYTE, cls.capturevideo.screenbuffer);CHECKGLERROR + GL_ReadPixelsBGRA(x, y, vid.width, vid.height, cls.capturevideo.screenbuffer); + SCR_ScaleDownBGRA (cls.capturevideo.screenbuffer, vid.width, vid.height, cls.capturevideo.outbuffer, width, height); cls.capturevideo.videoframes(newframestepframenum - cls.capturevideo.framestepframe); @@ -1313,7 +1344,7 @@ Grab six views for environment mapping tests struct envmapinfo_s { float angles[3]; - char *name; + const char *name; qboolean flipx, flipy, flipdiagonaly; } envmapinfo[12] = @@ -1458,7 +1489,7 @@ void SHOWLMP_drawall(void) int i; 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); + DrawQ_Pic(cl.showlmps[i].x, cl.showlmps[i].y, Draw_CachePic_Flags (cl.showlmps[i].pic, CACHEPICFLAG_NOTPERSISTENT), 0, 0, 1, 1, 1, 1, 0); } /* @@ -1476,8 +1507,7 @@ qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *b int indices[4] = {0,1,2,3}; // BGRA qboolean ret; - CHECKGLERROR - qglReadPixels (x, y, width, height, GL_BGRA, GL_UNSIGNED_BYTE, buffer1);CHECKGLERROR + GL_ReadPixelsBGRA(x, y, width, height, buffer1); if(gammacorrect && (scr_screenshot_gammaboost.value != 1 || WANT_SCREENSHOT_HWGAMMA)) { @@ -1543,36 +1573,20 @@ qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *b extern void R_UpdateFogColor(void); void R_ClearScreen(qboolean fogcolor) { + float clearcolor[4]; // clear to black - CHECKGLERROR + Vector4Clear(clearcolor); if (fogcolor) { R_UpdateFogColor(); - qglClearColor(r_refdef.fogcolor[0],r_refdef.fogcolor[1],r_refdef.fogcolor[2],0);CHECKGLERROR - } - else - { - qglClearColor(0,0,0,0);CHECKGLERROR - } - qglClearDepth(1);CHECKGLERROR - if (vid.stencil) - { - // LordHavoc: we use a stencil centered around 128 instead of 0, - // to avoid clamping interfering with strange shadow volume - // drawing orders - qglClearStencil(128);CHECKGLERROR + VectorCopy(r_refdef.fogcolor, clearcolor); } + // clear depth is 1.0 + // LordHavoc: we use a stencil centered around 128 instead of 0, + // to avoid clamping interfering with strange shadow volume + // drawing orders // clear the screen - GL_Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (vid.stencil ? GL_STENCIL_BUFFER_BIT : 0)); - // set dithering mode - if (gl_dither.integer) - { - qglEnable(GL_DITHER);CHECKGLERROR - } - else - { - qglDisable(GL_DITHER);CHECKGLERROR - } + GL_Clear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | (vid.stencil ? GL_STENCIL_BUFFER_BIT : 0), clearcolor, 1.0f, 128); } qboolean CL_VM_UpdateView (void); @@ -1612,6 +1626,28 @@ void SCR_DrawScreen (void) if (r_stereo_side) r_refdef.view.x += (int)(r_refdef.view.width * 1.5); } + else if (r_stereo_horizontal.integer) + { + r_refdef.view.width = (int)(vid.width * size / 2); + 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.0)/2); + r_refdef.view.y = (int)((vid.height - r_refdef.view.height)/2); + r_refdef.view.z = 0; + if (r_stereo_side) + r_refdef.view.x += (int)(r_refdef.view.width); + } + else if (r_stereo_vertical.integer) + { + r_refdef.view.width = (int)(vid.width * size); + r_refdef.view.height = (int)(vid.height * size * (1 - bound(0, r_letterbox.value, 100) / 100) / 2); + 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.0)/2); + r_refdef.view.z = 0; + if (r_stereo_side) + r_refdef.view.y += (int)(r_refdef.view.height); + } else { r_refdef.view.width = (int)(vid.width * size); @@ -1661,7 +1697,7 @@ void SCR_DrawScreen (void) } } - if (!r_stereo_sidebyside.integer) + if (!r_stereo_sidebyside.integer && !r_stereo_horizontal.integer && !r_stereo_vertical.integer) { r_refdef.view.width = vid.width; r_refdef.view.height = vid.height; @@ -1757,7 +1793,7 @@ typedef struct loadingscreenstack_s } loadingscreenstack_t; static loadingscreenstack_t *loadingscreenstack = NULL; -static double loadingscreentime = -1; +static qboolean loadingscreendone = false; static qboolean loadingscreencleared = false; static float loadingscreenheight = 0; rtexture_t *loadingscreentexture = NULL; @@ -1793,7 +1829,7 @@ static void SCR_SetLoadingScreenTexture(void) loadingscreentexture_h = vid.height / (float) h; } - loadingscreentexture = R_LoadTexture2D(r_main_texturepool, "loadingscreentexture", w, h, NULL, TEXTYPE_COLORBUFFER, TEXF_FORCENEAREST | TEXF_CLAMP, -1, NULL); + loadingscreentexture = R_LoadTexture2D(r_main_texturepool, "loadingscreentexture", w, h, NULL, TEXTYPE_COLORBUFFER, TEXF_RENDERTARGET | TEXF_FORCENEAREST | TEXF_CLAMP, -1, NULL); R_Mesh_CopyToTexture(loadingscreentexture, 0, 0, 0, 0, vid.width, vid.height); loadingscreentexture_vertex3f[2] = loadingscreentexture_vertex3f[5] = loadingscreentexture_vertex3f[8] = loadingscreentexture_vertex3f[11] = 0; @@ -1809,7 +1845,7 @@ static void SCR_SetLoadingScreenTexture(void) void SCR_UpdateLoadingScreenIfShown(void) { - if(realtime == loadingscreentime) + if(loadingscreendone) SCR_UpdateLoadingScreen(loadingscreencleared); } @@ -1913,7 +1949,7 @@ static void SCR_DrawLoadingStack(void) 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; @@ -1948,32 +1984,70 @@ static float loadingscreenpic_texcoord2f[8]; static void SCR_DrawLoadingScreen_SharedSetup (qboolean clear) { r_viewport_t viewport; - float x, y; + float x, y, w, h, sw, sh, f; // release mouse grab while loading if (!vid.fullscreen) VID_SetMouse(false, false, false); - CHECKGLERROR +// 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_SetViewport(&viewport); - //qglDisable(GL_SCISSOR_TEST);CHECKGLERROR - //qglDepthMask(1);CHECKGLERROR - qglColorMask(1,1,1,1);CHECKGLERROR - qglClearColor(0,0,0,0);CHECKGLERROR + GL_ColorMask(1,1,1,1); // when starting up a new video mode, make sure the screen is cleared to black - if (clear) - qglClear(GL_COLOR_BUFFER_BIT);CHECKGLERROR + 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 (loadingscreenpic_number ? va("gfx/loading%d", loadingscreenpic_number+1) : "gfx/loading"); - x = (vid_conwidth.integer - loadingscreenpic->width)/2; - y = (vid_conheight.integer - loadingscreenpic->height)/2; + + w = loadingscreenpic->width; + h = loadingscreenpic->height; + + // apply scale + w *= scr_loadingscreen_scale.value; + h *= scr_loadingscreen_scale.value; + + // apply scale base + if(scr_loadingscreen_scale_base.integer) + { + w *= vid_conwidth.integer / (float) vid.width; + h *= vid_conheight.integer / (float) vid.height; + } + + // apply scale limit + sw = w / vid_conwidth.integer; + sh = h / vid_conheight.integer; + f = 1; + switch(scr_loadingscreen_scale_limit.integer) + { + case 1: + f = max(sw, sh); + break; + case 2: + f = min(sw, sh); + break; + case 3: + f = sw; + break; + case 4: + f = sh; + break; + } + if(f > 1) + { + w /= f; + h /= f; + } + + x = (vid_conwidth.integer - w)/2; + y = (vid_conheight.integer - h)/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_vertex3f[3] = loadingscreenpic_vertex3f[6] = x + w; + loadingscreenpic_vertex3f[7] = loadingscreenpic_vertex3f[10] = y + h; loadingscreenpic_texcoord2f[0] = 0;loadingscreenpic_texcoord2f[1] = 0; loadingscreenpic_texcoord2f[2] = 1;loadingscreenpic_texcoord2f[3] = 0; loadingscreenpic_texcoord2f[4] = 1;loadingscreenpic_texcoord2f[5] = 1; @@ -1987,7 +2061,7 @@ static void SCR_DrawLoadingScreen (qboolean clear) GL_DepthRange(0, 1); GL_PolygonOffset(0, 0); GL_DepthTest(false); - R_Mesh_ResetTextureState(); +// R_Mesh_ResetTextureState(); GL_Color(1,1,1,1); if(loadingscreentexture) { @@ -2006,8 +2080,6 @@ 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) @@ -2022,24 +2094,26 @@ void SCR_UpdateLoadingScreen (qboolean clear) if(!scr_loadingscreen_background.integer) clear = true; - if(loadingscreentime == realtime) + if(loadingscreendone) clear |= loadingscreencleared; - if(loadingscreentime != realtime) + if(!loadingscreendone) loadingscreenpic_number = rand() % (scr_loadingscreen_count.integer > 1 ? scr_loadingscreen_count.integer : 1); if(clear) SCR_ClearLoadingScreenTexture(); - else if(loadingscreentime != realtime) + else if(!loadingscreendone) SCR_SetLoadingScreenTexture(); - if(loadingscreentime != realtime) + if(!loadingscreendone) { - loadingscreentime = realtime; + loadingscreendone = true; loadingscreenheight = 0; } loadingscreencleared = clear; + if (qglDrawBuffer) + qglDrawBuffer(GL_BACK); SCR_DrawLoadingScreen_SharedSetup(clear); if (vid.stereobuffer) { @@ -2050,7 +2124,8 @@ void SCR_UpdateLoadingScreen (qboolean clear) } else { - qglDrawBuffer(GL_BACK); + if (qglDrawBuffer) + qglDrawBuffer(GL_BACK); SCR_DrawLoadingScreen(clear); } SCR_DrawLoadingScreen_SharedFinish(clear); @@ -2072,7 +2147,7 @@ qboolean R_Stereo_ColorMasking(void) qboolean R_Stereo_Active(void) { - return (vid.stereobuffer || r_stereo_sidebyside.integer || R_Stereo_ColorMasking()); + return (vid.stereobuffer || r_stereo_sidebyside.integer || r_stereo_horizontal.integer || r_stereo_vertical.integer || R_Stereo_ColorMasking()); } extern cvar_t cl_minfps; @@ -2089,13 +2164,16 @@ void CL_UpdateScreen(void) double rendertime1; float conwidth, conheight; float f; + r_viewport_t viewport; Sbar_ShowFPS_Update(); if (!scr_initialized || !con_initialized || !scr_refresh.integer) return; // not initialized yet - if(gamemode == GAME_NEXUIZ) + loadingscreendone = false; + + if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC) { // 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)); @@ -2109,7 +2187,10 @@ void CL_UpdateScreen(void) } if (vid_hidden) + { + VID_Finish(); return; + } rendertime1 = Sys_DoubleTime(); @@ -2151,13 +2232,27 @@ void CL_UpdateScreen(void) SCR_SetUpToDrawConsole(); - 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 + if (qglDrawBuffer) + { + CHECKGLERROR + qglDrawBuffer(GL_BACK);CHECKGLERROR + // set dithering mode + if (gl_dither.integer) + { + qglEnable(GL_DITHER);CHECKGLERROR + } + else + { + qglDisable(GL_DITHER);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); + GL_ScissorTest(false); + GL_ColorMask(1,1,1,1); + GL_DepthMask(true); + R_ClearScreen(false); r_refdef.view.clear = false; r_refdef.view.isoverlay = false; @@ -2191,16 +2286,9 @@ void CL_UpdateScreen(void) } } - CHECKGLERROR if (R_Stereo_Active()) { - 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_refdef.view.matrix, &originalmatrix, &offsetmatrix); - - if (r_stereo_sidebyside.integer) - r_stereo_side = 0; + r_stereo_side = 0; if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer) { @@ -2214,11 +2302,7 @@ 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_refdef.view.matrix, &originalmatrix, &offsetmatrix); - - if (r_stereo_sidebyside.integer) - r_stereo_side = 1; + r_stereo_side = 1; if (r_stereo_redblue.integer || r_stereo_redgreen.integer || r_stereo_redcyan.integer) { @@ -2231,18 +2315,16 @@ void CL_UpdateScreen(void) qglDrawBuffer(GL_BACK_LEFT); SCR_DrawScreen(); - - r_refdef.view.matrix = originalmatrix; } else SCR_DrawScreen(); - CHECKGLERROR SCR_CaptureVideo(); + if (qglFlush) + qglFlush(); // FIXME: should we really be using qglFlush here? + // quality adjustment according to render time - CHECKGLERROR - qglFlush(); // FIXME: should we really be using qglFlush here? 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); @@ -2258,7 +2340,7 @@ void CL_UpdateScreen(void) 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_SetMouse(vid.fullscreen, vid_mouse.integer && !cl.csqc_wantsmousemove && cl_prydoncursor.integer <= 0 && (!cls.demoplayback || cl_demo_mousegrab.integer), true); VID_Finish(); }