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

res/bindings.toml moved to res/config

Browse Source
This commit is contained in:
MihailRis 2024-06-02 21:42:51 +03:00
parent 3a6fa57630
commit d3e34741e0
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
res/bindings.toml → res/config/bindings.toml
View File

20
src/engine.cpp
View File

@ -252,6 +252,16 @@ void Engine::loadAssets() {
assets.reset(new_assets.release()); assets.reset(new_assets.release());
} }
static void load_configs(const fs::path& root) {
auto configFolder = root/fs::path("config");
auto bindsFile = configFolder/fs::path("bindings.toml");
if (fs::is_regular_file(bindsFile)) {
Events::loadBindingsToml(
bindsFile.u8string(), files::read_string(bindsFile)
);
}
}
void Engine::loadContent() { void Engine::loadContent() {
auto resdir = paths->getResources(); auto resdir = paths->getResources();
ContentBuilder contentBuilder; ContentBuilder contentBuilder;
@ -274,14 +284,10 @@ void Engine::loadContent() {
ContentLoader loader(&pack); ContentLoader loader(&pack);
loader.load(contentBuilder); loader.load(contentBuilder);
auto configFolder = pack.folder/fs::path("config"); load_configs(pack.folder);
auto bindsFile = configFolder/fs::path("bindings.toml");
if (fs::is_regular_file(bindsFile)) {
Events::loadBindingsToml(
bindsFile.u8string(), files::read_string(bindsFile)
);
}
} }
load_configs(paths->getResources());
content = contentBuilder.build(); content = contentBuilder.build();
resPaths = std::make_unique<ResPaths>(resdir, resRoots); resPaths = std::make_unique<ResPaths>(resdir, resRoots);