X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FAssets.hpp;h=ab6a4f3300e44b13d0d9be9e32579d426b8def3a;hb=bcf776b6d51aeb9147bde32da8dd0768b10db993;hp=68606cb62e070b4956c7e440b8a5c13d9166a6e5;hpb=ed2711d42a7815657bf0653c25b8b9be8b7f1368;p=blobs.git diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp index 68606cb..ab6a4f3 100644 --- a/src/app/Assets.hpp +++ b/src/app/Assets.hpp @@ -1,8 +1,11 @@ #ifndef BLOBS_APP_ASSETS_HPP_ #define BLOBS_APP_ASSETS_HPP_ +#include "../graphics/AlphaSprite.hpp" #include "../graphics/ArrayTexture.hpp" +#include "../graphics/Canvas.hpp" #include "../graphics/CreatureSkin.hpp" +#include "../graphics/Font.hpp" #include "../graphics/PlanetSurface.hpp" #include "../graphics/SunSurface.hpp" #include "../world/Resource.hpp" @@ -22,6 +25,7 @@ struct Assets { std::string path; std::string data_path; + std::string font_path; std::string skin_path; std::string tile_path; @@ -30,12 +34,20 @@ struct Assets { world::Set tiles; } data; + struct { + graphics::Font large; + graphics::Font medium; + graphics::Font small; + } fonts; + struct { graphics::ArrayTexture tiles; graphics::ArrayTexture skins; } textures; struct { + graphics::AlphaSprite alpha_sprite; + graphics::Canvas canvas; graphics::PlanetSurface planet_surface; graphics::SunSurface sun_surface; graphics::CreatureSkin creature_skin; @@ -50,6 +62,7 @@ struct Assets { Assets(Assets &&) = delete; Assets &operator =(Assets &&) = delete; + void ReadResources(io::TokenStreamReader &); void ReadTileTypes(io::TokenStreamReader &); void LoadTileTexture(const std::string &name, graphics::ArrayTexture &, int layer) const;