|
|
|
@ -390,11 +390,13 @@ void HudElements::ram(){
|
|
|
|
|
ImGui::TextColored(HUDElements.colors.ram, "RAM");
|
|
|
|
|
ImGui::TableNextColumn();
|
|
|
|
|
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");
|
|
|
|
|
ImGui::PopFont();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_ram] && HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_swap]){
|
|
|
|
|
ImguiNextColumnOrNewRow();
|
|
|
|
@ -446,6 +448,9 @@ void HudElements::procmem()
|
|
|
|
|
void HudElements::fps(){
|
|
|
|
|
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_fps] && !HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_fps_only]){
|
|
|
|
|
ImGui::TableNextColumn();
|
|
|
|
|
if(HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact])
|
|
|
|
|
ImGui::TextColored(HUDElements.colors.engine, "%s", "FPS");
|
|
|
|
|
else
|
|
|
|
|
ImGui::TextColored(HUDElements.colors.engine, "%s", engines[HUDElements.sw_stats->engine]);
|
|
|
|
|
ImGui::TableNextColumn();
|
|
|
|
|
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_fps_color_change]){
|
|
|
|
@ -464,9 +469,11 @@ void HudElements::fps(){
|
|
|
|
|
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.0f", HUDElements.sw_stats->fps);
|
|
|
|
|
}
|
|
|
|
|
ImGui::SameLine(0, 1.0f);
|
|
|
|
|
if(!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact]){
|
|
|
|
|
ImGui::PushFont(HUDElements.sw_stats->font1);
|
|
|
|
|
ImGui::Text("FPS");
|
|
|
|
|
ImGui::PopFont();
|
|
|
|
|
}
|
|
|
|
|
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_frametime]){
|
|
|
|
|
ImguiNextColumnOrNewRow();
|
|
|
|
|
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", 1000 / HUDElements.sw_stats->fps);
|
|
|
|
@ -571,7 +578,7 @@ void HudElements::frame_timing(){
|
|
|
|
|
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_frame_timing]){
|
|
|
|
|
ImGui::TableNextColumn();
|
|
|
|
|
ImGui::PushFont(HUDElements.sw_stats->font1);
|
|
|
|
|
if (!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal]){
|
|
|
|
|
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");
|
|
|
|
|
ImGui::TableSetColumnIndex(ImGui::TableGetColumnCount() - 1);
|
|
|
|
@ -588,7 +595,7 @@ void HudElements::frame_timing(){
|
|
|
|
|
double max_time = 50.0f;
|
|
|
|
|
float width, height = 0;
|
|
|
|
|
#ifdef MANGOAPP
|
|
|
|
|
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal]){
|
|
|
|
|
if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal] || HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact]){
|
|
|
|
|
width = 150;
|
|
|
|
|
height = 24;
|
|
|
|
|
} else {
|
|
|
|
@ -616,7 +623,7 @@ void HudElements::frame_timing(){
|
|
|
|
|
ImVec2(width, height));
|
|
|
|
|
}
|
|
|
|
|
#ifdef MANGOAPP
|
|
|
|
|
if (!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal]){
|
|
|
|
|
if (!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal] && !HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact]){
|
|
|
|
|
ImGui::SameLine();
|
|
|
|
|
ImGuiTableSetColumnIndex(ImGui::TableGetColumnCount() - 1);
|
|
|
|
|
right_aligned_text(HUDElements.colors.text, ImGui::GetContentRegionAvail().x, "%.1fms", frametime / 1000.f);
|
|
|
|
@ -754,6 +761,7 @@ void HudElements::battery(){
|
|
|
|
|
ImGui::SameLine(0,1.0f);
|
|
|
|
|
ImGui::Text("%%");
|
|
|
|
|
}
|
|
|
|
|
if (!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact]){
|
|
|
|
|
if (Battery_Stats.current_watt != 0) {
|
|
|
|
|
ImguiNextColumnOrNewRow();
|
|
|
|
|
right_aligned_text(HUDElements.colors.text, HUDElements.ralign_width, "%.1f", Battery_Stats.current_watt);
|
|
|
|
@ -761,7 +769,7 @@ void HudElements::battery(){
|
|
|
|
|
ImGui::PushFont(HUDElements.sw_stats->font1);
|
|
|
|
|
ImGui::Text("W");
|
|
|
|
|
ImGui::PopFont();
|
|
|
|
|
if (!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal]) {
|
|
|
|
|
if (!HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_horizontal] && !HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_hud_compact]) {
|
|
|
|
|
float hours;
|
|
|
|
|
float minutes;
|
|
|
|
|
minutes = std::modf(Battery_Stats.remaining_time, &hours);
|
|
|
|
@ -781,6 +789,8 @@ void HudElements::battery(){
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|