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

Add command-line option to run a MainLoop by its global class name

This commit is contained in:
Ricardo Buring 2023-06-13 17:43:17 +02:00
parent 809a982162
commit de5b48ead3
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/main.cpp
View File

@ -476,6 +476,7 @@ void Main::print_help(const char *p_binary) {
OS::get_singleton()->print("Standalone tools:\n"); OS::get_singleton()->print("Standalone tools:\n");
OS::get_singleton()->print(" -s, --script <script> Run a script.\n"); OS::get_singleton()->print(" -s, --script <script> Run a script.\n");
OS::get_singleton()->print(" --main-loop <main_loop_name> Run a MainLoop specified by its global class name.\n");
OS::get_singleton()->print(" --check-only Only parse for errors and quit (use with --script).\n"); OS::get_singleton()->print(" --check-only Only parse for errors and quit (use with --script).\n");
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
OS::get_singleton()->print(" --export-release <preset> <path> Export the project in release mode using the given preset and output path. The preset name should match one defined in export_presets.cfg.\n"); OS::get_singleton()->print(" --export-release <preset> <path> Export the project in release mode using the given preset and output path. The preset name should match one defined in export_presets.cfg.\n");
@ -2558,6 +2559,7 @@ bool Main::start() {
String positional_arg; String positional_arg;
String game_path; String game_path;
String script; String script;
String main_loop_type;
bool check_only = false; bool check_only = false;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
@ -2621,6 +2623,8 @@ bool Main::start() {
bool parsed_pair = true; bool parsed_pair = true;
if (args[i] == "-s" || args[i] == "--script") { if (args[i] == "-s" || args[i] == "--script") {
script = args[i + 1]; script = args[i + 1];
} else if (args[i] == "--main-loop") {
main_loop_type = args[i + 1];
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
} else if (args[i] == "--doctool") { } else if (args[i] == "--doctool") {
doc_tool_path = args[i + 1]; doc_tool_path = args[i + 1];
@ -2839,7 +2843,9 @@ bool Main::start() {
if (editor) { if (editor) {
main_loop = memnew(SceneTree); main_loop = memnew(SceneTree);
} }
String main_loop_type = GLOBAL_GET("application/run/main_loop_type"); if (main_loop_type.is_empty()) {
main_loop_type = GLOBAL_GET("application/run/main_loop_type");
}
if (!script.is_empty()) { if (!script.is_empty()) {
Ref<Script> script_res = ResourceLoader::load(script); Ref<Script> script_res = ResourceLoader::load(script);