tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-06-30 05:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Made possible to specify where to dump the contents when loading a ".pck" file

Browse Source 
(cherry picked from commit 3c261e0dfa)
This commit is contained in:
Michael Alexsander
2020-01-17 22:26:44 -03:00
committed by Rémi Verschelde
parent 008e0748c1
commit ffcfd9c8ea
7 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/io/file_access_pack.cpp
+23 -4
View File
@@ -30,15 +30,16 @@
#include "file_access_pack.h"
#include "core/project_settings.h"
#include "core/version.h"
#include <stdio.h>
Error PackedData::add_pack(const String &p_path, bool p_replace_files) {
Error PackedData::add_pack(const String &p_path, bool p_replace_files, const String &p_destination) {
for (int i = 0; i < sources.size(); i++) {
if (sources[i]->try_open_pack(p_path, p_replace_files)) {
if (sources[i]->try_open_pack(p_path, p_replace_files, p_destination)) {
return OK;
};
@@ -89,7 +90,7 @@ void PackedData::add_path(const String &pkg_path, const String &path, uint64_t o
}
}
String filename = path.get_file();
// Don't add as a file if the path points to a directory
// Don't add as a file if the path points to a directory.
if (!filename.empty()) {
cd->files.insert(filename);
}
@@ -132,7 +133,7 @@ PackedData::~PackedData() {
//////////////////////////////////////////////////////////////////
bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files) {
bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files, const String &p_destination) {
FileAccess *f = FileAccess::open(p_path, FileAccess::READ);
if (!f)
@@ -198,6 +199,24 @@ bool PackedSourcePCK::try_open_pack(const String &p_path, bool p_replace_files)
String path;
path.parse_utf8(cs.ptr());
if (p_destination != "") {
String destination = ProjectSettings::get_singleton()->localize_path(p_destination);
ERR_FAIL_COND_V_MSG(!destination.begins_with("res://"), false, "The destination path must be within the resource filesystem (res://).");
if (!destination.ends_with("/")) {
destination += "/";
}
DirAccess *dir = DirAccess::create(DirAccess::ACCESS_RESOURCES);
if (!dir->dir_exists(destination)) {
memdelete(dir);
ERR_FAIL_V_MSG(false, vformat("The destination path \"%s\" does not exist.", destination));
}
memdelete(dir);
path = path.replace_first("res://", destination);
}
uint64_t ofs = f->get_64();
uint64_t size = f->get_64();