X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_screen.c;h=9319ca858196aae70394e5a6e15a55704c4f097c;hb=ccb5fe100fa4f0005123933dcdf4e9d3ad878687;hp=b26ac8fdac4538e432b071e412b1e040f00b1874;hpb=3adc05093a95f863ba206a76848f81b393d1f4f4;p=xonotic%2Fdarkplaces.git diff --git a/cl_screen.c b/cl_screen.c index b26ac8fd..9319ca85 100644 --- a/cl_screen.c +++ b/cl_screen.c @@ -15,9 +15,18 @@ cvar_t scr_viewsize = {CVAR_SAVE, "viewsize","100", "how large the view should be, 110 disables inventory bar, 120 disables status bar"}; cvar_t scr_fov = {CVAR_SAVE, "fov","90", "field of vision, 1-170 degrees, default 90, some players use 110-130"}; -cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1", "opacity of console background"}; +cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1", "opacity of console background gfx/conback"}; +cvar_t scr_conalphafactor = {CVAR_SAVE, "scr_conalphafactor", "1", "opacity of console background gfx/conback relative to scr_conalpha; when 0, gfx/conback is not drawn"}; +cvar_t scr_conalpha2factor = {CVAR_SAVE, "scr_conalpha2factor", "0", "opacity of console background gfx/conback2 relative to scr_conalpha; when 0, gfx/conback2 is not drawn"}; +cvar_t scr_conalpha3factor = {CVAR_SAVE, "scr_conalpha3factor", "0", "opacity of console background gfx/conback3 relative to scr_conalpha; when 0, gfx/conback3 is not drawn"}; cvar_t scr_conbrightness = {CVAR_SAVE, "scr_conbrightness", "1", "brightness of console background (0 = black, 1 = image)"}; cvar_t scr_conforcewhiledisconnected = {0, "scr_conforcewhiledisconnected", "1", "forces fullscreen console while disconnected"}; +cvar_t scr_conscroll_x = {CVAR_SAVE, "scr_conscroll_x", "0", "scroll speed of gfx/conback in x direction"}; +cvar_t scr_conscroll_y = {CVAR_SAVE, "scr_conscroll_y", "0", "scroll speed of gfx/conback in y direction"}; +cvar_t scr_conscroll2_x = {CVAR_SAVE, "scr_conscroll2_x", "0", "scroll speed of gfx/conback2 in x direction"}; +cvar_t scr_conscroll2_y = {CVAR_SAVE, "scr_conscroll2_y", "0", "scroll speed of gfx/conback2 in y direction"}; +cvar_t scr_conscroll3_x = {CVAR_SAVE, "scr_conscroll3_x", "0", "scroll speed of gfx/conback3 in x direction"}; +cvar_t scr_conscroll3_y = {CVAR_SAVE, "scr_conscroll3_y", "0", "scroll speed of gfx/conback3 in y direction"}; cvar_t scr_menuforcewhiledisconnected = {0, "scr_menuforcewhiledisconnected", "0", "forces menu while disconnected"}; cvar_t scr_centertime = {0, "scr_centertime","2", "how long centerprint messages show"}; cvar_t scr_showram = {CVAR_SAVE, "showram","1", "show ram icon if low on surface cache memory (not used)"}; @@ -37,6 +46,7 @@ cvar_t scr_screenshot_jpeg_quality = {CVAR_SAVE, "scr_screenshot_jpeg_quality"," cvar_t scr_screenshot_png = {CVAR_SAVE, "scr_screenshot_png","0", "save png instead of targa"}; 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"}; +cvar_t scr_screenshot_alpha = {CVAR_SAVE, "scr_screenshot_alpha","0", "try to write an alpha channel to screenshots (debugging feature)"}; // 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_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)"}; @@ -696,7 +706,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; @@ -765,6 +775,7 @@ void R_TimeReport_EndFrame(void) "%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" +"updated%5i indexbuffers%8i bytes%5i vertexbuffers%8i bytes\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] @@ -774,6 +785,7 @@ void R_TimeReport_EndFrame(void) , 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.indexbufferuploadcount, r_refdef.stats.indexbufferuploadsize, r_refdef.stats.vertexbufferuploadcount, r_refdef.stats.vertexbufferuploadsize , r_speeds_timestring); memset(&r_refdef.stats, 0, sizeof(r_refdef.stats)); @@ -799,6 +811,7 @@ void R_TimeReport_EndFrame(void) 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]) { @@ -811,6 +824,7 @@ void R_TimeReport_EndFrame(void) i++; y += 8; } + r_draw2d_force = false; } } @@ -850,6 +864,15 @@ void CL_Screen_Init(void) Cvar_RegisterVariable (&scr_fov); Cvar_RegisterVariable (&scr_viewsize); Cvar_RegisterVariable (&scr_conalpha); + Cvar_RegisterVariable (&scr_conalphafactor); + Cvar_RegisterVariable (&scr_conalpha2factor); + Cvar_RegisterVariable (&scr_conalpha3factor); + Cvar_RegisterVariable (&scr_conscroll_x); + Cvar_RegisterVariable (&scr_conscroll_y); + Cvar_RegisterVariable (&scr_conscroll2_x); + Cvar_RegisterVariable (&scr_conscroll2_y); + Cvar_RegisterVariable (&scr_conscroll3_x); + Cvar_RegisterVariable (&scr_conscroll3_y); Cvar_RegisterVariable (&scr_conbrightness); Cvar_RegisterVariable (&scr_conforcewhiledisconnected); Cvar_RegisterVariable (&scr_menuforcewhiledisconnected); @@ -872,6 +895,7 @@ void CL_Screen_Init(void) Cvar_RegisterVariable (&scr_screenshot_gammaboost); Cvar_RegisterVariable (&scr_screenshot_hwgamma); Cvar_RegisterVariable (&scr_screenshot_name_in_mapdir); + Cvar_RegisterVariable (&scr_screenshot_alpha); Cvar_RegisterVariable (&cl_capturevideo); Cvar_RegisterVariable (&cl_capturevideo_printfps); Cvar_RegisterVariable (&cl_capturevideo_width); @@ -921,10 +945,8 @@ void SCR_ScreenShot_f (void) 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); qboolean png = (scr_screenshot_png.integer != 0) && !jpeg; @@ -957,15 +979,10 @@ void SCR_ScreenShot_f (void) else { // 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 { + if (scr_screenshot_name_in_mapdir.integer && cl.worldbasename[0]) + dpsnprintf (prefix_name, sizeof(prefix_name), "%s/%s", cl.worldbasename, Sys_TimeString(scr_screenshot_name.string)); + else dpsnprintf (prefix_name, sizeof(prefix_name), "%s", Sys_TimeString(scr_screenshot_name.string)); - } if (strcmp(old_prefix_name, prefix_name)) { @@ -986,18 +1003,17 @@ void SCR_ScreenShot_f (void) dpsnprintf(filename, sizeof(filename), "screenshots/%s%06d.%s", prefix_name, shotnumber, jpeg ? "jpg" : png ? "png" : "tga"); } - buffer1 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3); - buffer2 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3); - buffer3 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3 + 18); + buffer1 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 4); + buffer2 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * (scr_screenshot_alpha.integer ? 4 : 3)); - if (SCR_ScreenShot (filename, buffer1, buffer2, buffer3, 0, 0, vid.width, vid.height, false, false, false, jpeg, png, true)) + if (SCR_ScreenShot (filename, buffer1, buffer2, 0, 0, vid.width, vid.height, false, false, false, jpeg, png, true, scr_screenshot_alpha.integer != 0)) Con_Printf("Wrote %s\n", filename); else { Con_Printf("Unable to write %s\n", filename); if(jpeg || png) { - if(SCR_ScreenShot (filename, buffer1, buffer2, buffer3, 0, 0, vid.width, vid.height, false, false, false, false, false, true)) + if(SCR_ScreenShot (filename, buffer1, buffer2, 0, 0, vid.width, vid.height, false, false, false, false, false, true, scr_screenshot_alpha.integer != 0)) { strlcpy(filename + strlen(filename) - 3, "tga", 4); Con_Printf("Wrote %s\n", filename); @@ -1007,7 +1023,6 @@ void SCR_ScreenShot_f (void) Mem_Free (buffer1); Mem_Free (buffer2); - Mem_Free (buffer3); shotnumber++; } @@ -1214,10 +1229,10 @@ void SCR_CaptureVideo_VideoFrame(int newframestepframenum) 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 - 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); @@ -1325,7 +1340,6 @@ static void R_Envmap_f (void) char filename[MAX_QPATH], basename[MAX_QPATH]; unsigned char *buffer1; unsigned char *buffer2; - unsigned char *buffer3; if (Cmd_Argc() != 3) { @@ -1362,9 +1376,8 @@ static void R_Envmap_f (void) r_refdef.view.frustum_x = 1; // tan(45 * M_PI / 180.0); r_refdef.view.frustum_y = 1; // tan(45 * M_PI / 180.0); - buffer1 = (unsigned char *)Mem_Alloc(tempmempool, size * size * 3); + buffer1 = (unsigned char *)Mem_Alloc(tempmempool, size * size * 4); buffer2 = (unsigned char *)Mem_Alloc(tempmempool, size * size * 3); - buffer3 = (unsigned char *)Mem_Alloc(tempmempool, size * size * 3 + 18); for (j = 0;j < 12;j++) { @@ -1375,12 +1388,11 @@ static void R_Envmap_f (void) R_Mesh_Start(); R_RenderView(); R_Mesh_Finish(); - 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, false); + SCR_ScreenShot(filename, buffer1, buffer2, 0, vid.height - (r_refdef.view.y + r_refdef.view.height), size, size, envmapinfo[j].flipx, envmapinfo[j].flipy, envmapinfo[j].flipdiagonaly, false, false, false, false); } Mem_Free (buffer1); Mem_Free (buffer2); - Mem_Free (buffer3); r_refdef.envmap = false; } @@ -1447,7 +1459,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); } /* @@ -1458,13 +1470,14 @@ void SHOWLMP_drawall(void) ============================================================================== */ -qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *buffer2, unsigned char *buffer3, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean png, qboolean gammacorrect) +// buffer1: 4*w*h +// buffer2: 3*w*h (or 4*w*h if screenshotting alpha too) +qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *buffer2, int x, int y, int width, int height, qboolean flipx, qboolean flipy, qboolean flipdiagonal, qboolean jpeg, qboolean png, qboolean gammacorrect, qboolean keep_alpha) { - int indices[3] = {0,1,2}; + int indices[4] = {0,1,2,3}; // BGRA qboolean ret; - CHECKGLERROR - qglReadPixels (x, y, width, height, jpeg ? GL_RGB : GL_BGR, GL_UNSIGNED_BYTE, buffer1);CHECKGLERROR + GL_ReadPixelsBGRA(x, y, width, height, buffer1); if(gammacorrect && (scr_screenshot_gammaboost.value != 1 || WANT_SCREENSHOT_HWGAMMA)) { @@ -1487,22 +1500,40 @@ qboolean SCR_ScreenShot(char *filename, unsigned char *buffer1, unsigned char *b 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) + for (i = 0;i < width*height*4;i += 4) { - 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); + buffer1[i] = (unsigned char) (vidramp[buffer1[i] + 512] * 255.0 / 65535.0 + 0.5); // B + buffer1[i+1] = (unsigned char) (vidramp[buffer1[i+1] + 256] * 255.0 / 65535.0 + 0.5); // G + buffer1[i+2] = (unsigned char) (vidramp[buffer1[i+2]] * 255.0 / 65535.0 + 0.5); // R + // A } } - Image_CopyMux (buffer2, buffer1, width, height, flipx, flipy, flipdiagonal, 3, 3, indices); - - if (jpeg) - ret = JPEG_SaveImage_preflipped (filename, width, height, buffer2); - else if (png) - ret = PNG_SaveImage_preflipped (filename, width, height, buffer2); + if(keep_alpha && !jpeg) + { + if(!png) + flipy = !flipy; // TGA: not preflipped + Image_CopyMux (buffer2, buffer1, width, height, flipx, flipy, flipdiagonal, 4, 4, indices); + if (png) + ret = PNG_SaveImage_preflipped (filename, width, height, true, buffer2); + else + ret = Image_WriteTGABGRA(filename, width, height, buffer2); + } else - ret = Image_WriteTGABGR_preflipped (filename, width, height, buffer2, buffer3); + { + if(jpeg) + { + indices[0] = 2; + indices[2] = 0; // RGB + } + Image_CopyMux (buffer2, buffer1, width, height, flipx, flipy, flipdiagonal, 3, 4, indices); + if (jpeg) + ret = JPEG_SaveImage_preflipped (filename, width, height, buffer2); + else if (png) + ret = PNG_SaveImage_preflipped (filename, width, height, false, buffer2); + else + ret = Image_WriteTGABGR_preflipped (filename, width, height, buffer2); + } return ret; } @@ -1512,36 +1543,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); @@ -1664,15 +1679,12 @@ void SCR_DrawScreen (void) char filename[MAX_QPATH]; unsigned char *buffer1; unsigned char *buffer2; - unsigned char *buffer3; dpsnprintf(filename, sizeof(filename), "timedemoscreenshots/%s%06d.tga", cls.demoname, cls.td_frames); - buffer1 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3); + buffer1 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 4); buffer2 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3); - buffer3 = (unsigned char *)Mem_Alloc(tempmempool, vid.width * vid.height * 3 + 18); - SCR_ScreenShot(filename, buffer1, buffer2, buffer3, 0, 0, vid.width, vid.height, false, false, false, false, false, true); + SCR_ScreenShot(filename, buffer1, buffer2, 0, 0, vid.width, vid.height, false, false, false, false, false, true, false); Mem_Free(buffer1); Mem_Free(buffer2); - Mem_Free(buffer3); } } @@ -1765,7 +1777,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, 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; @@ -1885,10 +1897,7 @@ static void SCR_DrawLoadingStack(void) 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_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1); 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; @@ -1906,7 +1915,9 @@ static void SCR_DrawLoadingStack(void) sscanf(scr_loadingscreen_barcolor.string, "%f %f %f", &colors[8], &colors[9], &colors[10]); colors[11] = 1; sscanf(scr_loadingscreen_barcolor.string, "%f %f %f", &colors[12], &colors[13], &colors[14]); colors[15] = 1; - R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, polygonelement3s, 0, 0); + R_Mesh_PrepareVertices_Generic_Arrays(4, verts, colors, NULL); + R_SetupShader_Generic(NULL, NULL, GL_MODULATE, 1); + 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) @@ -1925,16 +1936,14 @@ static void SCR_DrawLoadingScreen_SharedSetup (qboolean clear) // 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 + GL_Clear(GL_COLOR_BUFFER_BIT, NULL, 1.0f, 0); R_Textures_Frame(); R_Mesh_Start(); R_EntityMatrix(&identitymatrix); @@ -1956,25 +1965,21 @@ static void SCR_DrawLoadingScreen_SharedSetup (qboolean clear) 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_ColorPointer(NULL, 0, 0); + R_Mesh_ResetTextureState(); + GL_Color(1,1,1,1); if(loadingscreentexture) { - R_Mesh_VertexPointer(loadingscreentexture_vertex3f, 0, 0); - R_Mesh_ResetTextureState(); + R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreentexture_vertex3f, NULL, loadingscreentexture_texcoord2f); R_SetupShader_Generic(loadingscreentexture, NULL, GL_MODULATE, 1); - R_Mesh_TexCoordPointer(0, 2, loadingscreentexture_texcoord2f, 0, 0); - R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, polygonelement3s, 0, 0); + R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0); } - R_Mesh_VertexPointer(loadingscreenpic_vertex3f, 0, 0); - R_Mesh_ResetTextureState(); + R_Mesh_PrepareVertices_Generic_Arrays(4, loadingscreenpic_vertex3f, NULL, loadingscreenpic_texcoord2f); R_SetupShader_Generic(loadingscreenpic->tex, NULL, GL_MODULATE, 1); - R_Mesh_TexCoordPointer(0, 2, loadingscreenpic_texcoord2f, 0, 0); - R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, polygonelement3s, 0, 0); + R_Mesh_Draw(0, 4, 0, 2, polygonelement3i, NULL, 0, polygonelement3s, NULL, 0); SCR_DrawLoadingStack(); } @@ -1983,8 +1988,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) @@ -2027,7 +2030,8 @@ void SCR_UpdateLoadingScreen (qboolean clear) } else { - qglDrawBuffer(GL_BACK); + if (qglDrawBuffer) + qglDrawBuffer(GL_BACK); SCR_DrawLoadingScreen(clear); } SCR_DrawLoadingScreen_SharedFinish(clear); @@ -2066,6 +2070,7 @@ void CL_UpdateScreen(void) double rendertime1; float conwidth, conheight; float f; + r_viewport_t viewport; Sbar_ShowFPS_Update(); @@ -2086,7 +2091,10 @@ void CL_UpdateScreen(void) } if (vid_hidden) + { + VID_Finish(); return; + } rendertime1 = Sys_DoubleTime(); @@ -2128,13 +2136,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; @@ -2168,7 +2190,6 @@ void CL_UpdateScreen(void) } } - CHECKGLERROR if (R_Stereo_Active()) { matrix4x4_t originalmatrix = r_refdef.view.matrix; @@ -2213,13 +2234,13 @@ void CL_UpdateScreen(void) } 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); @@ -2235,7 +2256,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(); }