summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-06-22 23:32:29 +0200
committerGitHub <noreply@github.com>2020-06-22 23:32:29 +0200
commit3f4e39e606b0bed539a3b8fb9b38aed4721c6262 (patch)
tree43eb30e13a9c06eee3d6f1f0ee8e7ab12d6dc0ed /editor
parent42c4a701dda7ed61a8c7c2bdae0f8992d1f8641e (diff)
parenta593786d098757990e0a7aafcd52e4f64614b260 (diff)
Merge pull request #39719 from Calinou/editor-monitors-horizontal-lines
Draw horizontal lines and labels in the editor performance monitors
Diffstat (limited to 'editor')
-rw-r--r--editor/debugger/script_editor_debugger.cpp103
1 files changed, 82 insertions, 21 deletions
diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp
index a042afc788..6b010fbfb5 100644
--- a/editor/debugger/script_editor_debugger.cpp
+++ b/editor/debugger/script_editor_debugger.cpp
@@ -743,18 +743,19 @@ void ScriptEditorDebugger::_performance_draw() {
info_message->hide();
- Ref<StyleBox> graph_sb = get_theme_stylebox("normal", "TextEdit");
- Ref<Font> graph_font = get_theme_font("font", "TextEdit");
+ const Ref<StyleBox> graph_sb = get_theme_stylebox("normal", "TextEdit");
+ const Ref<Font> graph_font = get_theme_font("font", "TextEdit");
- int cols = Math::ceil(Math::sqrt((float)which.size()));
+ const int cols = Math::ceil(Math::sqrt((float)which.size()));
int rows = Math::ceil((float)which.size() / cols);
if (which.size() == 1) {
rows = 1;
}
- int margin = 3;
- int point_sep = 5;
- Size2i s = Size2i(perf_draw->get_size()) / Size2i(cols, rows);
+ const int margin = 3;
+ const int point_sep = 5;
+ const Size2i s = Size2i(perf_draw->get_size()) / Size2i(cols, rows);
+
for (int i = 0; i < which.size(); i++) {
Point2i p(i % cols, i / cols);
Rect2i r(p * s, s);
@@ -763,22 +764,78 @@ void ScriptEditorDebugger::_performance_draw() {
perf_draw->draw_style_box(graph_sb, r);
r.position += graph_sb->get_offset();
r.size -= graph_sb->get_minimum_size();
- int pi = which[i];
- Color c = get_theme_color("accent_color", "Editor");
- float h = (float)which[i] / (float)(perf_items.size());
- // Use a darker color on light backgrounds for better visibility
- float value_multiplier = EditorSettings::get_singleton()->is_dark_theme() ? 1.4 : 0.55;
- c.set_hsv(Math::fmod(h + 0.4, 0.9), c.get_s() * 0.9, c.get_v() * value_multiplier);
-
- c.a = 0.6;
- perf_draw->draw_string(graph_font, r.position + Point2(0, graph_font->get_ascent()), perf_items[pi]->get_text(0), c, r.size.x);
- c.a = 0.9;
- perf_draw->draw_string(graph_font, r.position + Point2(0, graph_font->get_ascent() + graph_font->get_height()), perf_items[pi]->get_text(1), c, r.size.y);
-
- float spacing = point_sep / float(cols);
+ const int pi = which[i];
+
+ // Draw horizontal lines with labels.
+
+ int nb_lines = 5;
+ // Draw less lines if the monitor isn't tall enough to display 5 labels.
+ if (r.size.height <= 160 * EDSCALE) {
+ nb_lines = 3;
+ } else if (r.size.height <= 240 * EDSCALE) {
+ nb_lines = 4;
+ }
+
+ const float inv_nb_lines = 1.0 / nb_lines;
+
+ for (int line = 0; line < nb_lines; line += 1) {
+ const int from_x = r.position.x;
+ const int to_x = r.position.x + r.size.width;
+ const int y = r.position.y + (r.size.height * inv_nb_lines + line * inv_nb_lines * r.size.height);
+ perf_draw->draw_line(
+ Point2(from_x, y),
+ Point2i(to_x, y),
+ Color(0.5, 0.5, 0.5, 0.25),
+ Math::round(EDSCALE));
+
+ String label;
+ switch (Performance::MonitorType((int)perf_items[pi]->get_metadata(1))) {
+ case Performance::MONITOR_TYPE_MEMORY: {
+ label = String::humanize_size(Math::ceil((1 - inv_nb_lines - inv_nb_lines * line) * perf_max[pi]));
+ } break;
+ case Performance::MONITOR_TYPE_TIME: {
+ label = rtos((1 - inv_nb_lines - inv_nb_lines * line) * perf_max[pi] * 1000).pad_decimals(2) + " ms";
+ } break;
+ default: {
+ label = itos(Math::ceil((1 - inv_nb_lines - inv_nb_lines * line) * perf_max[pi]));
+ } break;
+ }
+
+ perf_draw->draw_string(
+ graph_font,
+ Point2(from_x, y - graph_font->get_ascent() * 0.25),
+ label,
+ Color(0.5, 0.5, 0.5, 1.0));
+ }
+
+ const float h = (float)which[i] / (float)(perf_items.size());
+ // Use a darker color on light backgrounds for better visibility.
+ const float value_multiplier = EditorSettings::get_singleton()->is_dark_theme() ? 1.4 : 0.55;
+ Color color = get_theme_color("accent_color", "Editor");
+ color.set_hsv(Math::fmod(h + 0.4, 0.9), color.get_s() * 0.9, color.get_v() * value_multiplier);
+
+ // Draw the monitor name in the top-left corner.
+ color.a = 0.6;
+ perf_draw->draw_string(
+ graph_font,
+ r.position + Point2(0, graph_font->get_ascent()),
+ perf_items[pi]->get_text(0),
+ color,
+ r.size.x);
+
+ // Draw the monitor value in the top-left corner, just below the name.
+ color.a = 0.9;
+ perf_draw->draw_string(
+ graph_font,
+ r.position + Point2(0, graph_font->get_ascent() + graph_font->get_height()),
+ perf_items[pi]->get_text(1),
+ color,
+ r.size.y);
+
+ const float spacing = point_sep / float(cols);
float from = r.size.width;
- List<Vector<float>>::Element *E = perf_history.front();
+ const List<Vector<float>>::Element *E = perf_history.front();
float prev = -1;
while (from >= 0 && E) {
float m = perf_max[pi];
@@ -789,7 +846,11 @@ void ScriptEditorDebugger::_performance_draw() {
h2 = (1.0 - h2) * r.size.y;
if (E != perf_history.front()) {
- perf_draw->draw_line(r.position + Point2(from, h2), r.position + Point2(from + spacing, prev), c, Math::round(EDSCALE));
+ perf_draw->draw_line(
+ r.position + Point2(from, h2),
+ r.position + Point2(from + spacing, prev),
+ color,
+ Math::round(EDSCALE));
}
prev = h2;
E = E->next();