godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51042 from nikitalita/fix_binary_res_load_save

Browse Source 
Fix binary resource loading and saving
This commit is contained in:
K. S. Ernest (iFire) Lee 2021-08-02 18:41:05 -07:00 committed by GitHub
commit 04703c6f66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/io/resource_format_binary.cpp
View File

@ -903,10 +903,11 @@ void ResourceLoaderBinary::open(FileAccess *p_f, bool p_no_resources, bool p_kee
if (using_uids) { if (using_uids) {
uid = f->get_64(); uid = f->get_64();
} else { } else {
f->get_64(); // skip over uid field
uid = ResourceUID::INVALID_ID; uid = ResourceUID::INVALID_ID;
} }
for (int i = 0; i < 5; i++) { for (int i = 0; i < ResourceFormatSaverBinaryInstance::RESERVED_FIELDS; i++) {
f->get_32(); //skip a few reserved fields f->get_32(); //skip a few reserved fields
} }
@ -1209,8 +1210,8 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
fw->store_32(flags); fw->store_32(flags);
fw->store_64(uid_data); fw->store_64(uid_data);
for (int i = 0; i < 5; i++) { for (int i = 0; i < ResourceFormatSaverBinaryInstance::RESERVED_FIELDS; i++) {
f->store_32(0); // reserved fw->store_32(0); // reserved
f->get_32(); f->get_32();
} }
@ -1264,7 +1265,7 @@ Error ResourceFormatLoaderBinary::rename_dependencies(const String &p_path, cons
if (using_uids) { if (using_uids) {
ResourceUID::ID uid = ResourceSaver::get_resource_id_for_path(full_path); ResourceUID::ID uid = ResourceSaver::get_resource_id_for_path(full_path);
f->store_64(uid); fw->store_64(uid);
} }
} }
@ -1902,7 +1903,7 @@ Error ResourceFormatSaverBinaryInstance::save(const String &p_path, const RES &p
f->store_32(FORMAT_FLAG_NAMED_SCENE_IDS | FORMAT_FLAG_UIDS); f->store_32(FORMAT_FLAG_NAMED_SCENE_IDS | FORMAT_FLAG_UIDS);
ResourceUID::ID uid = ResourceSaver::get_resource_id_for_path(p_path, true); ResourceUID::ID uid = ResourceSaver::get_resource_id_for_path(p_path, true);
f->store_64(uid); f->store_64(uid);
for (int i = 0; i < 5; i++) { for (int i = 0; i < ResourceFormatSaverBinaryInstance::RESERVED_FIELDS; i++) {
f->store_32(0); // reserved f->store_32(0); // reserved
} }

2
core/io/resource_format_binary.h
View File

@ -164,6 +164,8 @@ public:
enum { enum {
FORMAT_FLAG_NAMED_SCENE_IDS = 1, FORMAT_FLAG_NAMED_SCENE_IDS = 1,
FORMAT_FLAG_UIDS = 2, FORMAT_FLAG_UIDS = 2,
// Amount of reserved 32-bit fields in resource header
RESERVED_FIELDS = 11
}; };
Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0); Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0);
static void write_variant(FileAccess *f, const Variant &p_property, Map<RES, int> &resource_map, Map<RES, int> &external_resources, Map<StringName, int> &string_map, const PropertyInfo &p_hint = PropertyInfo()); static void write_variant(FileAccess *f, const Variant &p_property, Map<RES, int> &resource_map, Map<RES, int> &external_resources, Map<StringName, int> &string_map, const PropertyInfo &p_hint = PropertyInfo());

8
scene/resources/resource_format_text.cpp
View File

@ -1019,11 +1019,11 @@ Error ResourceLoaderText::save_as_binary(FileAccess *p_f, const String &p_path)
bs_save_unicode_string(wf.f, is_scene ? "PackedScene" : resource_type); bs_save_unicode_string(wf.f, is_scene ? "PackedScene" : resource_type);
wf->store_64(0); //offset to import metadata, this is no longer used wf->store_64(0); //offset to import metadata, this is no longer used
f->store_32(ResourceFormatSaverBinaryInstance::FORMAT_FLAG_NAMED_SCENE_IDS | ResourceFormatSaverBinaryInstance::FORMAT_FLAG_UIDS); wf->store_32(ResourceFormatSaverBinaryInstance::FORMAT_FLAG_NAMED_SCENE_IDS | ResourceFormatSaverBinaryInstance::FORMAT_FLAG_UIDS);
f->store_64(res_uid); wf->store_64(res_uid);
for (int i = 0; i < 5; i++) { for (int i = 0; i < ResourceFormatSaverBinaryInstance::RESERVED_FIELDS; i++) {
wf->store_32(0); // reserved wf->store_32(0); // reserved
} }
@ -1073,7 +1073,7 @@ Error ResourceLoaderText::save_as_binary(FileAccess *p_f, const String &p_path)
bs_save_unicode_string(wf.f, type); bs_save_unicode_string(wf.f, type);
bs_save_unicode_string(wf.f, path); bs_save_unicode_string(wf.f, path);
wf.f->store_64(uid); wf->store_64(uid);
int lindex = dummy_read.external_resources.size(); int lindex = dummy_read.external_resources.size();
Ref<DummyResource> dr; Ref<DummyResource> dr;