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

update assets errors handling & add 'atlases' to preload

Browse Source
This commit is contained in:
MihailRis
2024-07-23 19:27:46 +03:00
parent ed60bdc333
commit f9df873382
7 changed files with 112 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/EngineController.cpp
+19 -4
View File
@@ -84,6 +84,7 @@ static void show_content_missing(
}
static bool loadWorldContent(Engine* engine, const fs::path& folder) {
// TODO: combine errors handling with newWorld
try {
engine->loadWorldContent(folder);
return true;
@@ -95,10 +96,17 @@ static bool loadWorldContent(Engine* engine, const fs::path& folder) {
util::str2wstr_utf8(error.getPackId())
);
return false;
} catch (const assetload::error& error) {
engine->setScreen(std::make_shared<MenuScreen>(engine));
guiutil::alert(
engine->getGUI(), langs::get(L"Assets Load Error", L"menu")+L":\n"+
util::str2wstr_utf8(error.what())
);
return false;
} catch (const std::runtime_error& error) {
engine->setScreen(std::make_shared<MenuScreen>(engine));
guiutil::alert(
engine->getGUI(), langs::get(L"Content Error", L"menu")+L": "+
engine->getGUI(), langs::get(L"Content Error", L"menu")+L":\n"+
util::str2wstr_utf8(error.what())
);
return false;
@@ -189,11 +197,18 @@ void EngineController::createWorld(
)
);
return;
} catch (const std::runtime_error& error) {
} catch (const assetload::error& error) {
guiutil::alert(
engine->getGUI(),
langs::get(L"Content Error", L"menu")+
L": "+util::str2wstr_utf8(error.what())
langs::get(L"Assets Loading Error", L"menu")+
L":\n"+util::str2wstr_utf8(error.what())
);
return;
} catch (const std::runtime_error& error) {
engine->setScreen(std::make_shared<MenuScreen>(engine));
guiutil::alert(
engine->getGUI(), langs::get(L"Content Error", L"menu")+L":\n"+
util::str2wstr_utf8(error.what())
);
return;
}