Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jul 12, 2023
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion main/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ void Main::print_help(const char *p_binary) {

OS::get_singleton()->print("Standalone tools:\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");
#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");
Expand Down Expand Up @@ -2558,6 +2559,7 @@ bool Main::start() {
String positional_arg;
String game_path;
String script;
String main_loop_type;
bool check_only = false;

#ifdef TOOLS_ENABLED
Expand Down Expand Up @@ -2621,6 +2623,8 @@ bool Main::start() {
bool parsed_pair = true;
if (args[i] == "-s" || args[i] == "--script") {
script = args[i + 1];
} else if (args[i] == "--main-loop") {
main_loop_type = args[i + 1];
#ifdef TOOLS_ENABLED
} else if (args[i] == "--doctool") {
doc_tool_path = args[i + 1];
Expand Down Expand Up @@ -2839,7 +2843,9 @@ bool Main::start() {
if (editor) {
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()) {
Ref<Script> script_res = ResourceLoader::load(script);
Expand Down