From 60de48ad65721925457c126aa02ac9c8b5b2c25a Mon Sep 17 00:00:00 2001 From: Alug Date: Sat, 2 Nov 2024 12:57:09 +0100 Subject: [PATCH] add accurate fps counter crap to menu + rename it to force it back on since shit more or less was broken in saturn before and always showed the more accurate one, force it again since stuff caused confusion --- src/m_menu.c | 10 +++++++--- src/screen.c | 16 ++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/m_menu.c b/src/m_menu.c index 1694880f1..4e215a9a9 100644 --- a/src/m_menu.c +++ b/src/m_menu.c @@ -1492,12 +1492,14 @@ static menuitem_t OP_ExpOptionsMenu[] = {IT_STRING | IT_CVAR, NULL, "Skyboxes", &cv_skybox, 80}, + {IT_STRING | IT_CVAR, NULL, "FPS counter sampling", &cv_accuratefps, 90}, + #ifdef HWRENDER - {IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 100}, + {IT_STRING | IT_CVAR, NULL, "Screen Textures", &cv_glscreentextures, 110}, #ifdef USE_FBO_OGL - {IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 110}, + {IT_STRING | IT_CVAR, NULL, "FBO Downsampling support", &cv_glframebuffer, 120}, #endif - {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 130}, + {IT_STRING | IT_CVAR, NULL, "Palette Depth", &cv_glpalettedepth, 140}, #endif }; @@ -1509,6 +1511,7 @@ static const char* OP_ExpTooltips[] = "Should weather be scaled with Mapobjectscale?.", "When weather is on this will cut the object amount used in half.", "Toggle being able to see the sky.", + "Change the FPS counter sampling method\nInaccurate updates slower and might miss frame drops and such\nAccurate updates faster and is more accurate, but might be less readable", // how to ingles?? #ifdef HWRENDER "Should the game do Screen Textures? Provides a good boost to frames\nat the cost of some visual effects not working when disabled.", #ifdef USE_FBO_OGL @@ -1526,6 +1529,7 @@ enum op_exp_precipmoscale, op_exp_lessprecip, op_exp_skybox, + op_exp_accuratefps, #ifdef HWRENDER op_exp_glscrtx, #ifdef USE_FBO_OGL diff --git a/src/screen.c b/src/screen.c index 22ce5e8f1..e1f6fe93e 100644 --- a/src/screen.c +++ b/src/screen.c @@ -82,7 +82,8 @@ static void SCR_ChangeFullscreen (void); consvar_t cv_fullscreen = {"fullscreen", "Yes", CV_SAVE|CV_CALL, CV_YesNo, SCR_ChangeFullscreen, 0, NULL, NULL, 0, 0, NULL}; -consvar_t cv_accuratefps = {"accuratefpscounter", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL}; +static CV_PossibleValue_t accuratefps_cons_t[] = {{0, "Inaccurate"}, {1, "Accurate"}, {0, NULL}}; +consvar_t cv_accuratefps = {"fpssampling", "1", CV_SAVE, accuratefps_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL}; // ========================================================================= // SCREEN VARIABLES @@ -354,11 +355,7 @@ void SCR_ChangeFullscreen(void) boolean SCR_IsAspectCorrect(INT32 width, INT32 height) { - return - ( width % BASEVIDWIDTH == 0 - && height % BASEVIDHEIGHT == 0 - && width / BASEVIDWIDTH == height / BASEVIDHEIGHT - ); + return (width % BASEVIDWIDTH == 0 && height % BASEVIDHEIGHT == 0 && width / BASEVIDWIDTH == height / BASEVIDHEIGHT); } double averageFPS = 0.0f; @@ -411,7 +408,6 @@ void SCR_CalculateFPS(void) if (total_frame_time >= MAX_FRAME_TIME) { static int sampleIndex = 0; - int i; fps_samples[sampleIndex] = frameElapsed; @@ -420,7 +416,7 @@ void SCR_CalculateFPS(void) sampleIndex = 0; averageFPS = 0.0; - for (i = 0; i < NUM_FPS_SAMPLES; i++) + for (int i = 0; i < NUM_FPS_SAMPLES; i++) { averageFPS += fps_samples[i]; } @@ -458,7 +454,7 @@ void SCR_DisplayTicRate(void) return; // new kart counter - if ((cv_ticrate.value == 1) || (cv_ticrate.value == 2)) + if (cv_ticrate.value == 1 || cv_ticrate.value == 2) { // draw "FPS" if (cv_ticrate.value == 1) @@ -492,7 +488,7 @@ void SCR_DisplayTicRate(void) // draw our actual framerate V_DrawPingNum(x, 190, fpsflags, fps, ticcntcolor); } - else if ((cv_ticrate.value == 3)||(cv_ticrate.value == 4)) // kart v1.0/srb2 counter + else if (cv_ticrate.value == 3 || cv_ticrate.value == 4) // kart v1.0/srb2 counter { if (fps > (benchmark - 5)) ticcntcolor2 = V_GREENMAP;