asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #68987 from adamscott/fix-godot#61386-autoload-scenes-implicit-types

Browse source 
Fix autoload scenes implicit types
This commit is contained in:
Rémi Verschelde 2022-11-22 08:31:36 +01:00
commit c474e2f639
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/gdscript/gdscript_analyzer.cpp
View file

@ -3120,6 +3120,18 @@ void GDScriptAnalyzer::reduce_identifier(GDScriptParser::IdentifierNode *p_ident
result = type_from_metatype(singl_parser->get_parser()->head->get_datatype());
}
}
} else if (ResourceLoader::get_resource_type(autoload.path) == "PackedScene") {
Error err = OK;
Ref<GDScript> scr = GDScriptCache::get_packed_scene_script(autoload.path, err);
if (err == OK && scr.is_valid()) {
Ref<GDScriptParserRef> singl_parser = get_parser_for(scr->get_path());
if (singl_parser.is_valid()) {
err = singl_parser->raise_status(GDScriptParserRef::INTERFACE_SOLVED);
if (err == OK) {
result = type_from_metatype(singl_parser->get_parser()->head->get_datatype());
}
}
}
}
result.is_constant = true;
p_identifier->set_datatype(result);

25
modules/gdscript/gdscript_cache.cpp
View file

@ -365,6 +365,31 @@ Ref<PackedScene> GDScriptCache::get_packed_scene(const String &p_path, Error &r_
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() {
if (singleton == nullptr) {
return;

1
modules/gdscript/gdscript_cache.h
View file

@ -102,6 +102,7 @@ public:
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<GDScript> get_packed_scene_script(const String &p_path, Error &r_error);
static void clear_unreferenced_packed_scenes();
static bool is_destructing() {