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

Rename debug/debug_port to network/debug_port.

Browse Source 
Expose it in editor settings.
This commit is contained in:
Fabio Alessandrelli 2017-05-12 19:27:16 +02:00
parent 7a4dc3be41
commit aa167fa04b
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_import_export.cpp
View File

@ -1047,7 +1047,7 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags
r_flags.push_back("-rdebug"); r_flags.push_back("-rdebug");
r_flags.push_back(host + ":" + String::num(GLOBAL_DEF("debug/debug_port", 6007))); r_flags.push_back(host + ":" + String::num(GLOBAL_DEF("network/debug_port", 6007)));
List<String> breakpoints; List<String> breakpoints;
ScriptEditor::get_singleton()->get_breakpoints(&breakpoints); ScriptEditor::get_singleton()->get_breakpoints(&breakpoints);

2
editor/editor_run.cpp
View File

@ -49,7 +49,7 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li
if (true) { if (true) {
args.push_back("-rdebug"); args.push_back("-rdebug");
args.push_back(remote_host + ":" + String::num(GLOBAL_DEF("debug/debug_port", 6007))); args.push_back(remote_host + ":" + String::num(GLOBAL_DEF("network/debug_port", 6007)));
} }
args.push_back("-epid"); args.push_back("-epid");

4
editor/editor_settings.cpp
View File

@ -413,6 +413,7 @@ void EditorSettings::setup_network() {
String lip; String lip;
String hint; String hint;
String current = get("network/debug_host"); String current = get("network/debug_host");
int port = has("network/debug_port") ? (int)get("network/debug_port") : 6007;
for (List<IP_Address>::Element *E = local_ip.front(); E; E = E->next()) { for (List<IP_Address>::Element *E = local_ip.front(); E; E = E->next()) {
@ -429,6 +430,9 @@ void EditorSettings::setup_network() {
set("network/debug_host", lip); set("network/debug_host", lip);
add_property_hint(PropertyInfo(Variant::STRING, "network/debug_host", PROPERTY_HINT_ENUM, hint)); add_property_hint(PropertyInfo(Variant::STRING, "network/debug_host", PROPERTY_HINT_ENUM, hint));
set("network/debug_port", port);
add_property_hint(PropertyInfo(Variant::INT, "network/debug_port", PROPERTY_HINT_RANGE, "1,65535,1"));
} }
void EditorSettings::save() { void EditorSettings::save() {

3
editor/plugins/script_editor_plugin.cpp
View File

@ -37,7 +37,6 @@
#include "os/file_access.h" #include "os/file_access.h"
#include "os/input.h" #include "os/input.h"
#include "os/keyboard.h" #include "os/keyboard.h"
#include "os/keyboard.h"
#include "os/os.h" #include "os/os.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
@ -2158,8 +2157,6 @@ void ScriptEditor::_editor_play() {
debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_STEP), true); debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_STEP), true);
debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_BREAK), false); debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_BREAK), false);
debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), true); debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), true);
//debugger_gui->start_listening(Globals::get_singleton()->get("debug/debug_port"));
} }
void ScriptEditor::_editor_pause() { void ScriptEditor::_editor_pause() {

2
platform/android/export/export.cpp
View File

@ -1651,7 +1651,7 @@ Error EditorExportPlatformAndroid::run(int p_device, int p_flags) {
args.push_back("--remove-all"); args.push_back("--remove-all");
err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv); err = OS::get_singleton()->execute(adb, args, true, NULL, NULL, &rv);
int port = Globals::get_singleton()->get("debug/debug_port"); int port = Globals::get_singleton()->get("network/debug_port");
args.clear(); args.clear();
args.push_back("reverse"); args.push_back("reverse");
args.push_back("tcp:" + itos(port)); args.push_back("tcp:" + itos(port));