From 6760783b9451dce3c1071b9e2d2ce70c5be3693a Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Wed, 2 Aug 2017 15:39:04 -0300 Subject: [PATCH] Revert "Tweak command-line arguments to make them more UNIX-like" --- editor/editor_node.cpp | 4 +- editor/editor_run.cpp | 22 ++--- editor/project_manager.cpp | 6 +- main/main.cpp | 176 ++++++++++++++++++------------------- 4 files changed, 104 insertions(+), 104 deletions(-) diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 4e2687449e4..0cdb9813060 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2803,9 +2803,9 @@ void EditorNode::_discard_changes(const String &p_str) { String exec = OS::get_singleton()->get_executable_path(); List args; - args.push_back("--path"); + args.push_back("-path"); args.push_back(exec.get_base_dir()); - args.push_back("--project-manager"); + args.push_back("-pm"); OS::ProcessID pid = 0; Error err = OS::get_singleton()->execute(exec, args, false, &pid); diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index fee2d0ba4da..aa97dd237be 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -45,24 +45,24 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li int remote_port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port"); if (resource_path != "") { - args.push_back("--path"); + args.push_back("-path"); args.push_back(resource_path.replace(" ", "%20")); } if (true) { - args.push_back("--remote-debug"); + args.push_back("-rdebug"); args.push_back(remote_host + ":" + String::num(remote_port)); } - args.push_back("--editor-pid"); + args.push_back("-epid"); args.push_back(String::num(OS::get_singleton()->get_process_ID())); if (debug_collisions) { - args.push_back("--debug-collision"); + args.push_back("-debugcol"); } if (debug_navigation) { - args.push_back("--debug-navigation"); + args.push_back("-debugnav"); } int screen = EditorSettings::get_singleton()->get("run/window_placement/screen"); @@ -101,33 +101,33 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li case 1: { // centered Vector2 pos = screen_rect.position + ((screen_rect.size - desired_size) / 2).floor(); args.push_back("-p"); - args.push_back(itos(pos.x) + "," + itos(pos.y)); + args.push_back(itos(pos.x) + "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(itos(pos.x) + "," + itos(pos.y)); + args.push_back(itos(pos.x) + "x" + itos(pos.y)); } break; case 3: { // force maximized Vector2 pos = screen_rect.position; args.push_back("-p"); - args.push_back(itos(pos.x) + "," + itos(pos.y)); - args.push_back("-m"); + args.push_back(itos(pos.x) + "x" + itos(pos.y)); + args.push_back("-mx"); } break; case 4: { // force fullscreen Vector2 pos = screen_rect.position; args.push_back("-p"); - args.push_back(itos(pos.x) + "," + itos(pos.y)); + args.push_back(itos(pos.x) + "x" + itos(pos.y)); args.push_back("-f"); } break; } if (p_breakpoints.size()) { - args.push_back("-b"); + args.push_back("-bp"); String bpoints; for (const List::Element *E = p_breakpoints.front(); E; E = E->next()) { diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 87340b1fe86..82f17b80d56 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -935,10 +935,10 @@ void ProjectManager::_open_project_confirm() { List args; - args.push_back("--path"); + args.push_back("-path"); args.push_back(path); - args.push_back("--editor"); + args.push_back("-editor"); String exec = OS::get_singleton()->get_executable_path(); @@ -977,7 +977,7 @@ void ProjectManager::_run_project_confirm() { List args; - args.push_back("--path"); + args.push_back("-path"); args.push_back(path); String exec = OS::get_singleton()->get_executable_path(); diff --git a/main/main.cpp b/main/main.cpp index c2058ee8d41..ed6ed019f40 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -127,62 +127,62 @@ static String unescape_cmdline(const String &p_str) { void Main::print_help(const char *p_binary) { OS::get_singleton()->print(VERSION_FULL_NAME " (c) 2008-2017 Juan Linietsky, Ariel Manzur.\n"); - OS::get_singleton()->print("Usage: %s [options] [path to scene or 'project.godot' file]\n", p_binary); + OS::get_singleton()->print("Usage: %s [options] [scene]\n", p_binary); OS::get_singleton()->print("Options:\n"); - OS::get_singleton()->print(" -h, --help Display this help message.\n"); - OS::get_singleton()->print(" --path Path to the project ( must contain a 'project.godot' file).\n"); + OS::get_singleton()->print("\t-path [dir] : Path to a game, containing project.godot\n"); #ifdef TOOLS_ENABLED - OS::get_singleton()->print(" -e, --editor Bring up the editor instead of running the scene.\n"); + OS::get_singleton()->print("\t-e,-editor : Bring up the editor instead of running the scene.\n"); #endif - OS::get_singleton()->print(" --test Run a test ("); + OS::get_singleton()->print("\t-test [test] : Run a test.\n"); + OS::get_singleton()->print("\t\t("); const char **test_names = tests_get_names(); const char *coma = ""; while (*test_names) { - OS::get_singleton()->print("%s'%s'", coma, *test_names); + OS::get_singleton()->print("%s%s", coma, *test_names); test_names++; coma = ", "; } - OS::get_singleton()->print(").\n"); + OS::get_singleton()->print(")\n"); - OS::get_singleton()->print(" -r, --resolution x Request window resolution.\n"); - OS::get_singleton()->print(" -p, --position , Request window position.\n"); - OS::get_singleton()->print(" -f, --fullscreen Request fullscreen mode.\n"); - OS::get_singleton()->print(" -m, --maximized Request a maximized window.\n"); - OS::get_singleton()->print(" -w, --windowed Request windowed mode.\n"); - OS::get_singleton()->print(" --video-driver Video driver ("); + OS::get_singleton()->print("\t-r WIDTHxHEIGHT\t : Request Window Resolution\n"); + OS::get_singleton()->print("\t-p XxY\t : Request Window Position\n"); + OS::get_singleton()->print("\t-f\t\t : Request Fullscreen\n"); + OS::get_singleton()->print("\t-mx\t\t Request Maximized\n"); + OS::get_singleton()->print("\t-w\t\t Request Windowed\n"); + OS::get_singleton()->print("\t-vd DRIVER\t : Video Driver ("); for (int i = 0; i < OS::get_singleton()->get_video_driver_count(); i++) { if (i != 0) OS::get_singleton()->print(", "); - OS::get_singleton()->print("'%s'", OS::get_singleton()->get_video_driver_name(i)); + OS::get_singleton()->print("%s", OS::get_singleton()->get_video_driver_name(i)); } - OS::get_singleton()->print(").\n"); - OS::get_singleton()->print(" --low-dpi Force low-DPI mode (macOS only).\n"); + OS::get_singleton()->print(")\n"); + OS::get_singleton()->print("\t-ldpi\t : Force low-dpi mode (OSX Only)\n"); - OS::get_singleton()->print(" --audio-driver Audio driver ("); + OS::get_singleton()->print("\t-ad DRIVER\t : Audio Driver ("); for (int i = 0; i < OS::get_singleton()->get_audio_driver_count(); i++) { if (i != 0) OS::get_singleton()->print(", "); - OS::get_singleton()->print("'%s'", OS::get_singleton()->get_audio_driver_name(i)); + OS::get_singleton()->print("%s", OS::get_singleton()->get_audio_driver_name(i)); } - OS::get_singleton()->print(").\n"); - OS::get_singleton()->print(" --render-thread Render thread mode ('unsafe', 'safe', 'separate').\n"); - OS::get_singleton()->print(" -s, --script