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

Merge pull request #112193 from KnifeXRage/autoload_with_uids

Browse Source 
Autoloads with UIDs
This commit is contained in:
Thaddeus Crews
2025-11-10 08:20:12 -06:00
parent febd1d32cf d940614595
commit ea1aec2c1c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
editor/settings/editor_autoload_settings.cpp
View File

@@ -395,14 +395,14 @@ Node *EditorAutoloadSettings::_create_autoload(const String &p_path) {
scn.instantiate(); scn.instantiate();
scn->set_path(p_path); scn->set_path(p_path);
scn->reload_from_file(); scn->reload_from_file();
ERR_FAIL_COND_V_MSG(scn.is_null(), nullptr, vformat("Failed to create an autoload, can't load from path: %s.", p_path)); ERR_FAIL_COND_V_MSG(scn.is_null(), nullptr, vformat("Failed to create an autoload, can't load from UID or path: %s.", p_path));
if (scn.is_valid()) { if (scn.is_valid()) {
n = scn->instantiate(); n = scn->instantiate();
} }
} else { } else {
Ref<Resource> res = ResourceLoader::load(p_path); Ref<Resource> res = ResourceLoader::load(p_path);
ERR_FAIL_COND_V_MSG(res.is_null(), nullptr, vformat("Failed to create an autoload, can't load from path: %s.", p_path)); ERR_FAIL_COND_V_MSG(res.is_null(), nullptr, vformat("Failed to create an autoload, can't load from UID or path: %s.", p_path));
Ref<Script> scr = res; Ref<Script> scr = res;
if (scr.is_valid()) { if (scr.is_valid()) {
@@ -427,7 +427,7 @@ Node *EditorAutoloadSettings::_create_autoload(const String &p_path) {
void EditorAutoloadSettings::init_autoloads() { void EditorAutoloadSettings::init_autoloads() {
for (AutoloadInfo &info : autoload_cache) { for (AutoloadInfo &info : autoload_cache) {
info.node = _create_autoload(info.path); info.node = _create_autoload(ResourceUID::ensure_path(info.path));
if (info.node) { if (info.node) {
Ref<Script> scr = info.node->get_script(); Ref<Script> scr = info.node->get_script();
@@ -498,7 +498,7 @@ void EditorAutoloadSettings::update_autoload() {
} }
info.name = name; info.name = name;
info.path = scr_path; info.path = ResourceUID::get_singleton()->path_to_uid(scr_path);
info.order = ProjectSettings::get_singleton()->get_order(pi.name); info.order = ProjectSettings::get_singleton()->get_order(pi.name);
bool need_to_add = true; bool need_to_add = true;
@@ -530,7 +530,7 @@ void EditorAutoloadSettings::update_autoload() {
item->set_text(0, name); item->set_text(0, name);
item->set_editable(0, true); item->set_editable(0, true);
item->set_text(1, scr_path); item->set_text(1, ResourceUID::ensure_path(scr_path));
item->set_selectable(1, true); item->set_selectable(1, true);
item->set_cell_mode(2, TreeItem::CELL_MODE_CHECK); item->set_cell_mode(2, TreeItem::CELL_MODE_CHECK);
@@ -800,7 +800,7 @@ bool EditorAutoloadSettings::autoload_add(const String &p_name, const String &p_
undo_redo->create_action(TTR("Add Autoload")); undo_redo->create_action(TTR("Add Autoload"));
// Singleton autoloads are represented with a leading "*" in their path. // Singleton autoloads are represented with a leading "*" in their path.
undo_redo->add_do_property(ProjectSettings::get_singleton(), name, "*" + p_path); undo_redo->add_do_property(ProjectSettings::get_singleton(), name, "*" + ResourceUID::get_singleton()->path_to_uid(p_path));
if (ProjectSettings::get_singleton()->has_setting(name)) { if (ProjectSettings::get_singleton()->has_setting(name)) {
undo_redo->add_undo_property(ProjectSettings::get_singleton(), name, GLOBAL_GET(name)); undo_redo->add_undo_property(ProjectSettings::get_singleton(), name, GLOBAL_GET(name));
@@ -876,7 +876,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
} }
info.name = name; info.name = name;
info.path = scr_path; info.path = ResourceUID::get_singleton()->path_to_uid(scr_path);
info.order = ProjectSettings::get_singleton()->get_order(pi.name); info.order = ProjectSettings::get_singleton()->get_order(pi.name);
if (info.is_singleton) { if (info.is_singleton) {

2
main/main.cpp
View File

@@ -4275,7 +4275,7 @@ int Main::start() {
// Cache the scene reference before loading it (for cyclic references) // Cache the scene reference before loading it (for cyclic references)
Ref<PackedScene> scn; Ref<PackedScene> scn;
scn.instantiate(); scn.instantiate();
scn->set_path(info.path); scn->set_path(ResourceUID::ensure_path(info.path));
scn->reload_from_file(); scn->reload_from_file();
ERR_CONTINUE_MSG(scn.is_null(), vformat("Failed to instantiate an autoload, can't load from path: %s.", info.path)); ERR_CONTINUE_MSG(scn.is_null(), vformat("Failed to instantiate an autoload, can't load from path: %s.", info.path));

2
modules/gdscript/tests/gdscript_test_runner.cpp
View File

@@ -76,7 +76,7 @@ void init_autoloads() {
// Cache the scene reference before loading it (for cyclic references) // Cache the scene reference before loading it (for cyclic references)
Ref<PackedScene> scn; Ref<PackedScene> scn;
scn.instantiate(); scn.instantiate();
scn->set_path(info.path); scn->set_path(ResourceUID::ensure_path(info.path));
scn->reload_from_file(); scn->reload_from_file();
ERR_CONTINUE_MSG(scn.is_null(), vformat("Failed to instantiate an autoload, can't load from path: %s.", info.path)); ERR_CONTINUE_MSG(scn.is_null(), vformat("Failed to instantiate an autoload, can't load from path: %s.", info.path));