PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

new content source - user-dir/content

Browse Source
This commit is contained in:
MihailRis 2024-02-19 02:15:19 +03:00
parent 8409e0d82e
commit f2a5ece845
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/content/ContentPack.cpp
View File

@ -87,12 +87,14 @@ ContentPack ContentPack::read(fs::path folder) {
return pack; return pack;
} }
void ContentPack::scan(fs::path rootfolder, void ContentPack::scanFolder(
std::vector<ContentPack>& packs) { fs::path folder,
if (!fs::is_directory(rootfolder)) { std::vector<ContentPack>& packs
) {
if (!fs::is_directory(folder)) {
return; return;
} }
for (auto entry : fs::directory_iterator(rootfolder)) { for (auto entry : fs::directory_iterator(folder)) {
fs::path folder = entry.path(); fs::path folder = entry.path();
if (!fs::is_directory(folder)) if (!fs::is_directory(folder))
continue; continue;
@ -109,10 +111,19 @@ void ContentPack::scan(fs::path rootfolder,
} }
} }
void ContentPack::scan(
fs::path rootfolder,
EnginePaths* paths,
std::vector<ContentPack>& packs
) {
scanFolder(paths->getResources()/fs::path("content"), packs);
scanFolder(paths->getUserfiles()/fs::path("content"), packs);
scanFolder(rootfolder, packs);
}
void ContentPack::scan(EnginePaths* paths, void ContentPack::scan(EnginePaths* paths,
std::vector<ContentPack>& packs) { std::vector<ContentPack>& packs) {
scan(paths->getResources()/fs::path("content"), packs); scan(paths->getWorldFolder()/fs::path("content"), paths, packs);
scan(paths->getWorldFolder()/fs::path("content"), packs);
} }
std::vector<std::string> ContentPack::worldPacksList(fs::path folder) { std::vector<std::string> ContentPack::worldPacksList(fs::path folder) {

18
src/content/ContentPack.h
View File

@ -46,10 +46,20 @@ struct ContentPack {
static bool is_pack(fs::path folder); static bool is_pack(fs::path folder);
static ContentPack read(fs::path folder); static ContentPack read(fs::path folder);
static void scan(fs::path folder, static void scanFolder(
std::vector<ContentPack>& packs); fs::path folder,
static void scan(EnginePaths* paths, std::vector<ContentPack>& packs
std::vector<ContentPack>& packs); );
static void scan(
fs::path folder,
EnginePaths* paths,
std::vector<ContentPack>& packs
);
static void scan(
EnginePaths* paths,
std::vector<ContentPack>& packs
);
static std::vector<std::string> worldPacksList(fs::path folder); static std::vector<std::string> worldPacksList(fs::path folder);