X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FAssets.hpp;h=db0933f961c1520156d52caecb060cc3c753d22e;hb=be3a81656b8493010d2329fa00da617e24293438;hp=65c72fe04d73ad30a1fcf9d215244ad3dfe4ec66;hpb=65dbb0391afb6867bd9b388c6351b947a022abad;p=blank.git diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp index 65c72fe..db0933f 100644 --- a/src/app/Assets.hpp +++ b/src/app/Assets.hpp @@ -10,16 +10,18 @@ namespace blank { class ArrayTexture; class BlockTypeRegistry; +class CubeMap; class Sound; class Texture; class TextureIndex; -class Assets { +class AssetLoader { public: - explicit Assets(const std::string &base); + explicit AssetLoader(const std::string &base); void LoadBlockTypes(const std::string &set_name, BlockTypeRegistry &, TextureIndex &) const; + CubeMap LoadCubeMap(const std::string &name) const; Font LoadFont(const std::string &name, int size) const; Sound LoadSound(const std::string &name) const; Texture LoadTexture(const std::string &name) const; @@ -32,11 +34,15 @@ private: std::string textures; std::string data; -public: - // common assets shared by may states +}; + +struct Assets { + Font large_ui_font; Font small_ui_font; + Assets(const AssetLoader &); + }; }