Archives
/
MangoHud
mirror of https://github.com/flightlessmango/MangoHud
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Text outline

Browse Source 
Adds the text_outline parameter that draws a black outline around all
text and the horizontal separator

[skip ci]
pull/1028/head
FlightlessMango 11 months ago
parent 3efc2c05ee
commit 67862421a6
7 changed files with 174 additions and 100 deletions
Show Stats Download Patch File Download Diff File

5
data/MangoHud.conf
Unescape Escape View File

@ -169,6 +169,11 @@ frame_timing
## If you experience crashes or text is just squares, reduce glyph range or reduce font size
# font_glyph_ranges=korean,chinese,chinese_simplified,japanese,cyrillic,thai,vietnamese,latin_ext_a,latin_ext_b
### Outline text
text_outline
# text_outline_color = 000000
# text_outline_thickness = 1.5
### Change the hud position
# position=top-left

188
src/hud_elements.cpp
Unescape Escape View File

@ -106,6 +106,17 @@ void HudElements::convert_colors(bool do_conv, const struct overlay_params& para
convert_colors(params);
}
void HudElements::TextColored(ImVec4 col, const char *fmt, ...){
auto textColor = ImGui::ColorConvertFloat4ToU32(col);
char buffer[32] {};
va_list args;
va_start(args, fmt);
vsnprintf(buffer, sizeof(buffer), fmt, args);
va_end(args);
RenderOutlinedText(buffer, textColor);
}
static void ImguiNextColumnFirstItem()
{
@ -138,14 +149,14 @@ static void ImGuiTableSetColumnIndex(int column)
void HudElements::time(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_time]){
ImguiNextColumnFirstItem();
ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 1.00f), "%s", HUDElements.sw_stats->time.c_str());
HUDElements.TextColored(ImVec4(1.0f, 1.0f, 1.0f, 1.00f), "%s", HUDElements.sw_stats->time.c_str());
}
}
void HudElements::version(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_version]){
ImguiNextColumnFirstItem();
ImGui::Text("%s", MANGOHUD_VERSION);
HUDElements.TextColored(HUDElements.colors.text, "%s", MANGOHUD_VERSION);
}
}
@ -157,8 +168,7 @@ void HudElements::gpu_stats(){
gpu_text = "GPU";
else
gpu_text = HUDElements.params->gpu_text.c_str();
ImGui::TextColored(HUDElements.colors.gpu, "%s", gpu_text);
ImguiNextColumnOrNewRow();
HUDElements.TextColored(HUDElements.colors.gpu, "%s", gpu_text); ImguiNextColumnOrNewRow();
auto text_color = HUDElements.colors.text;
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_gpu_load_change]){
struct LOAD_DATA gpu_data = {
@ -172,12 +182,12 @@ void HudElements::gpu_stats(){
auto load_color = change_on_load_temp(gpu_data, gpu_info.load);
right_aligned_text(load_color, HUDElements.ralign_width, "%i", gpu_info.load);
ImGui::SameLine(0, 1.0f);
ImGui::TextColored(load_color,"%%");
HUDElements.TextColored(load_color,"%%");
}
else {
right_aligned_text(text_color, HUDElements.ralign_width, "%i", gpu_info.load);
ImGui::SameLine(0, 1.0f);
ImGui::TextColored(text_color,"%%");
HUDElements.TextColored(text_color,"%%");
// ImGui::SameLine(150);
// ImGui::Text("%s", "%");
}
@ -187,19 +197,19 @@ void HudElements::gpu_stats(){
right_aligned_text(text_color, HUDElements.ralign_width, "%i", gpu_info.temp);
ImGui::SameLine(0, 1.0f);
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact])
ImGui::Text("°");
HUDElements.TextColored(HUDElements.colors.text, "°");
else
ImGui::Text("°C");
HUDElements.TextColored(HUDElements.colors.text, "°C");
}
if (gpu_info.junction_temp > -1 && HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_gpu_junction_temp]) {
ImguiNextColumnOrNewRow();
right_aligned_text(text_color, HUDElements.ralign_width, "%i", gpu_info.junction_temp);
ImGui::SameLine(0, 1.0f);
ImGui::Text("°C");
HUDElements.TextColored(HUDElements.colors.text, "°C");
ImGui::SameLine(0, 1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("Jnc");
HUDElements.TextColored(HUDElements.colors.text, "Jnc");
ImGui::PopFont();
}
@ -208,7 +218,7 @@ void HudElements::gpu_stats(){
right_aligned_text(text_color, HUDElements.ralign_width, "%i", gpu_info.fan_speed);
ImGui::SameLine(0, 1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("RPM");
HUDElements.TextColored(HUDElements.colors.text, "RPM");
ImGui::PopFont();
}
@ -217,7 +227,7 @@ void HudElements::gpu_stats(){
right_aligned_text(text_color, HUDElements.ralign_width, "%i", gpu_info.CoreClock);
ImGui::SameLine(0, 1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("MHz");
HUDElements.TextColored(HUDElements.colors.text, "MHz");
ImGui::PopFont();
}
@ -231,7 +241,7 @@ void HudElements::gpu_stats(){
right_aligned_text(text_color, HUDElements.ralign_width, "%.1f", gpu_info.powerUsage);
ImGui::SameLine(0, 1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("W");
HUDElements.TextColored(HUDElements.colors.text, "W");
ImGui::PopFont();
}
}
@ -246,7 +256,7 @@ void HudElements::cpu_stats(){
else
cpu_text = HUDElements.params->cpu_text.c_str();
ImGui::TextColored(HUDElements.colors.cpu, "%s", cpu_text);
HUDElements.TextColored(HUDElements.colors.cpu, "%s", cpu_text);
ImguiNextColumnOrNewRow();
auto text_color = HUDElements.colors.text;
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_cpu_load_change]){
@ -262,12 +272,12 @@ void HudElements::cpu_stats(){
auto load_color = change_on_load_temp(cpu_data, cpu_load_percent);
right_aligned_text(load_color, HUDElements.ralign_width, "%d", cpu_load_percent);
ImGui::SameLine(0, 1.0f);
ImGui::TextColored(load_color, "%%");
HUDElements.TextColored(load_color, "%%");
}
else {
right_aligned_text(text_color, HUDElements.ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent));
ImGui::SameLine(0, 1.0f);
ImGui::Text("%%");
HUDElements.TextColored(HUDElements.colors.text, "%%");
}
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_cpu_temp]){
@ -275,9 +285,9 @@ void HudElements::cpu_stats(){
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%i", cpuStats.GetCPUDataTotal().temp);
ImGui::SameLine(0, 1.0f);
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact])
ImGui::Text("°");
HUDElements.TextColored(HUDElements.colors.text, "°");
else
ImGui::Text("°C");
HUDElements.TextColored(HUDElements.colors.text, "°C");
}
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_cpu_mhz]){
@ -285,7 +295,7 @@ void HudElements::cpu_stats(){
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%i", cpuStats.GetCPUDataTotal().cpu_mhz);
ImGui::SameLine(0, 1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("MHz");
HUDElements.TextColored(HUDElements.colors.text, "MHz");
ImGui::PopFont();
}
@ -299,7 +309,7 @@ void HudElements::cpu_stats(){
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", cpuStats.GetCPUDataTotal().power);
ImGui::SameLine(0, 1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("W");
HUDElements.TextColored(HUDElements.colors.text, "W");
ImGui::PopFont();
}
}
@ -310,10 +320,10 @@ void HudElements::core_load(){
for (const CPUData &cpuData : cpuStats.GetCPUData())
{
ImguiNextColumnFirstItem();
ImGui::TextColored(HUDElements.colors.cpu, "CPU");
HUDElements.TextColored(HUDElements.colors.cpu, "CPU");
ImGui::SameLine(0, 1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.cpu,"%i", cpuData.cpu_id);
HUDElements.TextColored(HUDElements.colors.cpu,"%i", cpuData.cpu_id);
ImGui::PopFont();
ImguiNextColumnOrNewRow();
auto text_color = HUDElements.colors.text;
@ -329,19 +339,19 @@ void HudElements::core_load(){
auto load_color = change_on_load_temp(cpu_data, cpu_load_percent);
right_aligned_text(load_color, HUDElements.ralign_width, "%d", cpu_load_percent);
ImGui::SameLine(0, 1.0f);
ImGui::TextColored(load_color, "%%");
HUDElements.TextColored(load_color, "%%");
ImguiNextColumnOrNewRow();
}
else {
right_aligned_text(text_color, HUDElements.ralign_width, "%i", int(cpuData.percent));
ImGui::SameLine(0, 1.0f);
ImGui::Text("%%");
HUDElements.TextColored(HUDElements.colors.text, "%%");
ImguiNextColumnOrNewRow();
}
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%i", cpuData.mhz);
ImGui::SameLine(0, 1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("MHz");
HUDElements.TextColored(HUDElements.colors.text, "MHz");
ImGui::PopFont();
}
}
@ -352,11 +362,11 @@ void HudElements::io_stats(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_io_read] || HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_io_write]){
ImguiNextColumnFirstItem();
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_io_read] && !HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_io_write])
ImGui::TextColored(HUDElements.colors.io, "IO RD");
HUDElements.TextColored(HUDElements.colors.io, "IO RD");
else if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_io_read] && HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_io_write])
ImGui::TextColored(HUDElements.colors.io, "IO RW");
HUDElements.TextColored(HUDElements.colors.io, "IO RW");
else if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_io_write] && !HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_io_read])
ImGui::TextColored(HUDElements.colors.io, "IO WR");
HUDElements.TextColored(HUDElements.colors.io, "IO WR");
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_io_read]){
ImguiNextColumnOrNewRow();
@ -364,7 +374,7 @@ void HudElements::io_stats(){
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, val < 100 ? "%.1f" : "%.f", val);
ImGui::SameLine(0,1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("MiB/s");
HUDElements.TextColored(HUDElements.colors.text, "MiB/s");
ImGui::PopFont();
}
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_io_write]){
@ -373,7 +383,7 @@ void HudElements::io_stats(){
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, val < 100 ? "%.1f" : "%.f", val);
ImGui::SameLine(0,1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("MiB/s");
HUDElements.TextColored(HUDElements.colors.text, "MiB/s");
ImGui::PopFont();
}
}
@ -383,7 +393,7 @@ void HudElements::io_stats(){
void HudElements::vram(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_vram]){
ImguiNextColumnFirstItem();
ImGui::TextColored(HUDElements.colors.vram, "VRAM");
HUDElements.TextColored(HUDElements.colors.vram, "VRAM");
ImguiNextColumnOrNewRow();
// Add gtt_used to vram usage for APUs
if (cpuStats.cpu_type == "APU")
@ -392,14 +402,14 @@ void HudElements::vram(){
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", gpu_info.memoryUsed);
ImGui::SameLine(0,1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("GiB");
HUDElements.TextColored(HUDElements.colors.text, "GiB");
ImGui::PopFont();
if (gpu_info.memory_temp > -1 && HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_gpu_mem_temp]) {
ImguiNextColumnOrNewRow();
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%i", gpu_info.memory_temp);
ImGui::SameLine(0, 1.0f);
ImGui::Text("°C");
HUDElements.TextColored(HUDElements.colors.text, "°C");
}
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_gpu_mem_clock]){
@ -407,7 +417,7 @@ void HudElements::vram(){
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%i", gpu_info.MemClock);
ImGui::SameLine(0, 1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("MHz");
HUDElements.TextColored(HUDElements.colors.text, "MHz");
ImGui::PopFont();
}
}
@ -417,13 +427,13 @@ void HudElements::ram(){
#ifdef __linux__
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_ram]){
ImguiNextColumnFirstItem();
ImGui::TextColored(HUDElements.colors.ram, "RAM");
HUDElements.TextColored(HUDElements.colors.ram, "RAM");
ImguiNextColumnOrNewRow();
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", memused);
if (!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact]){
ImGui::SameLine(0,1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("GiB");
HUDElements.TextColored(HUDElements.colors.text, "GiB");
ImGui::PopFont();
}
}
@ -433,7 +443,7 @@ void HudElements::ram(){
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", swapused);
ImGui::SameLine(0,1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("GiB");
HUDElements.TextColored(HUDElements.colors.text, "GiB");
ImGui::PopFont();
}
#endif
@ -447,12 +457,12 @@ void HudElements::procmem()
return;
ImguiNextColumnFirstItem();
ImGui::TextColored(HUDElements.colors.ram, "PMEM");
HUDElements.TextColored(HUDElements.colors.ram, "PMEM");
ImguiNextColumnOrNewRow();
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", format_units(proc_mem.resident, unit));
ImGui::SameLine(0,1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("%s", unit);
HUDElements.TextColored(HUDElements.colors.text, "%s", unit);
ImGui::PopFont();
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_procmem_shared]){
@ -460,7 +470,7 @@ void HudElements::procmem()
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", format_units(proc_mem.shared, unit));
ImGui::SameLine(0,1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("%s", unit);
HUDElements.TextColored(HUDElements.colors.text, "%s", unit);
ImGui::PopFont();
}
@ -469,7 +479,7 @@ void HudElements::procmem()
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", format_units(proc_mem.virt, unit));
ImGui::SameLine(0,1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("%s", unit);
HUDElements.TextColored(HUDElements.colors.text, "%s", unit);
ImGui::PopFont();
}
#endif
@ -480,14 +490,14 @@ void HudElements::fps(){
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])
ImGui::TextColored(HUDElements.colors.engine, "%s", engines_short[HUDElements.sw_stats->engine]);
HUDElements.TextColored(HUDElements.colors.engine, "%s", engines_short[HUDElements.sw_stats->engine]);
else
ImGui::TextColored(HUDElements.colors.engine, "%s", "FPS");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "FPS");
else
if(HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_engine_short_names])
ImGui::TextColored(HUDElements.colors.engine, "%s", engines_short[HUDElements.sw_stats->engine]);
HUDElements.TextColored(HUDElements.colors.engine, "%s", engines_short[HUDElements.sw_stats->engine]);
else
ImGui::TextColored(HUDElements.colors.engine, "%s", engines[HUDElements.sw_stats->engine]);
HUDElements.TextColored(HUDElements.colors.engine, "%s", engines[HUDElements.sw_stats->engine]);
ImguiNextColumnOrNewRow();
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_fps_color_change]){
@ -508,7 +518,7 @@ void HudElements::fps(){
ImGui::SameLine(0, 1.0f);
if(!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact] && !HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal]){
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("FPS");
HUDElements.TextColored(HUDElements.colors.text, "FPS");
ImGui::PopFont();
}
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_frametime]){
@ -516,12 +526,12 @@ void HudElements::fps(){
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", 1000 / HUDElements.sw_stats->fps);
ImGui::SameLine(0, 1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("ms");
HUDElements.TextColored(HUDElements.colors.text, "ms");
ImGui::PopFont();
}
} else if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_engine_version]){
ImguiNextColumnOrNewRow();
ImGui::TextColored(HUDElements.colors.engine, "%s", HUDElements.sw_stats->engineName.c_str());
HUDElements.TextColored(HUDElements.colors.engine, "%s", HUDElements.sw_stats->engineName.c_str());
}
}
@ -540,7 +550,7 @@ void HudElements::fps_only(){
};
load_color = change_on_load_temp(fps_data, fps);
}
ImGui::TextColored(load_color, "%.0f", HUDElements.sw_stats->fps);
HUDElements.TextColored(load_color, "%.0f", HUDElements.sw_stats->fps);
}
}
@ -548,7 +558,7 @@ void HudElements::gpu_name(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_gpu_name] && !HUDElements.sw_stats->gpuName.empty()){
ImguiNextColumnFirstItem();
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.engine,
HUDElements.TextColored(HUDElements.colors.engine,
"%s", HUDElements.sw_stats->gpuName.c_str());
ImGui::PopFont();
}
@ -560,20 +570,20 @@ void HudElements::engine_version(){
ImGui::PushFont(HUDElements.sw_stats->font1);
if (HUDElements.is_vulkan) {
if ((HUDElements.sw_stats->engine == EngineTypes::DXVK || HUDElements.sw_stats->engine == EngineTypes::VKD3D)){
ImGui::TextColored(HUDElements.colors.engine,
HUDElements.TextColored(HUDElements.colors.engine,
"%s/%d.%d.%d", HUDElements.sw_stats->engineVersion.c_str(),
HUDElements.sw_stats->version_vk.major,
HUDElements.sw_stats->version_vk.minor,
HUDElements.sw_stats->version_vk.patch);
} else {
ImGui::TextColored(HUDElements.colors.engine,
HUDElements.TextColored(HUDElements.colors.engine,
"%d.%d.%d",
HUDElements.sw_stats->version_vk.major,
HUDElements.sw_stats->version_vk.minor,
HUDElements.sw_stats->version_vk.patch);
}
} else {
ImGui::TextColored(HUDElements.colors.engine,
HUDElements.TextColored(HUDElements.colors.engine,
"%d.%d%s", HUDElements.sw_stats->version_gl.major, HUDElements.sw_stats->version_gl.minor,
HUDElements.sw_stats->version_gl.is_gles ? " ES" : "");
}
@ -585,7 +595,7 @@ void HudElements::vulkan_driver(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_vulkan_driver] && !HUDElements.sw_stats->driverName.empty()){
ImguiNextColumnFirstItem();
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.engine,
HUDElements.TextColored(HUDElements.colors.engine,
"%s", HUDElements.sw_stats->driverName.c_str());
ImGui::PopFont();
}
@ -595,7 +605,7 @@ void HudElements::arch(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_arch]){
ImguiNextColumnFirstItem();
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.engine, "%s", "" MANGOHUD_ARCH);
HUDElements.TextColored(HUDElements.colors.engine, "%s", "" MANGOHUD_ARCH);
ImGui::PopFont();
}
}
@ -605,7 +615,7 @@ void HudElements::wine(){
ImguiNextColumnFirstItem();
if (!wineVersion.empty()){
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.wine, "%s", wineVersion.c_str());
HUDElements.TextColored(HUDElements.colors.wine, "%s", wineVersion.c_str());
ImGui::PopFont();
}
}
@ -617,7 +627,7 @@ void HudElements::frame_timing(){
ImGui::PushFont(HUDElements.sw_stats->font1);
if (!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal] && !HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact]){
ImGui::Dummy(ImVec2(0.0f, real_font_size.y));
ImGui::TextColored(HUDElements.colors.engine, "%s", "Frametime");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "Frametime");
ImGui::TableSetColumnIndex(ImGui::TableGetColumnCount() - 1);
ImGui::Dummy(ImVec2(0.0f, real_font_size.y));
right_aligned_text(HUDElements.colors.text, ImGui::GetContentRegionAvail().x, "min: %.1fms, max: %.1fms", min_frametime, max_frametime);
@ -633,7 +643,7 @@ void HudElements::frame_timing(){
float width, height = 0;
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal]){
width = 150;
height = 24;
height = HUDElements.params->font_size;
} else {
width = ImGui::GetWindowContentRegionWidth();
height = max_time;
@ -684,7 +694,7 @@ void HudElements::resolution(){
ImguiNextColumnFirstItem();
const auto res = ImGui::GetIO().DisplaySize;
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.engine, "Resolution");
HUDElements.TextColored(HUDElements.colors.engine, "Resolution");
ImguiNextColumnOrNewRow();
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width * 1.3, "%.0fx%.0f", res.x, res.y);
ImGui::PopFont();
@ -699,7 +709,7 @@ void HudElements::show_fps_limit(){
ImguiNextColumnFirstItem();
ImGui::PushFont(HUDElements.sw_stats->font1);
const char* method = fps_limit_stats.method == FPS_LIMIT_METHOD_EARLY ? "early" : "late";
ImGui::TextColored(HUDElements.colors.engine, "%s (%s)","FPS limit",method);
HUDElements.TextColored(HUDElements.colors.engine, "%s (%s)","FPS limit",method);
ImguiNextColumnOrNewRow();
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%i", fps);
ImGui::PopFont();
@ -711,7 +721,7 @@ void HudElements::custom_text_center(){
ImGui::PushFont(HUDElements.sw_stats->font1);
const std::string& value = HUDElements.ordered_functions[HUDElements.place].second;
center_text(value);
ImGui::TextColored(HUDElements.colors.text, "%s",value.c_str());
HUDElements.TextColored(HUDElements.colors.text, "%s",value.c_str());
ImGui::NewLine();
ImGui::PopFont();
}
@ -720,7 +730,7 @@ void HudElements::custom_text(){
ImguiNextColumnFirstItem();
ImGui::PushFont(HUDElements.sw_stats->font1);
const std::string& value = HUDElements.ordered_functions[HUDElements.place].second;
ImGui::TextColored(HUDElements.colors.text, "%s",value.c_str());
HUDElements.TextColored(HUDElements.colors.text, "%s",value.c_str());
ImGui::PopFont();
}
@ -730,7 +740,7 @@ void HudElements::_exec(){
ImguiNextColumnFirstItem();
for (auto& item : HUDElements.exec_list){
if (item.pos == HUDElements.place)
ImGui::Text("%s", item.ret.c_str());
HUDElements.TextColored(HUDElements.colors.text, "%s", item.ret.c_str());
}
ImGui::PopFont();
}
@ -739,7 +749,7 @@ void HudElements::gamemode(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_gamemode]){
ImguiNextColumnFirstItem();
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.engine, "%s", "GAMEMODE");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "GAMEMODE");
ImguiNextColumnOrNewRow();
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", HUDElements.gamemode_bol ? "ON" : "OFF");
ImGui::PopFont();
@ -750,7 +760,7 @@ void HudElements::vkbasalt(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_vkbasalt]){
ImguiNextColumnFirstItem();
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.engine, "%s", "VKBASALT");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "VKBASALT");
ImguiNextColumnOrNewRow();
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%s", HUDElements.vkbasalt_bol ? "ON" : "OFF");
ImGui::PopFont();
@ -763,9 +773,9 @@ void HudElements::battery(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery]) {
ImguiNextColumnFirstItem();
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact])
ImGui::TextColored(HUDElements.colors.battery, "BAT");
HUDElements.TextColored(HUDElements.colors.battery, "BAT");
else
ImGui::TextColored(HUDElements.colors.battery, "BATT");
HUDElements.TextColored(HUDElements.colors.battery, "BATT");
ImguiNextColumnOrNewRow();
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_icon]) {
switch(int(Battery_Stats.current_percent)){
@ -786,7 +796,7 @@ void HudElements::battery(){
else {
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.0f", Battery_Stats.current_percent);
ImGui::SameLine(0,1.0f);
ImGui::Text("%%");
HUDElements.TextColored(HUDElements.colors.text, "%%");
}
if (Battery_Stats.current_watt != 0) {
printf("%i\n", HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_watt]);
@ -795,7 +805,7 @@ void HudElements::battery(){
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", Battery_Stats.current_watt);
ImGui::SameLine(0,1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("W");
HUDElements.TextColored(HUDElements.colors.text, "W");
ImGui::PopFont();
}
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_battery_time]) {
@ -808,7 +818,7 @@ void HudElements::battery(){
ImGui::NextColumn();
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGuiTableSetColumnIndex(0);
ImGui::TextColored(HUDElements.colors.text, "%s", "Remaining Time");
HUDElements.TextColored(HUDElements.colors.text, "%s", "Remaining Time");
ImGui::PopFont();
ImGuiTableSetColumnIndex(2);
} else {
@ -842,7 +852,7 @@ void HudElements::gamescope_fsr(){
FSR_COLOR = HUDElements.colors.fps_value_low;
}
ImGui::TextColored(HUDElements.colors.engine, "%s", "FSR");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "FSR");
ImguiNextColumnOrNewRow();
right_aligned_text(FSR_COLOR, HUDElements.ralign_width, "%s", FSR_TEXT.c_str());
if (HUDElements.g_fsrUpscale){
@ -851,7 +861,7 @@ void HudElements::gamescope_fsr(){
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%i", HUDElements.g_fsrSharpness);
ImGui::SameLine(0,1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("Sharp");
HUDElements.TextColored(HUDElements.colors.text, "Sharp");
ImGui::PopFont();
}
}
@ -867,7 +877,7 @@ void HudElements::gamescope_frame_timing(){
ImguiNextColumnFirstItem();
ImGui::Dummy(ImVec2(0.0f, real_font_size.y));
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.engine, "%s", "App");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "App");
ImGui::TableNextRow();
ImGui::Dummy(ImVec2(0.0f, real_font_size.y));
auto min = std::min_element(HUDElements.gamescope_debug_app.begin(),
@ -897,7 +907,7 @@ void HudElements::gamescope_frame_timing(){
ImguiNextColumnOrNewRow();
ImGui::Dummy(ImVec2(0.0f, real_font_size.y));
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.engine, "%s", "Latency");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "Latency");
ImGui::TableNextRow();
ImGui::Dummy(ImVec2(0.0f, real_font_size.y));
min = std::min_element(HUDElements.gamescope_debug_latency.begin(),
@ -935,7 +945,7 @@ void HudElements::gamepad_battery()
ImguiNextColumnFirstItem();
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.engine, "%s", name.c_str());
HUDElements.TextColored(HUDElements.colors.engine, "%s", name.c_str());
ImguiNextColumnOrNewRow();
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_gamepad_battery_icon]) {
if (charging)
@ -959,7 +969,7 @@ void HudElements::gamepad_battery()
else if (report_percent) {
right_aligned_text(HUDElements.colors.text,HUDElements.ralign_width, "%s", battery_percent.c_str());
ImGui::SameLine(0,1.0f);
ImGui::Text("%%");
HUDElements.TextColored(HUDElements.colors.text, "%%");
}
else {
if (battery == "Unknown")
@ -979,7 +989,7 @@ void HudElements::frame_count(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_frame_count]){
ImguiNextColumnFirstItem();
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::TextColored(HUDElements.colors.engine, "Frame Count");
HUDElements.TextColored(HUDElements.colors.engine, "Frame Count");
ImguiNextColumnOrNewRow();
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%" PRIu64, HUDElements.sw_stats->n_frames);
ImGui::PopFont();
@ -989,12 +999,12 @@ void HudElements::frame_count(){
void HudElements::fan(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_fan] && fan_speed != -1) {
ImguiNextColumnFirstItem();
ImGui::TextColored(HUDElements.colors.engine, "%s", "FAN");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "FAN");
ImguiNextColumnOrNewRow();
right_aligned_text(HUDElements.colors.text,HUDElements.ralign_width, "%i", fan_speed);
ImGui::SameLine(0, 1.0f);
ImGui::PushFont(HUDElements.sw_stats->font1);
ImGui::Text("RPM");
HUDElements.TextColored(HUDElements.colors.text, "RPM");
ImGui::PopFont();
}
}
@ -1003,7 +1013,7 @@ void HudElements::throttling_status(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_throttling_status]){
if (gpu_info.is_power_throttled || gpu_info.is_current_throttled || gpu_info.is_temp_throttled || gpu_info.is_other_throttled){
ImguiNextColumnFirstItem();
ImGui::TextColored(HUDElements.colors.engine, "%s", "Throttling");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "Throttling");
ImguiNextColumnOrNewRow();
ImguiNextColumnOrNewRow();
if (gpu_info.is_power_throttled)
@ -1032,7 +1042,7 @@ void HudElements::graphs(){
}
HUDElements.max = 100;
HUDElements.min = 0;
ImGui::TextColored(HUDElements.colors.engine, "%s", "CPU Load");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "CPU Load");
}
if (value == "gpu_load"){
@ -1041,7 +1051,7 @@ void HudElements::graphs(){
}
HUDElements.max = 100;
HUDElements.min = 0;
ImGui::TextColored(HUDElements.colors.engine, "%s", "GPU Load");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "GPU Load");
}
if (value == "cpu_temp"){
@ -1053,7 +1063,7 @@ void HudElements::graphs(){
HUDElements.max = HUDElements.cpu_temp_max;
HUDElements.min = 0;
ImGui::TextColored(HUDElements.colors.engine, "%s", "CPU Temp");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "CPU Temp");
}
if (value == "gpu_temp"){
@ -1065,7 +1075,7 @@ void HudElements::graphs(){
HUDElements.max = HUDElements.gpu_temp_max;
HUDElements.min = 0;
ImGui::TextColored(HUDElements.colors.engine, "%s", "GPU Temp");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "GPU Temp");
}
if (value == "gpu_core_clock"){
@ -1077,7 +1087,7 @@ void HudElements::graphs(){
HUDElements.max = HUDElements.gpu_core_max;
HUDElements.min = 0;
ImGui::TextColored(HUDElements.colors.engine, "%s", "GPU Core Clock");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "GPU Core Clock");
}
if (value == "gpu_mem_clock"){
@ -1089,7 +1099,7 @@ void HudElements::graphs(){
HUDElements.max = HUDElements.gpu_mem_max;
HUDElements.min = 0;
ImGui::TextColored(HUDElements.colors.engine, "%s", "GPU Mem Clock");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "GPU Mem Clock");
}
if (value == "vram"){
@ -1099,7 +1109,7 @@ void HudElements::graphs(){
HUDElements.max = gpu_info.memoryTotal;
HUDElements.min = 0;
ImGui::TextColored(HUDElements.colors.engine, "%s", "VRAM");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "VRAM");
}
#ifdef __linux__
if (value == "ram"){
@ -1111,7 +1121,7 @@ void HudElements::graphs(){
HUDElements.max = memmax;
HUDElements.min = 0;
ImGui::TextColored(HUDElements.colors.engine, "%s", "RAM");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "RAM");
}
#endif
ImGui::PopFont();
@ -1137,7 +1147,7 @@ void HudElements::exec_name(){
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_exec_name]){
ImGui::PushFont(HUDElements.sw_stats->font1);
ImguiNextColumnFirstItem();
ImGui::TextColored(HUDElements.colors.engine, "%s", "Exe name");
HUDElements.TextColored(HUDElements.colors.engine, "%s", "Exe name");
ImguiNextColumnOrNewRow();
ImVec2 text_size = ImGui::CalcTextSize(global_proc_name.c_str());
right_aligned_text(HUDElements.colors.text, text_size.x, global_proc_name.c_str());

1
src/hud_elements.h
Unescape Escape View File

@ -101,6 +101,7 @@ class HudElements{
fps_value_high;
} colors {};
void TextColored(ImVec4 col, const char *fmt, ...);
};
extern HudElements HUDElements;

