godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Merge pull request #41190 from Xrayez/main-loop-type-class

Browse Source 
Accept global classes  for `MainLoop` type in project settings
This commit is contained in:
Rémi Verschelde
2020-09-02 11:52:56 +02:00
committed by GitHub
parent 39228830ce 871b1d76d2
commit 358e209fa0
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/main.cpp
View File

@@ -1805,7 +1805,6 @@ bool Main::start() {
} }
} }
String main_loop_type;
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (doc_tool != "") { if (doc_tool != "") {
Engine::get_singleton()->set_editor_hint( Engine::get_singleton()->set_editor_hint(
@@ -1900,6 +1899,7 @@ bool Main::start() {
if (editor) { if (editor) {
main_loop = memnew(SceneTree); main_loop = memnew(SceneTree);
}; };
String main_loop_type = GLOBAL_DEF("application/run/main_loop_type", "SceneTree");
if (script != "") { if (script != "") {
Ref<Script> script_res = ResourceLoader::load(script); Ref<Script> script_res = ResourceLoader::load(script);
@@ -1930,9 +1930,23 @@ bool Main::start() {
} else { } else {
return false; return false;
} }
} else { // Not based on script path.
} else { if (!editor && !ClassDB::class_exists(main_loop_type) && ScriptServer::is_global_class(main_loop_type)) {
main_loop_type = GLOBAL_DEF("application/run/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 == "") { if (!main_loop && main_loop_type == "") {