Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-31 13:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #69079 from adamscott/fix-singleton-scene-cyclic-load

Browse source 
Fix singleton scene cyclic loading
This commit is contained in:
Rémi Verschelde 2022-11-25 19:29:57 +01:00 • committed by GitHub
commit c7ceb94e37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 91 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

41
editor/editor_autoload_settings.cpp
View file

@ -400,27 +400,38 @@ void EditorAutoloadSettings::_autoload_text_changed(const String p_name) {
} }
Node *EditorAutoloadSettings::_create_autoload(const String &p_path) { Node *EditorAutoloadSettings::_create_autoload(const String &p_path) {
Ref<Resource> res = ResourceLoader::load(p_path);
ERR_FAIL_COND_V_MSG(res.is_null(), nullptr, "Can't autoload: " + p_path + ".");
Node *n = nullptr; Node *n = nullptr;
Ref<PackedScene> scn = res; if (ResourceLoader::get_resource_type(p_path) == "PackedScene") {
Ref<Script> scr = res; // Cache the scene reference before loading it (for cyclic references)
if (scn.is_valid()) { Ref<PackedScene> scn;
n = scn->instantiate(); scn.instantiate();
} else if (scr.is_valid()) { scn->set_path(p_path);
StringName ibt = scr->get_instance_base_type(); scn->reload_from_file();
bool valid_type = ClassDB::is_parent_class(ibt, "Node"); ERR_FAIL_COND_V_MSG(!scn.is_valid(), nullptr, vformat("Can't autoload: %s.", p_path));
ERR_FAIL_COND_V_MSG(!valid_type, nullptr, "Script does not inherit from Node: " + p_path + ".");
Object *obj = ClassDB::instantiate(ibt); if (scn.is_valid()) {
n = scn->instantiate();
}
} else {
Ref<Resource> res = ResourceLoader::load(p_path);
ERR_FAIL_COND_V_MSG(res.is_null(), nullptr, vformat("Can't autoload: %s.", p_path));
ERR_FAIL_COND_V_MSG(!obj, nullptr, "Cannot instance script for Autoload, expected 'Node' inheritance, got: " + String(ibt) + "."); Ref<Script> scr = res;
if (scr.is_valid()) {
StringName ibt = scr->get_instance_base_type();
bool valid_type = ClassDB::is_parent_class(ibt, "Node");
ERR_FAIL_COND_V_MSG(!valid_type, nullptr, vformat("Script does not inherit from Node: %s.", p_path));
n = Object::cast_to<Node>(obj); Object *obj = ClassDB::instantiate(ibt);
n->set_script(scr);
ERR_FAIL_COND_V_MSG(!obj, nullptr, vformat("Cannot instance script for Autoload, expected 'Node' inheritance, got: %s.", ibt));
n = Object::cast_to<Node>(obj);
n->set_script(scr);
}
} }
ERR_FAIL_COND_V_MSG(!n, nullptr, "Path in Autoload not a node or script: " + p_path + "."); ERR_FAIL_COND_V_MSG(!n, nullptr, vformat("Path in Autoload not a node or script: %s.", p_path));
return n; return n;
} }

41
main/main.cpp
View file