68
src/overlay.cpp
Unescape Escape View File

@ -378,6 +378,32 @@ void position_layer(struct swapchain_stats& data, const struct overlay_params& p
}
}
void RenderOutlinedText(const char* text, ImU32 textColor) {
ImGuiWindow* window = ImGui::GetCurrentWindow();
ImGuiContext& g = *GImGui;
const ImGuiStyle& style = g.Style;
float outlineThickness = HUDElements.params->text_outline_thickness;
ImVec2 textSize = ImGui::CalcTextSize(text);
ImVec4 colorVec4 = ImGui::ColorConvertU32ToFloat4(HUDElements.params->text_outline_color);
colorVec4.w = 1;
ImU32 outlineColor = ImGui::ColorConvertFloat4ToU32(colorVec4);
ImVec2 pos = window->DC.CursorPos;
ImDrawList* drawList = ImGui::GetWindowDrawList();
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_text_outline] && outlineThickness > 0.0f) {
drawList->AddText(ImGui::GetFont(), ImGui::GetFontSize(), ImVec2(pos.x - outlineThickness, pos.y), outlineColor, text);
drawList->AddText(ImGui::GetFont(), ImGui::GetFontSize(), ImVec2(pos.x + outlineThickness, pos.y), outlineColor, text);
drawList->AddText(ImGui::GetFont(), ImGui::GetFontSize(), ImVec2(pos.x, pos.y - outlineThickness), outlineColor, text);
drawList->AddText(ImGui::GetFont(), ImGui::GetFontSize(), ImVec2(pos.x, pos.y + outlineThickness), outlineColor, text);
}
drawList->AddText(ImGui::GetFont(), ImGui::GetFontSize(), pos, textColor, text);
ImGui::ItemSize(textSize, style.FramePadding.y);
}
void right_aligned_text(ImVec4& col, float off_x, const char *fmt, ...)
{
ImVec2 pos = ImGui::GetCursorPos();
@ -392,8 +418,8 @@ void right_aligned_text(ImVec4& col, float off_x, const char *fmt, ...)
ImVec2 sz = ImGui::CalcTextSize(buffer);
ImGui::SetCursorPosX(pos.x + off_x - sz.x);
}
ImGui::TextColored(col,"%s", buffer);
RenderOutlinedText(buffer, ImGui::ColorConvertFloat4ToU32(col));
// ImGui::TextColored(col,"%s", buffer);
}
void center_text(const std::string& text)
@ -475,11 +501,11 @@ void render_mpris_metadata(const struct overlay_params& params, mutexed_metadata
if (fmt.text.empty()) continue;
new_pos = get_ticker_limited_pos(meta.ticker.pos, fmt.width, left_limit, right_limit);
ImGui::SetCursorPosX(new_pos);
ImGui::TextColored(color, "%s", fmt.text.c_str());
HUDElements.TextColored(color, "%s", fmt.text.c_str());
}
if (!meta.meta.playing) {
ImGui::TextColored(color, "(paused)");
HUDElements.TextColored(color, "(paused)");
}
//ImGui::PopFont();
@ -579,13 +605,33 @@ ImVec4 change_on_load_temp(LOAD_DATA& data, unsigned current)
}
}
void horizontal_separator(struct overlay_params& params){
ImGui::SameLine();
ImGui::Spacing();
ImGui::SameLine();
ImGui::GetWindowDrawList()->AddLine(ImVec2(ImGui::GetCursorScreenPos().x - 5, ImGui::GetCursorScreenPos().y + 2), ImVec2(ImGui::GetCursorScreenPos().x - 5, ImGui::GetCursorScreenPos().y + params.font_size * 0.85), params.vram_color, 2);
ImGui::SameLine();
ImGui::Spacing();
void horizontal_separator(struct overlay_params& params) {
ImGui::SameLine();
ImGui::Spacing();
ImGui::SameLine();
ImDrawList* drawList = ImGui::GetWindowDrawList();
ImVec2 cursorPos = ImGui::GetCursorScreenPos();
ImVec2 startPos(cursorPos.x - 5, cursorPos.y + 2);
ImVec2 endPos(startPos.x, cursorPos.y + params.font_size * 0.85);
float outlineThickness = 1.0f;
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_text_outline]){
// Draw the black outline
drawList->AddLine(ImVec2(startPos.x - outlineThickness, startPos.y), ImVec2(startPos.x - outlineThickness, endPos.y), IM_COL32_BLACK, outlineThickness + 2);
drawList->AddLine(ImVec2(startPos.x + outlineThickness, startPos.y), ImVec2(startPos.x + outlineThickness, endPos.y), IM_COL32_BLACK, outlineThickness + 2);
drawList->AddLine(ImVec2(startPos.x - outlineThickness, startPos.y - outlineThickness/2), ImVec2(startPos.x + outlineThickness, startPos.y - outlineThickness/2), IM_COL32_BLACK, outlineThickness + 2);
drawList->AddLine(ImVec2(startPos.x - outlineThickness, endPos.y + outlineThickness/2), ImVec2(startPos.x + outlineThickness, endPos.y + outlineThickness/2), IM_COL32_BLACK, outlineThickness + 2);
} else {
outlineThickness *= 2;
}
// Draw the separator line
drawList->AddLine(startPos, endPos, params.vram_color, outlineThickness);
ImGui::SameLine();
ImGui::Spacing();
}
void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& window_size, bool is_vulkan)

