X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fapp%2FAssets.hpp;h=b9d62e2e04ae7ba284dd9fe69aa058208ad7627a;hb=3a487f44c26f9bb9d1a1c831406b6497b2b3b425;hp=6e1698a6fc94105d0893b2f1ee0259f80bf608dc;hpb=7bb75960dbf9bfdee9ac865384aca81791b3da5c;p=blank.git

diff --git a/src/app/Assets.hpp b/src/app/Assets.hpp
index 6e1698a..b9d62e2 100644
--- a/src/app/Assets.hpp
+++ b/src/app/Assets.hpp
@@ -1,30 +1,49 @@
 #ifndef BLANK_APP_ASSETS_HPP_
 #define BLANK_APP_ASSETS_HPP_
 
+#include "../graphics/Font.hpp"
+
 #include <string>
 
 
 namespace blank {
 
 class ArrayTexture;
-class Font;
+class BlockTypeRegistry;
+class CubeMap;
+class ShapeRegistry;
 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;
+	void LoadShapes(const std::string &set_name, ShapeRegistry &) 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;
 	std::string sounds;
 	std::string textures;
+	std::string data;
+
+};
+
+struct Assets {
+
+	Font large_ui_font;
+	Font small_ui_font;
+
+	Assets(const AssetLoader &);
 
 };