godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Fix profiler being disabled at wrong times

Browse Source 
Co-authored by: Will Whitty <tavurth@gmail.com>
This commit is contained in:
halgriffiths
2022-09-06 16:15:00 +01:00
parent 0f62e357e0
commit 026e0811b9
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
editor/debugger/editor_profiler.cpp
View File

@@ -104,6 +104,10 @@ void EditorProfiler::clear() {
updating_frame = false; updating_frame = false;
hover_metric = -1; hover_metric = -1;
seeking = false; seeking = false;
// Ensure button text (start, stop) is correct
_set_button_text();
emit_signal(SNAME("enable_profiling"), activate->is_pressed());
} }
static String _get_percent_txt(float p_value, float p_total) { static String _get_percent_txt(float p_value, float p_total) {
@@ -374,15 +378,23 @@ void EditorProfiler::_update_frame() {
updating_frame = false; updating_frame = false;
} }
void EditorProfiler::_activate_pressed() { void EditorProfiler::_set_button_text() {
if (activate->is_pressed()) { if (activate->is_pressed()) {
activate->set_icon(get_theme_icon(SNAME("Stop"), SNAME("EditorIcons"))); activate->set_icon(get_theme_icon(SNAME("Stop"), SNAME("EditorIcons")));
activate->set_text(TTR("Stop")); activate->set_text(TTR("Stop"));
_clear_pressed();
} else { } else {
activate->set_icon(get_theme_icon(SNAME("Play"), SNAME("EditorIcons"))); activate->set_icon(get_theme_icon(SNAME("Play"), SNAME("EditorIcons")));
activate->set_text(TTR("Start")); activate->set_text(TTR("Start"));
} }
}
void EditorProfiler::_activate_pressed() {
_set_button_text();
if (activate->is_pressed()) {
_clear_pressed();
}
emit_signal(SNAME("enable_profiling"), activate->is_pressed()); emit_signal(SNAME("enable_profiling"), activate->is_pressed());
} }
@@ -499,8 +511,12 @@ void EditorProfiler::_bind_methods() {
ADD_SIGNAL(MethodInfo("break_request")); ADD_SIGNAL(MethodInfo("break_request"));
} }
void EditorProfiler::set_enabled(bool p_enable) { void EditorProfiler::set_enabled(bool p_enable, bool p_clear) {
activate->set_pressed(false);
activate->set_disabled(!p_enable); activate->set_disabled(!p_enable);
if (p_clear) {
clear();
}
} }
bool EditorProfiler::is_profiling() { bool EditorProfiler::is_profiling() {

3
editor/debugger/editor_profiler.h
View File

@@ -122,6 +122,7 @@ private:
Timer *frame_delay = nullptr; Timer *frame_delay = nullptr;
Timer *plot_delay = nullptr; Timer *plot_delay = nullptr;
void _set_button_text();
void _update_frame(); void _update_frame();
void _activate_pressed(); void _activate_pressed();
@@ -153,7 +154,7 @@ protected:
public: public:
void add_frame_metric(const Metric &p_metric, bool p_final = false); void add_frame_metric(const Metric &p_metric, bool p_final = false);
void set_enabled(bool p_enable); void set_enabled(bool p_enable, bool p_clear = true);
bool is_profiling(); bool is_profiling();
bool is_seeking() { return seeking; } bool is_seeking() { return seeking; }
void disable_seeking(); void disable_seeking();

9
editor/debugger/script_editor_debugger.cpp
View File

@@ -52,7 +52,6 @@
#include "editor/plugins/node_3d_editor_plugin.h" #include "editor/plugins/node_3d_editor_plugin.h"
#include "main/performance.h" #include "main/performance.h"
#include "scene/3d/camera_3d.h" #include "scene/3d/camera_3d.h"
#include "scene/debugger/scene_debugger.h"
#include "scene/gui/dialogs.h" #include "scene/gui/dialogs.h"
#include "scene/gui/label.h" #include "scene/gui/label.h"
#include "scene/gui/line_edit.h" #include "scene/gui/line_edit.h"
@@ -317,7 +316,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
if (!error.is_empty()) { if (!error.is_empty()) {
tabs->set_current_tab(0); tabs->set_current_tab(0);
} }
profiler->set_enabled(false); profiler->set_enabled(false, false);
inspector->clear_cache(); // Take a chance to force remote objects update. inspector->clear_cache(); // Take a chance to force remote objects update.
} else if (p_msg == "debug_exit") { } else if (p_msg == "debug_exit") {
@@ -327,7 +326,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da
_update_buttons_state(); _update_buttons_state();
_set_reason_text(TTR("Execution resumed."), MESSAGE_SUCCESS); _set_reason_text(TTR("Execution resumed."), MESSAGE_SUCCESS);
emit_signal(SNAME("breaked"), false, false, "", false); emit_signal(SNAME("breaked"), false, false, "", false);
profiler->set_enabled(true); profiler->set_enabled(true, false);
profiler->disable_seeking(); profiler->disable_seeking();
} else if (p_msg == "set_pid") { } else if (p_msg == "set_pid") {
ERR_FAIL_COND(p_data.size() < 1); ERR_FAIL_COND(p_data.size() < 1);
@@ -916,6 +915,8 @@ void ScriptEditorDebugger::start(Ref<RemoteDebuggerPeer> p_peer) {
_clear_errors_list(); _clear_errors_list();
stop(); stop();
profiler->set_enabled(true, true);
peer = p_peer; peer = p_peer;
ERR_FAIL_COND(p_peer.is_null()); ERR_FAIL_COND(p_peer.is_null());
@@ -971,6 +972,8 @@ void ScriptEditorDebugger::stop() {
res_path_cache.clear(); res_path_cache.clear();
profiler_signature.clear(); profiler_signature.clear();
profiler->set_enabled(true, false);
inspector->edit(nullptr); inspector->edit(nullptr);
_update_buttons_state(); _update_buttons_state();
} }