added param io_color

pull/58/head
FlightlessMango 4 years ago
parent d8b3c3c81f
commit 755558ecb9

@ -1205,11 +1205,11 @@ static void compute_swapchain_display(struct swapchain_data *data)
auto sampling = instance_data->params.fps_sampling_period; auto sampling = instance_data->params.fps_sampling_period;
ImGui::TableNextRow(); ImGui::TableNextRow();
if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_read] && !instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_write]) if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_read] && !instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_write])
ImGui::TextColored(ImVec4(0.643, 0.569, 0.827, 1.00f), "IO RD"); ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(instance_data->params.io_color), "IO RD");
if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_write] && !instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_read]) if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_write] && !instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_read])
ImGui::TextColored(ImVec4(0.643, 0.569, 0.827, 1.00f), "IO RW"); ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(instance_data->params.io_color), "IO RW");
if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_read] && instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_write]) if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_read] && instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_write])
ImGui::TextColored(ImVec4(0.643, 0.569, 0.827, 1.00f), "IO RD/RW"); ImGui::TextColored(ImGui::ColorConvertU32ToFloat4(instance_data->params.io_color), "IO RD/RW");
if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_read]){ if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_io_read]){
ImGui::TableNextCell(); ImGui::TableNextCell();

@ -157,6 +157,7 @@ parse_str(const char *str)
#define parse_vram_color(s) parse_color(s) #define parse_vram_color(s) parse_color(s)
#define parse_ram_color(s) parse_color(s) #define parse_ram_color(s) parse_color(s)
#define parse_engine_color(s) parse_color(s) #define parse_engine_color(s) parse_color(s)
#define parse_io_color(s) parse_color(s)
static bool static bool
parse_help(const char *str) parse_help(const char *str)
@ -307,6 +308,7 @@ parse_overlay_config(struct overlay_params *params,
params->vram_color = strtol("ad64c1", NULL, 16); params->vram_color = strtol("ad64c1", NULL, 16);
params->ram_color = strtol("c26693", NULL, 16); params->ram_color = strtol("c26693", NULL, 16);
params->engine_color = strtol("eb5b5b", NULL, 16); params->engine_color = strtol("eb5b5b", NULL, 16);
params->io_color = strtol("a491d3", NULL, 16);
// first pass with env var // first pass with env var
if (env) if (env)
@ -355,13 +357,14 @@ parse_overlay_config(struct overlay_params *params,
// Command buffer gets reused and timestamps cause hangs for some reason, force off for now // Command buffer gets reused and timestamps cause hangs for some reason, force off for now
params->enabled[OVERLAY_PARAM_ENABLED_gpu_timing] = false; params->enabled[OVERLAY_PARAM_ENABLED_gpu_timing] = false;
// Convert from 0xRRGGBB to ImGui's format // Convert from 0xRRGGBB to ImGui's format
std::array<unsigned *, 6> colors = { std::array<unsigned *, 7> colors = {
&params->crosshair_color, &params->crosshair_color,
&params->cpu_color, &params->cpu_color,
&params->gpu_color, &params->gpu_color,
&params->vram_color, &params->vram_color,
&params->ram_color, &params->ram_color,
&params->engine_color &params->engine_color,
&params->io_color
}; };
for (auto color : colors){ for (auto color : colors){
@ -372,8 +375,6 @@ parse_overlay_config(struct overlay_params *params,
255); 255);
} }
printf("%i\n", params->crosshair_color);
params->tableCols = 3; params->tableCols = 3;
if (!params->font_size) if (!params->font_size)

@ -88,6 +88,7 @@ extern "C" {
OVERLAY_PARAM_CUSTOM(vram_color) \ OVERLAY_PARAM_CUSTOM(vram_color) \
OVERLAY_PARAM_CUSTOM(ram_color) \ OVERLAY_PARAM_CUSTOM(ram_color) \
OVERLAY_PARAM_CUSTOM(engine_color) \ OVERLAY_PARAM_CUSTOM(engine_color) \
OVERLAY_PARAM_CUSTOM(io_color) \
OVERLAY_PARAM_CUSTOM(help) OVERLAY_PARAM_CUSTOM(help)
enum overlay_param_position { enum overlay_param_position {
@ -123,7 +124,7 @@ struct overlay_params {
unsigned offset_x; unsigned offset_x;
unsigned offset_y; unsigned offset_y;
unsigned vsync; unsigned vsync;
unsigned crosshair_color, cpu_color, gpu_color, vram_color, ram_color, engine_color; unsigned crosshair_color, cpu_color, gpu_color, vram_color, ram_color, engine_color, io_color;
unsigned tableCols; unsigned tableCols;
float font_size; float font_size;
float background_alpha; float background_alpha;

Loading…
Cancel
Save