2
src/overlay.h
Unescape Escape View File

@ -7,6 +7,7 @@
#include <vector>
#include <deque>
#include <imgui.h>
#include "imgui_internal.h"
#include "overlay_params.h"
#include "hud_elements.h"
#include "engine_types.h"
@ -120,4 +121,5 @@ void render_mpris_metadata(const overlay_params& params, mutexed_metadata& meta,
void update_fan();
void next_hud_position(struct overlay_params& params);
void horizontal_separator(struct overlay_params& params);
void RenderOutlinedText(const char* text, ImU32 textColor);
#endif //MANGOHUD_OVERLAY_H

5
src/overlay_params.cpp
Unescape Escape View File

@ -449,6 +449,8 @@ parse_gl_size_query(const char *str)
#define parse_battery_color(s) parse_color(s)
#define parse_media_player_format(s) parse_str_tokenize(s, ";", false)
#define parse_fsr_steam_sharpness(s) parse_float(s)
#define parse_text_outline_color(s) parse_color(s)
#define parse_text_outline_thickness(s) parse_float(s)
static bool
parse_help(const char *str)
@ -612,6 +614,7 @@ static void set_param_defaults(struct overlay_params *params){
params->enabled[OVERLAY_PARAM_ENABLED_fcat] = false;
params->enabled[OVERLAY_PARAM_ENABLED_horizontal_stretch] = true;
params->enabled[OVERLAY_PARAM_ENABLED_engine_short_names] = false;
params->enabled[OVERLAY_PARAM_ENABLED_text_outline] = true;
params->fps_sampling_period = 500000000; /* 500ms */
params->width = 0;
params->height = 140;
@ -660,6 +663,8 @@ static void set_param_defaults(struct overlay_params *params){
params->preset = -1;
params->font_size = 24;
params->table_columns = 3;
params->text_outline_color = 0x000000;
params->text_outline_thickness = 1.5;
}
void

5
src/overlay_params.h
Unescape Escape View File

@ -99,6 +99,7 @@ typedef unsigned long KeySym;
OVERLAY_PARAM_BOOL(retro) \
OVERLAY_PARAM_BOOL(gpu_fan) \
OVERLAY_PARAM_BOOL(engine_short_names) \
OVERLAY_PARAM_BOOL(text_outline) \
OVERLAY_PARAM_CUSTOM(fps_sampling_period) \
OVERLAY_PARAM_CUSTOM(output_folder) \
OVERLAY_PARAM_CUSTOM(output_file) \
@ -175,6 +176,8 @@ typedef unsigned long KeySym;
OVERLAY_PARAM_CUSTOM(picmip) \
OVERLAY_PARAM_CUSTOM(af) \
OVERLAY_PARAM_CUSTOM(preset) \
OVERLAY_PARAM_CUSTOM(text_outline_color) \
OVERLAY_PARAM_CUSTOM(text_outline_thickness) \
enum overlay_param_position {
LAYER_POSITION_TOP_LEFT,
@ -291,6 +294,8 @@ struct overlay_params {
int af;
int preset;
size_t font_params_hash;
unsigned text_outline_color;
float text_outline_thickness;
};
const extern char *overlay_param_names[];

Write Preview
Loading…
Cancel
Save