X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=gl_screen.c;h=977c4a04520841e6a638c6d7e12eb9543731d2cc;hb=5680867262036b514af3ae2fdc27b504675f30f7;hp=045afa6e910341a1ab8ab0d04026b811473dd2e6;hpb=43dcecee10781e53e11ce4f9a4d4a6a43074db82;p=xonotic%2Fdarkplaces.git diff --git a/gl_screen.c b/gl_screen.c index 045afa6e..977c4a04 100644 --- a/gl_screen.c +++ b/gl_screen.c @@ -58,7 +58,7 @@ Con_Printf (); net turn off messages option -the refresh is allways rendered, unless the console is full screen +the refresh is always rendered, unless the console is full screen console is: @@ -70,28 +70,24 @@ console is: */ -int glx, gly, glwidth, glheight; +int glx, gly, glwidth, glheight; -// only the refresh window will be updated unless these variables are flagged -int scr_copytop; -int scr_copyeverything; +float scr_con_current; +float scr_conlines; // lines of console to display -float scr_con_current; -float scr_conlines; // lines of console to display - -float oldscreensize, oldfov; -cvar_t scr_viewsize = {"viewsize","100", true}; -cvar_t scr_fov = {"fov","90"}; // 10 - 170 -cvar_t scr_conspeed = {"scr_conspeed","300"}; -cvar_t scr_centertime = {"scr_centertime","2"}; -cvar_t scr_showram = {"showram","1"}; -cvar_t scr_showturtle = {"showturtle","0"}; -cvar_t scr_showpause = {"showpause","1"}; -cvar_t scr_printspeed = {"scr_printspeed","8"}; -cvar_t showfps = {"showfps", "0", true}; -cvar_t r_render = {"r_render", "1"}; - -extern cvar_t crosshair; +float oldscreensize, oldfov; +cvar_t scr_viewsize = {CVAR_SAVE, "viewsize","100"}; +cvar_t scr_fov = {CVAR_SAVE, "fov","90"}; // 10 - 170 +cvar_t scr_conspeed = {CVAR_SAVE, "scr_conspeed","900"}; // LordHavoc: quake used 300 +cvar_t scr_centertime = {0, "scr_centertime","2"}; +cvar_t scr_showram = {CVAR_SAVE, "showram","1"}; +cvar_t scr_showturtle = {CVAR_SAVE, "showturtle","0"}; +cvar_t scr_showpause = {CVAR_SAVE, "showpause","1"}; +cvar_t scr_printspeed = {0, "scr_printspeed","8"}; +cvar_t showfps = {CVAR_SAVE, "showfps", "0"}; +cvar_t r_render = {0, "r_render", "1"}; +cvar_t r_brightness = {CVAR_SAVE, "r_brightness", "1"}; // LordHavoc: a method of operating system independent color correction +cvar_t r_contrast = {CVAR_SAVE, "r_contrast", "1"}; // LordHavoc: a method of operating system independent color correction qboolean scr_initialized; // ready to draw @@ -99,18 +95,12 @@ qpic_t *scr_ram; qpic_t *scr_net; qpic_t *scr_turtle; -int scr_fullupdate; - int clearconsole; int clearnotify; -extern int sb_lines; - -extern viddef_t vid; // global video state - qboolean scr_disabled_for_loading; -qboolean scr_drawloading; -float scr_disabled_time; +//qboolean scr_drawloading; +//float scr_disabled_time; void SCR_ScreenShot_f (void); @@ -214,12 +204,11 @@ void SCR_DrawCenterString (void) void SCR_CheckDrawCenterString (void) { - scr_copytop = 1; if (scr_center_lines > scr_erase_lines) scr_erase_lines = scr_center_lines; scr_centertime_off -= host_frametime; - + if (scr_centertime_off <= 0 && !cl.intermission) return; if (key_dest != key_game) @@ -267,7 +256,6 @@ static void SCR_CalcRefdef (void) qboolean full = false; - scr_fullupdate = 0; // force a background redraw vid.recalc_refdef = 0; //======================================== @@ -286,33 +274,30 @@ static void SCR_CalcRefdef (void) // intermission is always full screen if (cl.intermission) - size = 120; - else - size = scr_viewsize.value; - - if (size >= 120) - sb_lines = 0; // no status bar at all - else if (size >= 110) - sb_lines = 24; // no inventory - else - sb_lines = 24+16+8; - - if (scr_viewsize.value >= 100.0) { full = true; - size = 100.0; + size = 1; + sb_lines = 0; } else - size = scr_viewsize.value; - if (cl.intermission) { - full = true; - size = 100; - sb_lines = 0; + if (scr_viewsize.value >= 120) + sb_lines = 0; // no status bar at all + else if (scr_viewsize.value >= 110) + sb_lines = 24; // no inventory + else + sb_lines = 24+16+8; + + if (scr_viewsize.value >= 100.0) + { + full = true; + size = 1.0f; + } + else + size = scr_viewsize.value * (1.0f / 100.0f); } - size /= 100.0; - // LordHavoc: always fullyscreen rendering + // LordHavoc: always fullscreen rendering h = vid.height/* - sb_lines*/; r_refdef.vrect.width = vid.width * size; @@ -367,14 +352,18 @@ void SCR_SizeDown_f (void) //============================================================================ -void gl_screen_start() +void gl_screen_start(void) { scr_ram = Draw_PicFromWad ("ram"); scr_net = Draw_PicFromWad ("net"); scr_turtle = Draw_PicFromWad ("turtle"); } -void gl_screen_shutdown() +void gl_screen_shutdown(void) +{ +} + +void gl_screen_newmap(void) { } @@ -396,6 +385,8 @@ void GL_Screen_Init (void) Cvar_RegisterVariable (&scr_printspeed); Cvar_RegisterVariable (&showfps); Cvar_RegisterVariable (&r_render); + Cvar_RegisterVariable (&r_brightness); + Cvar_RegisterVariable (&r_contrast); #ifdef NORENDER r_render.value = 0; #endif @@ -409,7 +400,7 @@ void GL_Screen_Init (void) scr_initialized = true; - R_RegisterModule("GL_Screen", gl_screen_start, gl_screen_shutdown); + R_RegisterModule("GL_Screen", gl_screen_start, gl_screen_shutdown, gl_screen_newmap); } @@ -442,7 +433,7 @@ void SCR_DrawTurtle (void) if (!scr_showturtle.value) return; - if (host_frametime < 0.1) + if (cl.frametime < 0.1) { count = 0; return; @@ -497,6 +488,7 @@ void SCR_DrawPause (void) SCR_DrawLoading ============== */ +/* void SCR_DrawLoading (void) { qpic_t *pic; @@ -508,6 +500,7 @@ void SCR_DrawLoading (void) Draw_Pic ( (vid.width - pic->width)/2, (vid.height - 48 - pic->height)/2, pic); } +*/ @@ -541,14 +534,14 @@ void SCR_SetUpToDrawConsole (void) if (scr_conlines < scr_con_current) { - scr_con_current -= scr_conspeed.value*host_frametime; + scr_con_current -= scr_conspeed.value*host_realframetime; if (scr_conlines > scr_con_current) scr_con_current = scr_conlines; } else if (scr_conlines > scr_con_current) { - scr_con_current += scr_conspeed.value*host_frametime; + scr_con_current += scr_conspeed.value*host_realframetime; if (scr_conlines < scr_con_current) scr_con_current = scr_conlines; } @@ -563,7 +556,6 @@ void SCR_DrawConsole (void) { if (scr_con_current) { - scr_copyeverything = 1; Con_DrawConsole (scr_con_current, true); clearconsole = 0; } @@ -594,7 +586,7 @@ void SCR_ScreenShot_f (void) char filename[80]; char checkname[MAX_OSPATH]; int i; -// +// // find a file name to save it to // strcpy(filename,"dp0000.tga"); @@ -604,7 +596,7 @@ void SCR_ScreenShot_f (void) filename[2] = (i/1000)%10 + '0'; filename[3] = (i/ 100)%10 + '0'; filename[4] = (i/ 10)%10 + '0'; - filename[5] = (i/ 1)%10 + '0'; + filename[5] = (i/ 1)%10 + '0'; sprintf (checkname, "%s/%s", com_gamedir, filename); if (Sys_FileTime(checkname) == -1) break; // file doesn't exist @@ -615,11 +607,11 @@ void SCR_ScreenShot_f (void) return; } - buffer = malloc(glwidth*glheight*3); + buffer = qmalloc(glwidth*glheight*3); glReadPixels (glx, gly, glwidth, glheight, GL_RGB, GL_UNSIGNED_BYTE, buffer); Image_WriteTGARGB_preflipped(filename, glwidth, glheight, buffer); - free (buffer); + qfree(buffer); Con_Printf ("Wrote %s\n", filename); } @@ -633,29 +625,28 @@ SCR_BeginLoadingPlaque ================ */ +/* void SCR_BeginLoadingPlaque (void) { S_StopAllSounds (true); - if (cls.state != ca_connected) - return; - if (cls.signon != SIGNONS) - return; +// if (cls.state != ca_connected) +// return; +// if (cls.signon != SIGNONS) +// return; // redraw with no console and the loading plaque - Con_ClearNotify (); - scr_centertime_off = 0; - scr_con_current = 0; +// Con_ClearNotify (); +// scr_centertime_off = 0; +// scr_con_current = 0; scr_drawloading = true; - scr_fullupdate = 0; SCR_UpdateScreen (); - scr_drawloading = false; - scr_disabled_for_loading = true; - scr_disabled_time = realtime; - scr_fullupdate = 0; +// scr_disabled_for_loading = true; +// scr_disabled_time = realtime; } +*/ /* =============== @@ -663,17 +654,18 @@ SCR_EndLoadingPlaque ================ */ +/* void SCR_EndLoadingPlaque (void) { - scr_disabled_for_loading = false; - scr_fullupdate = 0; +// scr_disabled_for_loading = false; + scr_drawloading = false; Con_ClearNotify (); } +*/ //============================================================================= char *scr_notifystring; -qboolean scr_drawdialog; void SCR_DrawNotifyString (void) { @@ -696,7 +688,7 @@ void SCR_DrawNotifyString (void) // for (j=0 ; j 5.0f) + Cvar_SetValue("r_brightness", 5.0f); -void DrawCrosshair(int num); -void GL_Set2D (void); + if (r_contrast.value < 0.2f) + Cvar_SetValue("r_contrast", 0.2f); + if (r_contrast.value > 1.0f) + Cvar_SetValue("r_contrast", 1.0f); -extern void SHOWLMP_drawall(); -extern cvar_t contrast; -extern cvar_t brightness; -extern cvar_t gl_lightmode; + if (!(lighthalf && !hardwaregammasupported) && r_brightness.value < 1.01f && r_contrast.value > 0.99f) + return; -void GL_BrightenScreen() -{ - float f; if (!r_render.value) return; + glDisable(GL_TEXTURE_2D); glEnable(GL_BLEND); - f = brightness.value = bound(1.0f, brightness.value, 5.0f); + f = r_brightness.value; + // only apply lighthalf using software color correction if hardware is not available (speed reasons) + if (lighthalf && !hardwaregammasupported) + f *= 2; if (f >= 1.01f) { glBlendFunc (GL_DST_COLOR, GL_ONE); @@ -798,17 +748,20 @@ void GL_BrightenScreen() } glEnd (); } - glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - contrast.value = bound(0.2, contrast.value, 1.0); - if (contrast.value < 0.99f) + if (r_contrast.value <= 0.99f) { + glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + if (lighthalf && hardwaregammasupported) + glColor4f (0.5, 0.5, 0.5, 1 - r_contrast.value); + else + glColor4f (1, 1, 1, 1 - r_contrast.value); glBegin (GL_TRIANGLES); - glColor4f (1, 1, 1, 1-contrast.value); glVertex2f (-5000, -5000); glVertex2f (10000, -5000); glVertex2f (-5000, 10000); glEnd (); } + glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glEnable (GL_CULL_FACE); glEnable (GL_DEPTH_TEST); @@ -826,30 +779,27 @@ text to the screen. LordHavoc: due to my rewrite of R_WorldNode, it no longer takes 256k of stack space :) ================== */ -extern cvar_t gl_vertexarrays; -extern qboolean gl_arrays; -void GL_Finish(); +void GL_Finish(void); +void R_Clip_DisplayBuffer(void); void SCR_UpdateScreen (void) { double time1 = 0, time2; if (r_speeds.value) - time1 = Sys_FloatTime (); + time1 = Sys_DoubleTime (); - if (!gl_arrays) - gl_vertexarrays.value = 0; - - scr_copytop = 0; - scr_copyeverything = 0; + VID_UpdateGamma(false); if (scr_disabled_for_loading) { + /* if (realtime - scr_disabled_time > 60) { scr_disabled_for_loading = false; Con_Printf ("load failed.\n"); } else + */ return; } @@ -858,7 +808,7 @@ void SCR_UpdateScreen (void) GL_BeginRendering (&glx, &gly, &glwidth, &glheight); - + // // determine size of refresh window // @@ -875,59 +825,48 @@ void SCR_UpdateScreen (void) } if (vid.recalc_refdef) - SCR_CalcRefdef (); + SCR_CalcRefdef(); if (r_render.value) { glClearColor(0,0,0,0); - glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // LordHavoc: clear the screen (around the view as well) + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); // LordHavoc: clear the screen (around the view as well) } // // do 3D refresh drawing, and then update the screen // - SCR_SetUpToDrawConsole (); + SCR_SetUpToDrawConsole(); - V_RenderView (); + V_RenderView(); - GL_Set2D (); + GL_Set2D(); - if (scr_drawdialog) - { - Sbar_Draw (); -// Draw_FadeScreen (); - SCR_DrawNotifyString (); - scr_copyeverything = true; - } - else if (scr_drawloading) - { - SCR_DrawLoading (); - Sbar_Draw (); - } - else if (cl.intermission == 1 && key_dest == key_game) - { - Sbar_IntermissionOverlay (); - } - else if (cl.intermission == 2 && key_dest == key_game) - { - Sbar_FinaleOverlay (); - SCR_CheckDrawCenterString (); - } - else - { - if (crosshair.value) - DrawCrosshair(crosshair.value - 1); - - SCR_DrawRam (); - SCR_DrawNet (); - SCR_DrawTurtle (); - SCR_DrawPause (); - SCR_CheckDrawCenterString (); - Sbar_Draw (); - SHOWLMP_drawall(); - SCR_DrawConsole (); - M_Draw (); - } + R_Clip_DisplayBuffer(); + + SCR_DrawRam(); + SCR_DrawNet(); + SCR_DrawTurtle(); + SCR_DrawPause(); + SCR_CheckDrawCenterString(); + Sbar_Draw(); + SHOWLMP_drawall(); + + if (crosshair.value) + DrawCrosshair(crosshair.value - 1); + + if (cl.intermission == 1) + Sbar_IntermissionOverlay(); + else if (cl.intermission == 2) + Sbar_FinaleOverlay(); + + SCR_DrawConsole(); + M_Draw(); + + ui_draw(); + +// if (scr_drawloading) +// SCR_DrawLoading(); if (showfps.value) { @@ -935,14 +874,37 @@ void SCR_UpdateScreen (void) double newtime; char temp[32]; int calc; - newtime = Sys_FloatTime(); - calc = (int) (100.0 / (newtime - currtime)); - sprintf(temp, "% 4i.%02i fps", calc / 100, calc % 100); + newtime = Sys_DoubleTime(); + calc = (int) ((1.0 / (newtime - currtime)) + 0.5); + sprintf(temp, "%4i fps", calc); currtime = newtime; - Draw_String(vid.width - (12*8), 0, temp, 9999); + Draw_String(vid.width - (8*8), vid.height - sb_lines - 8, temp, 9999); + } + + // LordHavoc: only print info if renderer is being used + if (r_speeds2.value && !con_forcedup) + { + int i, j, lines, y; + lines = 1; + for (i = 0;r_speeds2_string[i];i++) + if (r_speeds2_string[i] == '\n') + lines++; + y = vid.height - sb_lines - lines * 8 - 8; + i = j = 0; + while (r_speeds2_string[i]) + { + j = i; + while (r_speeds2_string[i] && r_speeds2_string[i] != '\n') + i++; + if (i - j > 0) + Draw_String(0, y, r_speeds2_string + j, i - j); + if (r_speeds2_string[i] == '\n') + i++; + y += 8; + } } - V_UpdateBlends (); + V_UpdateBlends(); GL_BrightenScreen(); @@ -950,14 +912,14 @@ void SCR_UpdateScreen (void) if (r_speeds.value) { - time2 = Sys_FloatTime (); - Con_Printf ("%3i ms %4i wpoly %4i epoly %4i transpoly %4i lightpoly %4i BSPnodes %4i BSPleafs\n", (int)((time2-time1)*1000), c_brush_polys, c_alias_polys, currenttranspoly, c_light_polys, c_nodes, c_leafs); + time2 = Sys_DoubleTime (); + Con_Printf ("%3i ms %4i wpoly %4i epoly %4i transpoly %4i lightpoly %4i BSPnodes %4i BSPleafs %4i BSPfaces %4i models %4i bmodels %4i sprites %4i particles %3i dlights\n", (int)((time2-time1)*1000), c_brush_polys, c_alias_polys, currenttranspoly, c_light_polys, c_nodes, c_leafs, c_faces, c_models, c_bmodels, c_sprites, c_particles, c_dlights); } GL_EndRendering (); } -// for profiling, this is seperated -void GL_Finish() +// for profiling, this is separated +void GL_Finish(void) { if (!r_render.value) return;