@ -2742,27 +2742,38 @@ bool Main::start() {
for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : autoloads) { for (const KeyValue<StringName, ProjectSettings::AutoloadInfo> &E : autoloads) {
const ProjectSettings::AutoloadInfo &info = E.value; const ProjectSettings::AutoloadInfo &info = E.value;
Ref<Resource> res = ResourceLoader::load(info.path);
ERR_CONTINUE_MSG(res.is_null(), "Can't autoload: " + info.path);
Node *n = nullptr; Node *n = nullptr;
Ref<PackedScene> scn = res; if (ResourceLoader::get_resource_type(info.path) == "PackedScene") {
Ref<Script> script_res = res; // Cache the scene reference before loading it (for cyclic references)
if (scn.is_valid()) { Ref<PackedScene> scn;
n = scn->instantiate(); scn.instantiate();
} else if (script_res.is_valid()) { scn->set_path(info.path);
StringName ibt = script_res->get_instance_base_type(); scn->reload_from_file();
bool valid_type = ClassDB::is_parent_class(ibt, "Node"); ERR_CONTINUE_MSG(!scn.is_valid(), vformat("Can't autoload: %s.", info.path));
ERR_CONTINUE_MSG(!valid_type, "Script does not inherit from Node: " + info.path);
Object *obj = ClassDB::instantiate(ibt); if (scn.is_valid()) {
n = scn->instantiate();
}
} else {
Ref<Resource> res = ResourceLoader::load(info.path);
ERR_CONTINUE_MSG(res.is_null(), vformat("Can't autoload: %s.", info.path));
ERR_CONTINUE_MSG(!obj, "Cannot instance script for autoload, expected 'Node' inheritance, got: " + String(ibt) + "."); Ref<Script> script_res = res;
if (script_res.is_valid()) {
StringName ibt = script_res->get_instance_base_type();
bool valid_type = ClassDB::is_parent_class(ibt, "Node");
ERR_CONTINUE_MSG(!valid_type, vformat("Script does not inherit from Node: %s.", info.path));
n = Object::cast_to<Node>(obj); Object *obj = ClassDB::instantiate(ibt);
n->set_script(script_res);
ERR_CONTINUE_MSG(!obj, vformat("Cannot instance script for autoload, expected 'Node' inheritance, got: %s."));
n = Object::cast_to<Node>(obj);
n->set_script(script_res);
}
} }
ERR_CONTINUE_MSG(!n, "Path in autoload not a node or script: " + info.path); ERR_CONTINUE_MSG(!n, vformat("Path in autoload not a node or script: %s.", info.path));
n->set_name(info.name); n->set_name(info.name);
//defer so references are all valid on _ready() //defer so references are all valid on _ready()

21
modules/gdscript/gdscript_analyzer.cpp
View file

@ -3131,14 +3131,19 @@ void GDScriptAnalyzer::reduce_identifier(GDScriptParser::IdentifierNode *p_ident
} }
} }
} else if (ResourceLoader::get_resource_type(autoload.path) == "PackedScene") { } else if (ResourceLoader::get_resource_type(autoload.path) == "PackedScene") {
Error err = OK; if (GDScriptLanguage::get_singleton()->get_named_globals_map().has(name)) {
Ref<GDScript> scr = GDScriptCache::get_packed_scene_script(autoload.path, err); Variant constant = GDScriptLanguage::get_singleton()->get_named_globals_map()[name];
if (err == OK && scr.is_valid()) { Node *node = Object::cast_to<Node>(constant);
Ref<GDScriptParserRef> singl_parser = get_parser_for(scr->get_path()); if (node != nullptr) {
if (singl_parser.is_valid()) { Ref<Script> scr = node->get_script();
err = singl_parser->raise_status(GDScriptParserRef::INTERFACE_SOLVED); if (scr.is_valid()) {
if (err == OK) { Ref<GDScriptParserRef> singl_parser = get_parser_for(scr->get_path());
result = type_from_metatype(singl_parser->get_parser()->head->get_datatype()); if (singl_parser.is_valid()) {
Error err = singl_parser->raise_status(GDScriptParserRef::INTERFACE_SOLVED);
if (err == OK) {
result = type_from_metatype(singl_parser->get_parser()->head->get_datatype());
}
}
} }
} }
} }

25
modules/gdscript/gdscript_cache.cpp
View file

@ -365,31 +365,6 @@ Ref<PackedScene> GDScriptCache::get_packed_scene(const String &p_path, Error &r_
return scene; return scene;
} }
Ref<GDScript> GDScriptCache::get_packed_scene_script(const String &p_path, Error &r_error) {
r_error = OK;
Ref<PackedScene> scene = get_packed_scene(p_path, r_error);
if (r_error != OK) {
return Ref<GDScript>();
}
int node_count = scene->get_state()->get_node_count();
if (node_count == 0) {
return Ref<GDScript>();
}
const int ROOT_NODE = 0;
for (int i = 0; i < scene->get_state()->get_node_property_count(ROOT_NODE); i++) {
if (scene->get_state()->get_node_property_name(ROOT_NODE, i) != SNAME("script")) {
continue;
}
return scene->get_state()->get_node_property_value(ROOT_NODE, i);
}
return Ref<GDScript>();
}
void GDScriptCache::clear_unreferenced_packed_scenes() { void GDScriptCache::clear_unreferenced_packed_scenes() {
if (singleton == nullptr) { if (singleton == nullptr) {
return; return;

1
modules/gdscript/gdscript_cache.h
View file

@ -102,7 +102,6 @@ public:
static Error finish_compiling(const String &p_owner); static Error finish_compiling(const String &p_owner);
static Ref<PackedScene> get_packed_scene(const String &p_path, Error &r_error, const String &p_owner = ""); static Ref<PackedScene> get_packed_scene(const String &p_path, Error &r_error, const String &p_owner = "");
static Ref<GDScript> get_packed_scene_script(const String &p_path, Error &r_error);
static void clear_unreferenced_packed_scenes(); static void clear_unreferenced_packed_scenes();
static bool is_destructing() { static bool is_destructing() {

41
modules/gdscript/tests/gdscript_test_runner.cpp
View file

@ -71,27 +71,38 @@ void init_autoloads() {
continue; continue;
} }
Ref<Resource> res = ResourceLoader::load(info.path);
ERR_CONTINUE_MSG(res.is_null(), "Can't autoload: " + info.path);
Node *n = nullptr; Node *n = nullptr;
Ref<PackedScene> scn = res; if (ResourceLoader::get_resource_type(info.path) == "PackedScene") {
Ref<Script> script = res; // Cache the scene reference before loading it (for cyclic references)
if (scn.is_valid()) { Ref<PackedScene> scn;
n = scn->instantiate(); scn.instantiate();
} else if (script.is_valid()) { scn->set_path(info.path);
StringName ibt = script->get_instance_base_type(); scn->reload_from_file();
bool valid_type = ClassDB::is_parent_class(ibt, "Node"); ERR_CONTINUE_MSG(!scn.is_valid(), vformat("Can't autoload: %s.", info.path));
ERR_CONTINUE_MSG(!valid_type, "Script does not inherit from Node: " + info.path);
Object *obj = ClassDB::instantiate(ibt); if (scn.is_valid()) {
n = scn->instantiate();
}
} else {
Ref<Resource> res = ResourceLoader::load(info.path);
ERR_CONTINUE_MSG(res.is_null(), vformat("Can't autoload: %s.", info.path));
ERR_CONTINUE_MSG(!obj, "Cannot instance script for autoload, expected 'Node' inheritance, got: " + String(ibt) + "."); Ref<Script> scr = res;
if (scr.is_valid()) {
StringName ibt = scr->get_instance_base_type();
bool valid_type = ClassDB::is_parent_class(ibt, "Node");
ERR_CONTINUE_MSG(!valid_type, vformat("Script does not inherit from Node: %s.", info.path));
n = Object::cast_to<Node>(obj); Object *obj = ClassDB::instantiate(ibt);
n->set_script(script);
ERR_CONTINUE_MSG(!obj, vformat("Cannot instance script for Autoload, expected 'Node' inheritance, got: %s.", ibt));
n = Object::cast_to<Node>(obj);
n->set_script(scr);
}
} }
ERR_CONTINUE_MSG(!n, "Path in autoload not a node or script: " + info.path); ERR_CONTINUE_MSG(!n, vformat("Path in autoload not a node or script: %s.", info.path));
n->set_name(info.name); n->set_name(info.name);
for (int i = 0; i < ScriptServer::get_language_count(); i++) { for (int i = 0; i < ScriptServer::get_language_count(); i++) {