From 528ba6c9c02ed84d98017fd778986880c7b00f66 Mon Sep 17 00:00:00 2001 From: FlightlessMango Date: Mon, 24 Jul 2023 13:10:24 +0200 Subject: [PATCH] param: fps_text --- src/hud_elements.cpp | 22 +++++++++++++--------- src/overlay_params.cpp | 1 + src/overlay_params.h | 3 ++- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/hud_elements.cpp b/src/hud_elements.cpp index 570fa33f..e5978279 100644 --- a/src/hud_elements.cpp +++ b/src/hud_elements.cpp @@ -527,16 +527,20 @@ void HudElements::procmem() void HudElements::fps(){ if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_fps] && !HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_fps_only]){ ImguiNextColumnFirstItem(); - if(HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact] || HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal]) - if(HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_engine_short_names]) - HUDElements.TextColored(HUDElements.colors.engine, "%s", engines_short[HUDElements.sw_stats->engine]); - else - HUDElements.TextColored(HUDElements.colors.engine, "%s", "FPS"); - else - if(HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_engine_short_names]) - HUDElements.TextColored(HUDElements.colors.engine, "%s", engines_short[HUDElements.sw_stats->engine]); + if (HUDElements.params->fps_text.empty()){ + if(HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact] || HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal]) + if(HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_engine_short_names]) + HUDElements.TextColored(HUDElements.colors.engine, "%s", engines_short[HUDElements.sw_stats->engine]); + else + HUDElements.TextColored(HUDElements.colors.engine, "%s", "FPS"); else - HUDElements.TextColored(HUDElements.colors.engine, "%s", engines[HUDElements.sw_stats->engine]); + if(HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_engine_short_names]) + HUDElements.TextColored(HUDElements.colors.engine, "%s", engines_short[HUDElements.sw_stats->engine]); + else + HUDElements.TextColored(HUDElements.colors.engine, "%s", engines[HUDElements.sw_stats->engine]); + } else { + HUDElements.TextColored(HUDElements.colors.engine, "%s", HUDElements.params->fps_text.c_str()); + } ImguiNextColumnOrNewRow(); if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_fps_color_change]){ diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index a46a71c9..d60ea3aa 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -406,6 +406,7 @@ parse_gl_size_query(const char *str) #define parse_font_scale_media_player(s) parse_float(s) #define parse_cpu_text(s) parse_str(s) #define parse_gpu_text(s) parse_str(s) +#define parse_fps_text(s) parse_str(s) #define parse_log_interval(s) parse_unsigned(s) #define parse_font_size(s) parse_float(s) #define parse_font_size_text(s) parse_float(s) diff --git a/src/overlay_params.h b/src/overlay_params.h index ee1f425a..564af21f 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -182,6 +182,7 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(preset) \ OVERLAY_PARAM_CUSTOM(text_outline_color) \ OVERLAY_PARAM_CUSTOM(text_outline_thickness) \ + OVERLAY_PARAM_CUSTOM(fps_text) \ enum overlay_param_position { LAYER_POSITION_TOP_LEFT, @@ -279,7 +280,7 @@ struct overlay_params { std::string time_format, output_folder, output_file; std::string pci_dev; std::string media_player_name; - std::string cpu_text, gpu_text; + std::string cpu_text, gpu_text, fps_text; std::vector blacklist; unsigned autostart_log; std::vector media_player_format;