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

Merge pull request #99667 from RandomShaper/res_load_verb

Browse Source 
ResourceLoader: Print load message only when actually loading
This commit is contained in:
Rémi Verschelde 2024-12-18 09:53:06 +01:00
commit d328c00ad3
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/io/resource_loader.cpp
View File

@ -294,6 +294,8 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
}
load_paths_stack.push_back(original_path);
print_verbose(vformat("Loading resource: %s", p_path));
// Try all loaders and pick the first match for the type hint
bool found = false;
Ref<Resource> res;
@ -303,7 +305,7 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
}
found = true;
res = loader[i]->load(p_path, original_path, r_error, p_use_sub_threads, r_progress, p_cache_mode);
if (!res.is_null()) {
if (res.is_valid()) {
break;
}
}
@ -312,8 +314,10 @@ Ref<Resource> ResourceLoader::_load(const String &p_path, const String &p_origin
res_ref_overrides.erase(load_nesting);
load_nesting--;
if (!res.is_null()) {
if (res.is_valid()) {
return res;
} else {
print_verbose(vformat("Failed loading resource: %s", p_path));
}
ERR_FAIL_COND_V_MSG(found, Ref<Resource>(),
@ -361,18 +365,12 @@ void ResourceLoader::_run_load_task(void *p_userdata) {
bool xl_remapped = false;
const String &remapped_path = _path_remap(load_task.local_path, &xl_remapped);
print_verbose("Loading resource: " + remapped_path);
Error load_err = OK;
Ref<Resource> res = _load(remapped_path, remapped_path != load_task.local_path ? load_task.local_path : String(), load_task.type_hint, load_task.cache_mode, &load_err, load_task.use_sub_threads, &load_task.progress);
if (MessageQueue::get_singleton() != MessageQueue::get_main_singleton()) {
MessageQueue::get_singleton()->flush();
}
if (res.is_null()) {
print_verbose("Failed loading resource: " + remapped_path);
}
thread_load_mutex.lock();
load_task.resource = res;