godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display times as milliseconds in the profiler and performance monitors

Browse Source 
Small values are easier to read as milliseconds compared to seconds.

(cherry picked from commit f1d9dbfb08)
This commit is contained in:
Hugo Locurcio 2020-01-24 12:07:38 +01:00 committed by Rémi Verschelde
parent 611cc11536
commit 6e56d04616
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
editor/editor_profiler.cpp
View File

@ -102,26 +102,28 @@ void EditorProfiler::clear() {
} }
static String _get_percent_txt(float p_value, float p_total) { static String _get_percent_txt(float p_value, float p_total) {
if (p_total == 0) if (p_total == 0) {
p_total = 0.00001; p_total = 0.00001;
}
return String::num((p_value / p_total) * 100, 1) + "%"; return String::num((p_value / p_total) * 100, 1) + "%";
} }
String EditorProfiler::_get_time_as_text(const Metric &m, float p_time, int p_calls) { String EditorProfiler::_get_time_as_text(const Metric &m, float p_time, int p_calls) {
int dmode = display_mode->get_selected(); const int dmode = display_mode->get_selected();
if (dmode == DISPLAY_FRAME_TIME) { if (dmode == DISPLAY_FRAME_TIME) {
return rtos(p_time); return rtos(p_time * 1000).pad_decimals(2) + " ms";
} else if (dmode == DISPLAY_AVERAGE_TIME) { } else if (dmode == DISPLAY_AVERAGE_TIME) {
if (p_calls == 0) if (p_calls == 0) {
return "0"; return "0.00 ms";
else } else {
return rtos(p_time / p_calls); return rtos((p_time / p_calls) * 1000).pad_decimals(2) + " ms";
}
} else if (dmode == DISPLAY_FRAME_PERCENT) { } else if (dmode == DISPLAY_FRAME_PERCENT) {
return _get_percent_txt(p_time, m.frame_time); return _get_percent_txt(p_time, m.frame_time);
} else if (dmode == DISPLAY_PHYSICS_FRAME_PERCENT) { } else if (dmode == DISPLAY_PHYSICS_FRAME_PERCENT) {
return _get_percent_txt(p_time, m.physics_frame_time); return _get_percent_txt(p_time, m.physics_frame_time);
} }
@ -729,7 +731,7 @@ EditorProfiler::EditorProfiler() {
h_split->set_v_size_flags(SIZE_EXPAND_FILL); h_split->set_v_size_flags(SIZE_EXPAND_FILL);
variables = memnew(Tree); variables = memnew(Tree);
variables->set_custom_minimum_size(Size2(300, 0) * EDSCALE); variables->set_custom_minimum_size(Size2(320, 0) * EDSCALE);
variables->set_hide_folding(true); variables->set_hide_folding(true);
h_split->add_child(variables); h_split->add_child(variables);
variables->set_hide_root(true); variables->set_hide_root(true);
@ -737,10 +739,10 @@ EditorProfiler::EditorProfiler() {
variables->set_column_titles_visible(true); variables->set_column_titles_visible(true);
variables->set_column_title(0, TTR("Name")); variables->set_column_title(0, TTR("Name"));
variables->set_column_expand(0, true); variables->set_column_expand(0, true);
variables->set_column_min_width(0, 60); variables->set_column_min_width(0, 60 * EDSCALE);
variables->set_column_title(1, TTR("Time")); variables->set_column_title(1, TTR("Time"));
variables->set_column_expand(1, false); variables->set_column_expand(1, false);
variables->set_column_min_width(1, 60 * EDSCALE); variables->set_column_min_width(1, 100 * EDSCALE);
variables->set_column_title(2, TTR("Calls")); variables->set_column_title(2, TTR("Calls"));
variables->set_column_expand(2, false); variables->set_column_expand(2, false);
variables->set_column_min_width(2, 60 * EDSCALE); variables->set_column_min_width(2, 60 * EDSCALE);
@ -749,7 +751,6 @@ EditorProfiler::EditorProfiler() {
graph = memnew(TextureRect); graph = memnew(TextureRect);
graph->set_expand(true); graph->set_expand(true);
graph->set_mouse_filter(MOUSE_FILTER_STOP); graph->set_mouse_filter(MOUSE_FILTER_STOP);
//graph->set_ignore_mouse(false);
graph->connect("draw", this, "_graph_tex_draw"); graph->connect("draw", this, "_graph_tex_draw");
graph->connect("gui_input", this, "_graph_tex_input"); graph->connect("gui_input", this, "_graph_tex_input");
graph->connect("mouse_exited", this, "_graph_tex_mouse_exit"); graph->connect("mouse_exited", this, "_graph_tex_mouse_exit");
@ -760,13 +761,10 @@ EditorProfiler::EditorProfiler() {
int metric_size = CLAMP(int(EDITOR_DEF("debugger/profiler_frame_history_size", 600)), 60, 1024); int metric_size = CLAMP(int(EDITOR_DEF("debugger/profiler_frame_history_size", 600)), 60, 1024);
frame_metrics.resize(metric_size); frame_metrics.resize(metric_size);
last_metric = -1; last_metric = -1;
//cursor_metric=-1;
hover_metric = -1; hover_metric = -1;
EDITOR_DEF("debugger/profiler_frame_max_functions", 64); EDITOR_DEF("debugger/profiler_frame_max_functions", 64);
//display_mode=DISPLAY_FRAME_TIME;
frame_delay = memnew(Timer); frame_delay = memnew(Timer);
frame_delay->set_wait_time(0.1); frame_delay->set_wait_time(0.1);
frame_delay->set_one_shot(true); frame_delay->set_one_shot(true);
@ -784,6 +782,4 @@ EditorProfiler::EditorProfiler() {
seeking = false; seeking = false;
graph_height = 1; graph_height = 1;
//activate->set_disabled(true);
} }

20
editor/script_editor_debugger.cpp
View File

@ -806,25 +806,25 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
p.write[i] = arr[i]; p.write[i] = arr[i];
if (i < perf_items.size()) { if (i < perf_items.size()) {
float v = p[i]; const float value = p[i];
String vs = rtos(v); String label = rtos(value);
String tt = vs; String tooltip = label;
switch (Performance::MonitorType((int)perf_items[i]->get_metadata(1))) { switch (Performance::MonitorType((int)perf_items[i]->get_metadata(1))) {
case Performance::MONITOR_TYPE_MEMORY: { case Performance::MONITOR_TYPE_MEMORY: {
vs = String::humanize_size(v); label = String::humanize_size(value);
tt = vs; tooltip = label;
} break; } break;
case Performance::MONITOR_TYPE_TIME: { case Performance::MONITOR_TYPE_TIME: {
tt += " seconds"; label = rtos(value * 1000).pad_decimals(2) + " ms";
vs += " s"; tooltip = label;
} break; } break;
default: { default: {
tt += " " + perf_items[i]->get_text(0); tooltip += " " + perf_items[i]->get_text(0);
} break; } break;
} }
perf_items[i]->set_text(1, vs); perf_items[i]->set_text(1, label);
perf_items[i]->set_tooltip(1, tt); perf_items[i]->set_tooltip(1, tooltip);
if (p[i] > perf_max[i]) if (p[i] > perf_max[i])
perf_max.write[i] = p[i]; perf_max.write[i] = p[i];
} }