merge common parts of pre- and unload states

[blank.git] / src / app / Assets.hpp

diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp
index e6c209effdd7745b6c0d9ad6e798b47a131f1e9f..db0933f961c1520156d52caecb060cc3c753d22e 100644 (file)
--- a/src/app/Assets.hpp
+++ b/src/app/Assets.hpp
@@ -10,19 +10,23 @@ 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 &) const;
+       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;
        void LoadTexture(const std::string &name, ArrayTexture &, int layer) const;
+       void LoadTextures(const TextureIndex &, ArrayTexture &) const;
 
 private:
        std::string fonts;
@@ -30,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 &);
+
 };
 
 }