diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-19 16:45:03 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-19 16:48:11 +0200 |
commit | 70b0857f6c099339214d0ec2667990e9b7c3c5ea (patch) | |
tree | 62a5e5ef873d6eaf53667bd652dccbcace5cfe03 /editor | |
parent | 27fc96f3c8528f0f9cc6e42d8e64934ba1b48d6d (diff) |
Fixes for new two-dash long command line arguments
- Fixes some single-dash leftovers that were missed in the previous commit
- Reorder the help output for clarity, and document missing options
- Drop obsolete options: --noop, --pack, --editor-scene, --level, --import, --import-script, --no-quit
- Improve error message on malformed arguments and do not display help on error
- Cleanup obsolete code here and there
Diffstat (limited to 'editor')
-rw-r--r-- | editor/editor_export.cpp | 36 | ||||
-rw-r--r-- | editor/editor_node.cpp | 47 | ||||
-rw-r--r-- | editor/editor_run.cpp | 22 | ||||
-rw-r--r-- | editor/run_settings_dialog.cpp | 2 |
4 files changed, 28 insertions, 79 deletions
diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index fe1dfa281c..d8d3554612 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -229,17 +229,17 @@ void EditorExportPlatform::gen_debug_flags(Vector<String> &r_flags, int p_flags) if (p_flags & DEBUG_FLAG_DUMB_CLIENT) { int port = EditorSettings::get_singleton()->get("filesystem/file_server/port"); String passwd = EditorSettings::get_singleton()->get("filesystem/file_server/password"); - r_flags.push_back("-rfs"); + r_flags.push_back("--remote-fs"); r_flags.push_back(host + ":" + itos(port)); if (passwd != "") { - r_flags.push_back("-rfs_pass"); + r_flags.push_back("--remote-fs-password"); r_flags.push_back(passwd); } } if (p_flags & DEBUG_FLAG_REMOTE_DEBUG) { - r_flags.push_back("-rdebug"); + r_flags.push_back("--remote-debug"); r_flags.push_back(host + ":" + String::num(remote_port)); @@ -248,7 +248,7 @@ void EditorExportPlatform::gen_debug_flags(Vector<String> &r_flags, int p_flags) if (breakpoints.size()) { - r_flags.push_back("-bp"); + r_flags.push_back("--breakpoints"); String bpoints; for (const List<String>::Element *E = breakpoints.front(); E; E = E->next()) { @@ -263,12 +263,12 @@ void EditorExportPlatform::gen_debug_flags(Vector<String> &r_flags, int p_flags) if (p_flags & DEBUG_FLAG_VIEW_COLLISONS) { - r_flags.push_back("-debugcol"); + r_flags.push_back("--debug-collisions"); } if (p_flags & DEBUG_FLAG_VIEW_NAVIGATION) { - r_flags.push_back("-debugnav"); + r_flags.push_back("--debug-navigation"); } } @@ -714,17 +714,17 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags if (p_flags & DEBUG_FLAG_DUMB_CLIENT) { int port = EditorSettings::get_singleton()->get("filesystem/file_server/port"); String passwd = EditorSettings::get_singleton()->get("filesystem/file_server/password"); - r_flags.push_back("-rfs"); + r_flags.push_back("--remote-fs"); r_flags.push_back(host + ":" + itos(port)); if (passwd != "") { - r_flags.push_back("-rfs_pass"); + r_flags.push_back("--remote-fs-password"); r_flags.push_back(passwd); } } if (p_flags & DEBUG_FLAG_REMOTE_DEBUG) { - r_flags.push_back("-rdebug"); + r_flags.push_back("--remote-debug"); r_flags.push_back(host + ":" + String::num(remote_port)); @@ -733,7 +733,7 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags if (breakpoints.size()) { - r_flags.push_back("-bp"); + r_flags.push_back("--breakpoints"); String bpoints; for (const List<String>::Element *E = breakpoints.front(); E; E = E->next()) { @@ -748,12 +748,12 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags if (p_flags & DEBUG_FLAG_VIEW_COLLISONS) { - r_flags.push_back("-debugcol"); + r_flags.push_back("--debug-collisions"); } if (p_flags & DEBUG_FLAG_VIEW_NAVIGATION) { - r_flags.push_back("-debugnav"); + r_flags.push_back("--debug-navigation"); } } EditorExportPlatform::EditorExportPlatform() { @@ -2231,17 +2231,17 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags if (p_flags&EXPORT_DUMB_CLIENT) { int port = EditorSettings::get_singleton()->get("filesystem/file_server/port"); String passwd = EditorSettings::get_singleton()->get("filesystem/file_server/password"); - r_flags.push_back("-rfs"); + r_flags.push_back("--remote-fs"); r_flags.push_back(host+":"+itos(port)); if (passwd!="") { - r_flags.push_back("-rfs_pass"); + r_flags.push_back("--remote-fs-password"); r_flags.push_back(passwd); } } if (p_flags&EXPORT_REMOTE_DEBUG) { - r_flags.push_back("-rdebug"); + r_flags.push_back("--remote-debug"); r_flags.push_back(host+":"+String::num(remote_port)); @@ -2251,7 +2251,7 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags if (breakpoints.size()) { - r_flags.push_back("-bp"); + r_flags.push_back("--breakpoints"); String bpoints; for(const List<String>::Element *E=breakpoints.front();E;E=E->next()) { @@ -2267,12 +2267,12 @@ void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags if (p_flags&EXPORT_VIEW_COLLISONS) { - r_flags.push_back("-debugcol"); + r_flags.push_back("--debug-collisions"); } if (p_flags&EXPORT_VIEW_NAVIGATION) { - r_flags.push_back("-debugnav"); + r_flags.push_back("--debug-navigation"); } diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index a379b6f6a6..9199ff825e 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1850,47 +1850,6 @@ void EditorNode::_run(bool p_current, const String &p_custom) { _playing_edited = p_current; } -void EditorNode::_cleanup_scene() { - -#if 0 - Node *scene = editor_data.get_edited_scene_root(); - editor_selection->clear(); - editor_data.clear_editor_states(); - editor_history.clear(); - _hide_top_editors(); - animation_editor->cleanup(); - property_editor->edit(NULL); - resources_dock->cleanup(); - scene_import_metadata.unref(); - //set_edited_scene(NULL); - if (scene) { - if (scene->get_filename()!="") { - previous_scenes.push_back(scene->get_filename()); - } - - memdelete(scene); - } - editor_data.get_undo_redo().clear_history(); - saved_version=editor_data.get_undo_redo().get_version(); - run_settings_dialog->set_run_mode(0); - run_settings_dialog->set_custom_arguments("-l $scene"); - - List<Ref<Resource> > cached; - ResourceCache::get_cached_resources(&cached); - - for(List<Ref<Resource> >::Element *E=cached.front();E;E=E->next()) { - - String path = E->get()->get_path(); - if (path.is_resource_file()) { - ERR_PRINT(("Stray resource not cleaned:"+path).utf8().get_data()); - } - - } - - _update_title(); -#endif -} - void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { //print_line("option "+itos(p_option)+" confirm "+itos(p_confirmed)); @@ -1914,8 +1873,6 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { _scene_tab_changed(idx); editor_data.clear_editor_states(); - //_cleanup_scene(); - } break; case FILE_NEW_INHERITED_SCENE: case FILE_OPEN_SCENE: { @@ -2736,8 +2693,6 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { import_reload_fn = scene->get_filename(); _save_scene(import_reload_fn); - _cleanup_scene(); - } @@ -3327,8 +3282,6 @@ Error EditorNode::load_scene(const String &p_scene, bool p_ignore_broken_deps, b _scene_tab_changed(idx); } - //_cleanup_scene(); // i'm sorry but this MUST happen to avoid modified resources to not be reloaded. - dependency_errors.clear(); Ref<PackedScene> sdata = ResourceLoader::load(lpath, "", true); diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index 5130d8b7d5..28907ccf51 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -58,7 +58,7 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li args.push_back(String::num(OS::get_singleton()->get_process_id())); if (debug_collisions) { - args.push_back("--debug-collision"); + args.push_back("--debug-collisions"); } if (debug_navigation) { @@ -66,7 +66,6 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li } int screen = EditorSettings::get_singleton()->get("run/window_placement/screen"); - if (screen == 0) { screen = OS::get_singleton()->get_current_screen(); } else { @@ -78,7 +77,6 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li screen_rect.size = OS::get_singleton()->get_screen_size(screen); Size2 desired_size; - desired_size.x = ProjectSettings::get_singleton()->get("display/window/size/width"); desired_size.y = ProjectSettings::get_singleton()->get("display/window/size/height"); @@ -95,39 +93,39 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li switch (window_placement) { case 0: { // default - args.push_back("-p"); + args.push_back("--position"); args.push_back(itos(screen_rect.position.x) + "x" + itos(screen_rect.position.y)); } break; case 1: { // centered Vector2 pos = screen_rect.position + ((screen_rect.size - desired_size) / 2).floor(); - args.push_back("-p"); + args.push_back("--position"); args.push_back(itos(pos.x) + "," + itos(pos.y)); } break; case 2: { // custom pos Vector2 pos = EditorSettings::get_singleton()->get("run/window_placement/rect_custom_position"); pos += screen_rect.position; - args.push_back("-p"); + args.push_back("--position"); args.push_back(itos(pos.x) + "," + itos(pos.y)); } break; case 3: { // force maximized Vector2 pos = screen_rect.position; - args.push_back("-p"); + args.push_back("--position"); args.push_back(itos(pos.x) + "," + itos(pos.y)); - args.push_back("-m"); + args.push_back("--maximized"); } break; case 4: { // force fullscreen Vector2 pos = screen_rect.position; - args.push_back("-p"); + args.push_back("--position"); args.push_back(itos(pos.x) + "," + itos(pos.y)); - args.push_back("-f"); + args.push_back("--fullscreen"); } break; } if (p_breakpoints.size()) { - args.push_back("-b"); + args.push_back("--breakpoints"); String bpoints; for (const List<String>::Element *E = p_breakpoints.front(); E; E = E->next()) { @@ -152,7 +150,7 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li String exec = OS::get_singleton()->get_executable_path(); - printf("running: %ls", exec.c_str()); + printf("Running: %ls", exec.c_str()); for (List<String>::Element *E = args.front(); E; E = E->next()) { printf(" %ls", E->get().c_str()); diff --git a/editor/run_settings_dialog.cpp b/editor/run_settings_dialog.cpp index 4548ae0939..dfb152d40b 100644 --- a/editor/run_settings_dialog.cpp +++ b/editor/run_settings_dialog.cpp @@ -88,7 +88,5 @@ RunSettingsDialog::RunSettingsDialog() { get_ok()->set_text(TTR("Close")); //get_cancel()->set_text("Close"); - arguments->set_text("-l $scene"); - set_title(TTR("Scene Run Settings")); } |