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

Jump to bottom

Accept global classes for MainLoop type in project settings #41190

Merged
merged 1 commit into from
Sep 2, 2020
Merged

Accept global classes for MainLoop type in project settings #41190

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
22 changes: 18 additions & 4 deletions main/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1730,7 +1730,6 @@ bool Main::start() {
}
}

String main_loop_type;
#ifdef TOOLS_ENABLED
if (doc_tool != "") {
Engine::get_singleton()->set_editor_hint(
Expand Down Expand Up @@ -1825,6 +1824,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);
Expand Down Expand Up @@ -1855,9 +1855,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)) {
Copy link
Contributor Author

@Xrayez Xrayez Aug 12, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
if (!editor && !ClassDB::class_exists(main_loop_type) && ScriptServer::is_global_class(main_loop_type)) {
if (!ClassDB::class_exists(main_loop_type) && ScriptServer::is_global_class(main_loop_type)) {

Technically it's possible to extend/override the main loop of the editor itself upon restart, but if there are any errors (wrong base type, invalid script etc), then the editor will always crash with an alert (you'd have to modify project.godot to revert to previous behavior). 😅

Or make it so that it resets the value to SceneTree if we're running the editor automatically.

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 == "") {
Expand Down