Merge pull request #401 from gort818/load_order

Change order of cpu/gpu load colors and data

src/hud_elements.cpp

@@ -64,12 +64,12 @@ void HudElements::convert_colors(struct overlay_params& params)
     HUDElements.colors.text = convert(params.text_color);
     HUDElements.colors.media_player = convert(params.media_player_color);
     HUDElements.colors.wine = convert(params.wine_color);
-    HUDElements.colors.gpu_load_high = convert(params.gpu_load_color[0]);
+    HUDElements.colors.gpu_load_low = convert(params.gpu_load_color[0]);
     HUDElements.colors.gpu_load_med = convert(params.gpu_load_color[1]);
-    HUDElements.colors.gpu_load_low = convert(params.gpu_load_color[2]);
-    HUDElements.colors.cpu_load_high = convert(params.cpu_load_color[0]);
+    HUDElements.colors.gpu_load_high = convert(params.gpu_load_color[2]);
+    HUDElements.colors.cpu_load_low = convert(params.cpu_load_color[0]);
     HUDElements.colors.cpu_load_med = convert(params.cpu_load_color[1]);
-    HUDElements.colors.cpu_load_low = convert(params.cpu_load_color[2]);
+    HUDElements.colors.cpu_load_high = convert(params.cpu_load_color[2]);
 
     ImGuiStyle& style = ImGui::GetStyle();
     style.Colors[ImGuiCol_PlotLines] = convert(params.frametime_color);
@@ -112,9 +112,9 @@ void HudElements::gpu_stats(){
         auto text_color = HUDElements.colors.text;
         if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_gpu_load_change]){
             struct LOAD_DATA gpu_data = {
-                HUDElements.colors.gpu_load_high,
-                HUDElements.colors.gpu_load_med,
                 HUDElements.colors.gpu_load_low,
+                HUDElements.colors.gpu_load_med,
+                HUDElements.colors.gpu_load_high,
                 HUDElements.params->gpu_load_value[0],
                 HUDElements.params->gpu_load_value[1]
             };
@@ -173,9 +173,9 @@ void HudElements::cpu_stats(){
         if (HUDElements.params->enabled[OVERLAY_PARAM_ENABLED_cpu_load_change]){
             int cpu_load_percent = int(cpuStats.GetCPUDataTotal().percent);
             struct LOAD_DATA cpu_data = {
-                HUDElements.colors.cpu_load_high,
-                HUDElements.colors.cpu_load_med,
                 HUDElements.colors.cpu_load_low,
+                HUDElements.colors.cpu_load_med,
+                HUDElements.colors.cpu_load_high,
                 HUDElements.params->cpu_load_value[0],
                 HUDElements.params->cpu_load_value[1]
             };

src/hud_elements.h

@@ -55,12 +55,12 @@ class HudElements{
                 text,
                 media_player,
                 wine,
-                gpu_load_high,
-                gpu_load_med,
                 gpu_load_low,
-                cpu_load_high,
+                gpu_load_med,
+                gpu_load_high,
+                cpu_load_low,
                 cpu_load_med,
-                cpu_load_low;
+                cpu_load_high;
         } colors {};
 };
 

src/overlay.h

@@ -70,11 +70,11 @@ struct benchmark_stats {
 };
 
 struct LOAD_DATA {
-   ImVec4 color_high;
-   ImVec4 color_med;
    ImVec4 color_low;
-   unsigned high_load;
+   ImVec4 color_med;
+   ImVec4 color_high;
    unsigned med_load;
+   unsigned high_load;
 };
 
 extern struct fps_limit fps_limit_stats;

src/overlay_params.cpp

@@ -543,15 +543,15 @@ parse_overlay_config(struct overlay_params *params,
    params->media_player_name = "";
    params->font_scale = 1.0f;
    params->wine_color = 0xeb5b5b;
-   params->gpu_load_color = { 0xb22222, 0xfdfd09, 0x39f900 };
-   params->cpu_load_color = { 0xb22222, 0xfdfd09, 0x39f900 };
+   params->gpu_load_color = { 0x39f900, 0xfdfd09, 0xb22222 };
+   params->cpu_load_color = { 0x39f900, 0xfdfd09, 0xb22222 };
    params->font_scale_media_player = 0.55f;
    params->log_interval = 100;
    params->media_player_order = { MP_ORDER_TITLE, MP_ORDER_ARTIST, MP_ORDER_ALBUM };
    params->permit_upload = 0;
    params->benchmark_percentiles = { "97", "AVG", "1", "0.1" };
-   params->gpu_load_value = { 90, 60 };
-   params->cpu_load_value = { 90, 60 };
+   params->gpu_load_value = { 60, 90 };
+   params->cpu_load_value = { 60, 90 };
    params->cellpadding_y = -0.085;