Removed crosshair

src/overlay.cpp

@@ -1486,21 +1486,6 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2&
       if((now - log_end) / 1000000 < 12)
          render_benchmark(data, params, window_size, height, now);
 
-      if (params.enabled[OVERLAY_PARAM_ENABLED_crosshair]){
-         ImGui::SetNextWindowBgAlpha(0.0);
-         ImGui::SetNextWindowSize(ImVec2(width, height), ImGuiCond_Always);
-         ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
-         ImGui::Begin("Crosshair", &open, ImGuiWindowFlags_NoDecoration);
-         ImVec2 horiz = ImVec2(width / 2 - (params.crosshair_size / 2), height / 2);
-         ImVec2 vert = ImVec2(width / 2, height / 2 - (params.crosshair_size / 2));
-         ImGui::GetWindowDrawList()->AddLine(horiz,
-            ImVec2(horiz.x + params.crosshair_size, horiz.y + 0),
-            params.crosshair_color, 2.0f);
-         ImGui::GetWindowDrawList()->AddLine(vert,
-            ImVec2(vert.x + 0, vert.y + params.crosshair_size),
-            params.crosshair_color, 2.0f);
-         ImGui::End();
-      }
    }
 }
 

src/overlay_params.cpp

@@ -131,12 +131,6 @@ parse_fps_limit(const char *str)
    return strtol(str, NULL, 0);
 }
 
-static uint32_t
-parse_crosshair_size(const char *str)
-{
-   return strtol(str, NULL, 0);
-}
-
 static bool
 parse_no_display(const char *str)
 {
@@ -203,7 +197,6 @@ parse_path(const char *str)
 #define parse_pci_dev(s) parse_str(s)
 #define parse_media_player_name(s) parse_str(s)
 
-#define parse_crosshair_color(s) parse_color(s)
 #define parse_cpu_color(s) parse_color(s)
 #define parse_gpu_color(s) parse_color(s)
 #define parse_vram_color(s) parse_color(s)
@@ -304,7 +297,6 @@ parse_overlay_env(struct overlay_params *params,
          OVERLAY_PARAMS
 #undef OVERLAY_PARAM_BOOL
 #undef OVERLAY_PARAM_CUSTOM
-         params->enabled[OVERLAY_PARAM_ENABLED_crosshair] = 0;
          params->enabled[OVERLAY_PARAM_ENABLED_read_cfg] = read_cfg;
       }
 #define OVERLAY_PARAM_BOOL(name)                                       \
@@ -352,7 +344,6 @@ parse_overlay_config(struct overlay_params *params,
    params->fps_limit = 0;
    params->vsync = -1;
    params->gl_vsync = -2;
-   params->crosshair_size = 30;
    params->offset_x = 0;
    params->offset_y = 0;
    params->background_alpha = 0.5;
@@ -392,7 +383,6 @@ parse_overlay_config(struct overlay_params *params,
             OVERLAY_PARAMS
 #undef OVERLAY_PARAM_BOOL
 #undef OVERLAY_PARAM_CUSTOM
-         params->enabled[OVERLAY_PARAM_ENABLED_crosshair] = 0;
          params->options.erase("full");
       }
 
@@ -421,8 +411,7 @@ parse_overlay_config(struct overlay_params *params,
       parse_overlay_env(params, env);
 
    // Convert from 0xRRGGBB to ImGui's format
-   std::array<unsigned *, 11> colors = {
-      &params->crosshair_color,
+   std::array<unsigned *, 10> colors = {
       &params->cpu_color,
       &params->gpu_color,
       &params->vram_color,

src/overlay_params.h

@@ -33,7 +33,6 @@ typedef unsigned long KeySym;
    OVERLAY_PARAM_BOOL(gpu_stats)                     \
    OVERLAY_PARAM_BOOL(ram)                           \
    OVERLAY_PARAM_BOOL(vram)                          \
-   OVERLAY_PARAM_BOOL(crosshair)                     \
    OVERLAY_PARAM_BOOL(time)                          \
    OVERLAY_PARAM_BOOL(full)                          \
    OVERLAY_PARAM_BOOL(read_cfg)                      \
@@ -61,10 +60,8 @@ typedef unsigned long KeySym;
    OVERLAY_PARAM_CUSTOM(toggle_hud)                  \
    OVERLAY_PARAM_CUSTOM(toggle_logging)              \
    OVERLAY_PARAM_CUSTOM(reload_cfg)                  \
-   OVERLAY_PARAM_CUSTOM(crosshair_size)              \
    OVERLAY_PARAM_CUSTOM(offset_x)                    \
    OVERLAY_PARAM_CUSTOM(offset_y)                    \
-   OVERLAY_PARAM_CUSTOM(crosshair_color)             \
    OVERLAY_PARAM_CUSTOM(background_alpha)            \
    OVERLAY_PARAM_CUSTOM(time_format)                 \
    OVERLAY_PARAM_CUSTOM(io_read)                     \
@@ -113,7 +110,6 @@ struct overlay_params {
    int control;
    uint32_t fps_sampling_period; /* us */
    uint32_t fps_limit;
-   uint32_t crosshair_size;
    bool help;
    bool no_display;
    bool full;
@@ -124,7 +120,7 @@ struct overlay_params {
    unsigned vsync;
    int gl_vsync;
    int log_duration;
-   unsigned crosshair_color, cpu_color, gpu_color, vram_color, ram_color, engine_color, io_color, frametime_color, background_color, text_color;
+   unsigned cpu_color, gpu_color, vram_color, ram_color, engine_color, io_color, frametime_color, background_color, text_color;
    unsigned media_player_color;
    unsigned tableCols;
    float font_size;