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

No more shaders and fonts reload on world open

Browse Source
This commit is contained in:
MihailRis
2023-12-24 10:53:18 +03:00
parent 25b1afbc26
commit 572734dc80
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/AssetsLoader.cpp
+12 -12
View File
@@ -50,18 +50,18 @@ void AssetsLoader::createDefaults(AssetsLoader& loader) {
loader.addLoader(ASSET_ATLAS, assetload::atlas); loader.addLoader(ASSET_ATLAS, assetload::atlas);
} }
void AssetsLoader::addDefaults(AssetsLoader& loader) { void AssetsLoader::addDefaults(AssetsLoader& loader, bool allAssets) {
loader.add(ASSET_SHADER, SHADERS_FOLDER"/main", "main"); if (allAssets) {
loader.add(ASSET_SHADER, SHADERS_FOLDER"/lines", "lines"); loader.add(ASSET_SHADER, SHADERS_FOLDER"/main", "main");
loader.add(ASSET_SHADER, SHADERS_FOLDER"/ui", "ui"); loader.add(ASSET_SHADER, SHADERS_FOLDER"/lines", "lines");
loader.add(ASSET_SHADER, SHADERS_FOLDER"/ui3d", "ui3d"); loader.add(ASSET_SHADER, SHADERS_FOLDER"/ui", "ui");
loader.add(ASSET_SHADER, SHADERS_FOLDER"/background", "background"); loader.add(ASSET_SHADER, SHADERS_FOLDER"/ui3d", "ui3d");
loader.add(ASSET_SHADER, SHADERS_FOLDER"/skybox_gen", "skybox_gen"); loader.add(ASSET_SHADER, SHADERS_FOLDER"/background", "background");
loader.add(ASSET_SHADER, SHADERS_FOLDER"/skybox_gen", "skybox_gen");
loader.add(ASSET_ATLAS, TEXTURES_FOLDER"/blocks", "blocks"); loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/menubg.png", "menubg");
loader.add(ASSET_TEXTURE, TEXTURES_FOLDER"/menubg.png", "menubg"); loader.add(ASSET_FONT, FONTS_FOLDER"/font", "normal");
}
loader.add(ASSET_FONT, FONTS_FOLDER"/font", "normal"); loader.add(ASSET_ATLAS, TEXTURES_FOLDER"/blocks", "blocks");
} }
const ResPaths* AssetsLoader::getPaths() const { const ResPaths* AssetsLoader::getPaths() const {
src/assets/AssetsLoader.h
+1 -1
View File
@@ -36,7 +36,7 @@ public:
bool loadNext(); bool loadNext();
static void createDefaults(AssetsLoader& loader); static void createDefaults(AssetsLoader& loader);
static void addDefaults(AssetsLoader& loader); static void addDefaults(AssetsLoader& loader, bool allAssets);
const ResPaths* getPaths() const; const ResPaths* getPaths() const;
}; };
src/engine.cpp
+2 -2
View File
@@ -59,7 +59,7 @@ Engine::Engine(EngineSettings& settings, EnginePaths* paths)
assets.reset(new Assets()); assets.reset(new Assets());
AssetsLoader loader(assets.get(), resPaths.get()); AssetsLoader loader(assets.get(), resPaths.get());
AssetsLoader::createDefaults(loader); AssetsLoader::createDefaults(loader);
AssetsLoader::addDefaults(loader); AssetsLoader::addDefaults(loader, true);
Shader::preprocessor->setPaths(resPaths.get()); Shader::preprocessor->setPaths(resPaths.get());
while (loader.hasNext()) { while (loader.hasNext()) {
@@ -189,7 +189,7 @@ void Engine::loadContent() {
std::cout << "-- loading assets" << std::endl; std::cout << "-- loading assets" << std::endl;
AssetsLoader loader(new_assets.get(), resPaths.get()); AssetsLoader loader(new_assets.get(), resPaths.get());
AssetsLoader::createDefaults(loader); AssetsLoader::createDefaults(loader);
AssetsLoader::addDefaults(loader); AssetsLoader::addDefaults(loader, false);
while (loader.hasNext()) { while (loader.hasNext()) {
if (!loader.loadNext()) { if (!loader.loadNext()) {
new_assets.reset(); new_assets.reset();