diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-09-02 11:52:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-02 11:52:56 +0200 |
| commit | 358e209fa049887fd4212c52c9faba0ca9d6e111 (patch) | |
| tree | 53409073d54986c1af35ac52389832776e515a5c | |
| parent | 39228830ce726657d4b81a5eab0d68cf9530434d (diff) | |
| parent | 871b1d76d26ff35546fc40950aee439b6caf6366 (diff) | |
Merge pull request #41190 from Xrayez/main-loop-type-class
Accept global classes for `MainLoop` type in project settings
| -rw-r--r-- | main/main.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/main/main.cpp b/main/main.cpp index e45162c0f3..cb67d26043 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1805,7 +1805,6 @@ bool Main::start() { } } - String main_loop_type; #ifdef TOOLS_ENABLED if (doc_tool != "") { Engine::get_singleton()->set_editor_hint( @@ -1900,6 +1899,7 @@ bool Main::start() { if (editor) { main_loop = memnew(SceneTree); }; + String main_loop_type = GLOBAL_DEF("application/run/main_loop_type", "SceneTree"); if (script != "") { Ref<Script> script_res = ResourceLoader::load(script); @@ -1930,9 +1930,23 @@ bool Main::start() { } else { return false; } - - } else { - main_loop_type = GLOBAL_DEF("application/run/main_loop_type", ""); + } else { // Not based on script path. + if (!editor && !ClassDB::class_exists(main_loop_type) && ScriptServer::is_global_class(main_loop_type)) { + String script_path = ScriptServer::get_global_class_path(main_loop_type); + Ref<Script> script_res = ResourceLoader::load(script_path); + StringName script_base = ScriptServer::get_global_class_native_base(main_loop_type); + Object *obj = ClassDB::instance(script_base); + MainLoop *script_loop = Object::cast_to<MainLoop>(obj); + if (!script_loop) { + if (obj) { + memdelete(obj); + } + DisplayServer::get_singleton()->alert("Error: Invalid MainLoop script base type: " + script_base); + ERR_FAIL_V_MSG(false, vformat("The global class %s does not inherit from SceneTree or MainLoop.", main_loop_type)); + } + script_loop->set_init_script(script_res); + main_loop = script_loop; + } } if (!main_loop && main_loop_type == "") { |