asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19744 from marcelofg55/profiler_clear

Browse source 
Add a Clear button to the profiler
This commit is contained in:
Rémi Verschelde 2018-06-25 17:01:46 +02:00 committed by GitHub
commit 0954c8f017
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
editor/editor_profiler.cpp
View file

@ -424,20 +424,25 @@ void EditorProfiler::_update_frame() {
void EditorProfiler::_activate_pressed() { void EditorProfiler::_activate_pressed() {
if (activate->is_pressed()) { if (activate->is_pressed()) {
clear();
activate->set_icon(get_icon("Stop", "EditorIcons")); activate->set_icon(get_icon("Stop", "EditorIcons"));
activate->set_text(TTR("Stop Profiling")); activate->set_text(TTR("Stop"));
} else { } else {
activate->set_icon(get_icon("Play", "EditorIcons")); activate->set_icon(get_icon("Play", "EditorIcons"));
activate->set_text(TTR("Start Profiling")); activate->set_text(TTR("Start"));
} }
emit_signal("enable_profiling", activate->is_pressed()); emit_signal("enable_profiling", activate->is_pressed());
} }
void EditorProfiler::_clear_pressed() {
clear();
}
void EditorProfiler::_notification(int p_what) { void EditorProfiler::_notification(int p_what) {
if (p_what == NOTIFICATION_ENTER_TREE) { if (p_what == NOTIFICATION_ENTER_TREE) {
activate->set_icon(get_icon("Play", "EditorIcons")); activate->set_icon(get_icon("Play", "EditorIcons"));
clear_button->set_icon(get_icon("Clear", "EditorIcons"));
} }
} }
@ -599,6 +604,7 @@ void EditorProfiler::_bind_methods() {
ClassDB::bind_method(D_METHOD("_update_frame"), &EditorProfiler::_update_frame); ClassDB::bind_method(D_METHOD("_update_frame"), &EditorProfiler::_update_frame);
ClassDB::bind_method(D_METHOD("_update_plot"), &EditorProfiler::_update_plot); ClassDB::bind_method(D_METHOD("_update_plot"), &EditorProfiler::_update_plot);
ClassDB::bind_method(D_METHOD("_activate_pressed"), &EditorProfiler::_activate_pressed); ClassDB::bind_method(D_METHOD("_activate_pressed"), &EditorProfiler::_activate_pressed);
ClassDB::bind_method(D_METHOD("_clear_pressed"), &EditorProfiler::_clear_pressed);
ClassDB::bind_method(D_METHOD("_graph_tex_draw"), &EditorProfiler::_graph_tex_draw); ClassDB::bind_method(D_METHOD("_graph_tex_draw"), &EditorProfiler::_graph_tex_draw);
ClassDB::bind_method(D_METHOD("_graph_tex_input"), &EditorProfiler::_graph_tex_input); ClassDB::bind_method(D_METHOD("_graph_tex_input"), &EditorProfiler::_graph_tex_input);
ClassDB::bind_method(D_METHOD("_graph_tex_mouse_exit"), &EditorProfiler::_graph_tex_mouse_exit); ClassDB::bind_method(D_METHOD("_graph_tex_mouse_exit"), &EditorProfiler::_graph_tex_mouse_exit);
@ -625,10 +631,15 @@ EditorProfiler::EditorProfiler() {
add_child(hb); add_child(hb);
activate = memnew(Button); activate = memnew(Button);
activate->set_toggle_mode(true); activate->set_toggle_mode(true);
activate->set_text(TTR("Start Profiling")); activate->set_text(TTR("Start"));
activate->connect("pressed", this, "_activate_pressed"); activate->connect("pressed", this, "_activate_pressed");
hb->add_child(activate); hb->add_child(activate);
clear_button = memnew(Button);
clear_button->set_text(TTR("Clear"));
clear_button->connect("pressed", this, "_clear_pressed");
hb->add_child(clear_button);
hb->add_child(memnew(Label(TTR("Measure:")))); hb->add_child(memnew(Label(TTR("Measure:"))));
display_mode = memnew(OptionButton); display_mode = memnew(OptionButton);

2
editor/editor_profiler.h
View file

@ -100,6 +100,7 @@ public:
private: private:
Button *activate; Button *activate;
Button *clear_button;
TextureRect *graph; TextureRect *graph;
Ref<ImageTexture> graph_texture; Ref<ImageTexture> graph_texture;
PoolVector<uint8_t> graph_image; PoolVector<uint8_t> graph_image;
@ -133,6 +134,7 @@ private:
void _update_frame(); void _update_frame();
void _activate_pressed(); void _activate_pressed();
void _clear_pressed();
String _get_time_as_text(Metric &m, float p_time, int p_calls); String _get_time_as_text(Metric &m, float p_time, int p_calls);